From ef0fab59897e178b09c4396b736a09ac0e078943 Mon Sep 17 00:00:00 2001 From: olabusayoT <50379531+olabusayoT@users.noreply.github.com> Date: Tue, 17 Sep 2024 15:47:16 -0400 Subject: [PATCH] Address unexpected warnings - fix schemas to remove some unexpected warnings - remove encodingErrorPolicy replace and use GeneralFormat instead - add suppressSchemaDefinitionWarnings to some schema elements DAFFODIL-2926 --- .../daffodil/codegen/c/ex_nums.dfdl.xsd | 2 +- .../choiceBranchKeyRanges.tdml | 2 +- .../daffodil/extensions/repType/repType.tdml | 48 + .../layers/exampleCheckDigit.dfdl.xsd | 2 + .../testImportOtherAnnotationSchema.tdml | 8 + .../general/testUnparserGeneral.tdml | 5 +- .../daffodil/section00/general/tunables.tdml | 6 +- .../SchemaDefinitionErrors.tdml | 6 +- .../daffodil/section05/facets/Facets.tdml | 2 +- .../section05/simple_types/BitOrder.tdml | 4 +- .../section05/simple_types/SimpleTypes.tdml | 34 +- .../simple_types/nonNegativeInteger.dfdl.xsd | 5 +- .../entities/DefaultProperties.dfdl.xsd | 2 +- .../section06/namespaces/ABC_invalid.dfdl.xsd | 2 +- .../section06/namespaces/multi_A_03.dfdl.xsd | 4 +- .../namespaces/multi_base_03.dfdl.xsd | 4 +- .../namespaces/multi_base_09.dfdl.xsd | Bin 7634 -> 7572 bytes .../section06/namespaces/namespaces.tdml | 9 +- .../apache/daffodil/section06/namespaces/shi | 2 +- .../discriminators/discriminator.tdml | 48 +- .../multipleDiscriminators.tdml | 2 +- .../section07/variables/variables.tdml | 7 + .../property_scoping/PropertyScoping.tdml | 4 +- .../PropertiesDefined.dfdl.xsd | 4 +- .../PropertiesNotDefined.dfdl.xsd | 2 +- .../representation_properties/RepProps.tdml | 19 +- .../representation_properties/encodings.tdml | 2 + .../section12/aligned_data/Aligned_Data.tdml | 12 +- .../section12/lengthKind/PrefixedTests.tdml | 4 +- .../daffodil/section13/boolean/boolean.tdml | 13 +- .../daffodil/section13/nillable/nillable.tdml | 4 +- .../text_number_props/TextNumberProps.tdml | 14 +- .../sequence_groups/SequenceGroup.tdml | 1111 ++++++++--------- .../SequenceGroupInitiatedContent.tdml | 2 +- .../UnorderedSequences.tdml | 2 +- .../section15/choice_groups/choice1773.tdml | 12 +- .../choice_groups/testSharedGroups.tdml | 18 + .../array_optional_elem/ArrayComb.tdml | 12 +- .../ArrayOptionalElem.tdml | 20 +- .../UnparseArrayDelimitedOptionalElem.tdml | 7 +- .../arrays_optional_elements.dfdl.xsd | 2 +- .../array_optional_elem/backtracking.tdml | 2 +- .../section17/calc_value_properties/AQ.tdml | 2 +- .../section17/calc_value_properties/AR.tdml | 2 +- .../computedLengthFields.tdml | 4 +- .../calc_value_properties/inputValueCalc.tdml | 7 +- .../outputValueCalc2.tdml | 4 +- .../dfdl_expressions/expressions.tdml | 60 +- .../section23/dfdl_functions/Functions.tdml | 10 +- .../runtime-properties.tdml | 8 +- .../org/apache/daffodil/udf/udfs.tdml | 2 +- .../unparser/parseUnparseMode.dfdl.xsd | 2 +- .../apache/daffodil/usertests/SepTests.tdml | 21 +- .../simple_types/TestSimpleTypes.scala | 2 - .../daffodil/usertests/TestSepTests.scala | 4 +- 55 files changed, 866 insertions(+), 732 deletions(-) diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd index 56c911b4b6..64178ce42b 100644 --- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd +++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd @@ -142,7 +142,7 @@ dfdl:byteOrder="littleEndian"/> - - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/repType/repType.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/repType/repType.tdml index 6c1f9f5497..5086052280 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/repType/repType.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/repType/repType.tdml @@ -804,6 +804,14 @@ + + FacetsContradict + 't' + three + contradicts + minLength + maxLength + minLength 2 + + FacetsContradict + 't' + three + contradicts + minLength + maxLength + maxLength 3 + + FacetsContradict + 't' + three + contradicts + minLength + maxLength + ex:field facet length (1) + + FacetsContradict + 't' + three + contradicts + minLength + maxLength + + + FacetsContradict + 't' + three + contradicts + minLength + maxLength + ex:field facet length (1) + + FacetsContradict + 't' + three + contradicts + minLength + maxLength + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/layers/exampleCheckDigit.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/layers/exampleCheckDigit.dfdl.xsd index 00fd819c2c..e3c8f0d997 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/layers/exampleCheckDigit.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/layers/exampleCheckDigit.dfdl.xsd @@ -24,6 +24,7 @@ xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:cd="urn:org.apache.daffodil.layers.checkDigit" xmlns:ex="http://example.com" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" targetNamespace="http://example.com"> @@ -69,6 +70,7 @@ dfdl:inputValueCalc='{ $cd:checkDigit }'/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testImportOtherAnnotationSchema.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testImportOtherAnnotationSchema.tdml index 009717c305..4a5c7fb8c2 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testImportOtherAnnotationSchema.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testImportOtherAnnotationSchema.tdml @@ -34,6 +34,10 @@ foo + + Non-DFDL Schema file ignored + otherAnnotationLanguage.xsd + @@ -43,6 +47,10 @@ foo + + Non-DFDL Schema file ignored + otherAnnotationLanguage.xsd + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml index ef3403ce5c..f4dee13dc9 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml @@ -19,6 +19,7 @@ @@ -32,7 +33,9 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml index cc08e44488..135f82ac41 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml @@ -489,7 +489,7 @@ trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator="" terminator="" separator="" ignoreCase="no" occursCountKind="implicit" lengthUnits="bytes" initiatedContent="no" textPadKind="none" truncateSpecifiedLengthString="no" textTrimKind="none" - escapeSchemeRef="" encodingErrorPolicy="replace" fillByte="%NUL;" /> + escapeSchemeRef="" encodingErrorPolicy="replace" fillByte="%NUL;" floating="no" /> @@ -551,7 +551,7 @@ trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator="" terminator="" separator="" ignoreCase="no" occursCountKind="implicit" lengthUnits="bytes" initiatedContent="no" textPadKind="none" truncateSpecifiedLengthString="no" textTrimKind="none" - escapeSchemeRef="" encodingErrorPolicy="replace" textBidi="yes"/> + escapeSchemeRef="" encodingErrorPolicy="replace" textBidi="yes" floating="no"/> @@ -729,7 +729,7 @@ trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator="" terminator="" separator="" ignoreCase="no" occursCountKind="implicit" lengthUnits="bytes" initiatedContent="no" textPadKind="none" truncateSpecifiedLengthString="no" textTrimKind="none" - escapeSchemeRef="" textBidi="no" fillByte="%NUL;" /> + escapeSchemeRef="" textBidi="no" fillByte="%NUL;" floating="no" /> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml index f8c0fedb1e..0489d4e4b9 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml @@ -77,13 +77,13 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" - emptyValueDelimiterPolicy="both" encodingErrorPolicy="error" - encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" ignoreCase="no" + emptyValueDelimiterPolicy="both" encodingErrorPolicy="replace" + encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" floating="no" ignoreCase="no" initiatedContent="no" initiator="" lengthKind="delimited" lengthUnits="bytes" occursCountKind="parsed" outputNewLine="%LF;" representation="text" separator="" separatorPosition="infix" separatorSuppressionPolicy="anyEmpty" sequenceKind="ordered" - terminator="" textBooleanPadCharacter="%SP;" + terminator="" textBooleanPadCharacter="%SP;" textBidi="no" textCalendarJustification="left" textCalendarPadCharacter="%SP;" textNumberCheckPolicy="lax" textNumberJustification="right" textNumberPadCharacter="%SP;" diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml index 3592027a2d..3faeeab31f 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml @@ -2910,7 +2910,7 @@ diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml index 415f7fab84..58e1c1ddbd 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml @@ -633,12 +633,12 @@ textStandardZeroRep="0" textStandardInfinityRep="Inf" textStandardNaNRep="NaN" textNumberPattern="#,##0.###;-#,##0.###" textNumberRounding="explicit" textNumberRoundingMode="roundUnnecessary" textNumberRoundingIncrement="0" decimalSigned="yes" - encodingErrorPolicy="error" sequenceKind="ordered" calendarFirstDayOfWeek='Sunday' + encodingErrorPolicy="replace" sequenceKind="ordered" calendarFirstDayOfWeek='Sunday' calendarDaysInFirstWeek='4' calendarTimeZone='UTC' calendarCheckPolicy='strict' calendarLanguage='en' bitOrder="leastSignificantBitFirst" outputNewLine="%LF;" textPadKind="none" fillByte="%#r20;" truncateSpecifiedLengthString="no" textStringPadCharacter="%SP;" textNumberPadCharacter="%SP;" textBooleanPadCharacter="%SP;" textCalendarPadCharacter="%SP;" textCalendarJustification="left" - textNumberJustification="right" textOutputMinLength="0" /> + textNumberJustification="right" textOutputMinLength="0" floating="no" textBidi="no" /> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml index 2aabfbe06d..d3562569ba 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml @@ -25,10 +25,10 @@ defaultRoundTrip="true"> - + @@ -50,8 +50,9 @@ dfdl:length="13" /> - + - - - + + + @@ -205,9 +203,9 @@ - + @@ -542,19 +540,21 @@ + description="A warning message should be generated - use of binaryNumperRep 'binary' with representation 'text'- DFDL-2-012R" + ignoreUnexpectedWarnings="false"> - 00000025 + 37 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> 37 - + binaryNumberRep + ignored diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd index 5b8c64e9a4..ee36212d19 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd @@ -26,15 +26,14 @@ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" /> - + - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd index 9fce2cb26b..a8d3e15199 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd @@ -44,7 +44,7 @@ xmlns:tns="http://example.com"> initiatedContent="no" initiator="" leadingSkip="0" lengthKind="delimited" lengthUnits="characters" nilKind="literalValue" nilValueDelimiterPolicy="none" occursCountKind="fixed" outputNewLine="%CR;%LF;" prefixIncludesPrefixLength="no" - representation="text" separator="," separatorPolicy="required" + representation="text" separator="," separatorPosition="infix" sequenceKind="ordered" terminator="" textBidi="no" textBooleanFalseRep="false" textBooleanJustification="left" textBooleanPadCharacter="%SP;" textBooleanTrueRep="true" diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd index 91d2c52f6c..0b9461cc29 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd @@ -108,7 +108,7 @@ + separatorSuppressionPolicy="trailingEmpty"/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd index 7567b97dee..f96246a9e8 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd @@ -35,7 +35,7 @@ byteOrder="littleEndian" calendarCheckPolicy='strict' calendarDaysInFirstWeek='4' calendarFirstDayOfWeek='Sunday' calendarLanguage='en' calendarPatternKind='implicit' calendarTimeZone='UTC' - encoding="ASCII" encodingErrorPolicy="error" escapeSchemeRef="" + encoding="ASCII" encodingErrorPolicy="replace" escapeSchemeRef="" fillByte="%#r20;" ignoreCase="no" initiatedContent="no" initiator="" leadingSkip='0' occursCountKind="parsed" outputNewLine="%LF;" representation="text" separator="" separatorPosition="infix" @@ -45,7 +45,7 @@ textNumberPadCharacter="%SP;" textNumberRep="standard" textOutputMinLength="0" textPadKind="none" textStringPadCharacter="%SP;" textTrimKind="none" trailingSkip="0" truncateSpecifiedLengthString="no" - emptyValueDelimiterPolicy="none"/> + emptyValueDelimiterPolicy="none" floating="no" textBidi="no" textStandardBase="10"/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd index dd56dc08c7..f1085d867c 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd @@ -21,12 +21,12 @@ - + textPadKind='none' byteOrder="littleEndian" floating="no" textBidi="no"/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd index 7f3f21a7b9c7924e0deb3a5c32f6acc1e6a59f28..a148af9034a1bb6641e5b1a56c9c2ce4fe9c67e6 100644 GIT binary patch delta 17 Zcmca)J;i#%T(-^g+19XZZsqnC0sux72G{@q delta 52 zcmbPYeaU*mT(-@#+19bh=P+b4Br{Yp*fJv5+EF)?rf E0Gde+BLDyZ diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml index cc68a5941a..47c40bb3ad 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml @@ -45,7 +45,7 @@ + textNumberRep="standard" lengthKind="delimited" encoding="ASCII" encodingErrorPolicy="replace"/> @@ -2353,7 +2353,6 @@ Schema: IncorrectAppinfoSource Root: basic Purpose: This test demonstrates that a warning is given when the appinfo source is not http://www.ogf.org/dfdl/ - Currently tdml:warnings are not implemented so this test needs a manual check for the warning. Once that has been implemented this can be changed to automated. --> test - + + The xs:appinfo source attribute value 'http://www.ogf.org/dfdl/dfdl-1.0/' should be 'http://www.ogf.org/dfdl/'. + @@ -786,11 +788,13 @@ - - - - - + + + + + + + @@ -844,11 +848,13 @@ - - - - - + + + + + + + @@ -877,11 +883,13 @@ - - - - - + + + + + + + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml index d139dee101..c835ef3787 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml @@ -24,7 +24,7 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml index 60506dbfa2..c7f581357a 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml @@ -2647,6 +2647,13 @@ + + + Cannot set variable + EscapeChar + after reading + default value + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml index 44c564abf4..e69554d344 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml @@ -251,8 +251,8 @@ - diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesNotDefined.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesNotDefined.dfdl.xsd index 5391b721dd..e7986d5148 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesNotDefined.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/PropertiesNotDefined.dfdl.xsd @@ -43,7 +43,7 @@ calendarPatternKind='implicit' calendarFirstDayOfWeek='Sunday' calendarDaysInFirstWeek='4' calendarTimeZone='UTC' calendarCheckPolicy='strict' calendarLanguage='en' textPadKind="none" - fillByte="%SP;" + fillByte="%SP;" floating="no" textBidi="no" truncateSpecifiedLengthString="yes" bitOrder="mostSignificantBitFirst"/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml index b3b50f6dc3..46993cb63d 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml @@ -32,13 +32,14 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" - emptyValueDelimiterPolicy="both" encodingErrorPolicy="error" + emptyValueDelimiterPolicy="both" encodingErrorPolicy="replace" encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" ignoreCase="no" + floating="no" initiatedContent="no" initiator="" leadingSkip="0" lengthKind="delimited" lengthUnits="bytes" occursCountKind="parsed" outputNewLine="%LF;" separator="" separatorPosition="infix" separatorSuppressionPolicy="anyEmpty" sequenceKind="ordered" - terminator="" textBooleanPadCharacter="%SP;" + terminator="" textBooleanPadCharacter="%SP;" textBidi="no" textCalendarJustification="left" textCalendarPadCharacter="%SP;" textNumberCheckPolicy="lax" textNumberJustification="right" textNumberPadCharacter="%SP;" @@ -73,13 +74,14 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" - emptyValueDelimiterPolicy="both" encodingErrorPolicy="error" - encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" ignoreCase="no" + emptyValueDelimiterPolicy="both" encodingErrorPolicy="replace" + encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" + floating="no" ignoreCase="no" initiatedContent="no" initiator="" leadingSkip="0" lengthKind="delimited" lengthUnits="bytes" occursCountKind="parsed" outputNewLine="%LF;" separator="" separatorPosition="infix" separatorSuppressionPolicy="anyEmpty" sequenceKind="ordered" - terminator="" textBooleanPadCharacter="%SP;" + terminator="" textBooleanPadCharacter="%SP;" textBidi="no" textCalendarJustification="left" textCalendarPadCharacter="%SP;" textNumberCheckPolicy="lax" textNumberJustification="right" textNumberPadCharacter="%SP;" @@ -112,13 +114,14 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" - emptyValueDelimiterPolicy="both" encodingErrorPolicy="error" - encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" ignoreCase="no" + emptyValueDelimiterPolicy="both" encodingErrorPolicy="replace" + encoding="utf-8" escapeSchemeRef="" fillByte="%#r20;" + floating="no" ignoreCase="no" initiatedContent="no" initiator="" leadingSkip="0" lengthKind="delimited" lengthUnits="bytes" occursCountKind="parsed" outputNewLine="%LF;" separator="" separatorPosition="infix" separatorSuppressionPolicy="anyEmpty" sequenceKind="ordered" - terminator="" textBooleanPadCharacter="%SP;" + terminator="" textBooleanPadCharacter="%SP;" textBidi="no" textCalendarJustification="left" textCalendarPadCharacter="%SP;" textNumberCheckPolicy="lax" textNumberJustification="right" textNumberPadCharacter="%SP;" diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml index ec02ea8745..e79fc5e20f 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml @@ -23,6 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com" xmlns:tns="http://example.com" @@ -289,6 +290,7 @@ The decode will then fail with a parse error. --> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml index b5e1a053ff..119c799854 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml @@ -19,6 +19,7 @@ @@ -364,7 +365,8 @@ + dfdl:lengthUnits="bytes" dfdl:alignment="8" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4" + daf:suppressSchemaDefinitionWarnings="alignmentAndInitiatorTextAlignmentNotCompatible"/> @@ -376,7 +378,8 @@ + dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:initiator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4" dfdl:trailingSkip="2" + daf:suppressSchemaDefinitionWarnings="alignmentAndInitiatorTextAlignmentNotCompatible"/> @@ -393,7 +396,8 @@ + dfdl:lengthUnits="bytes" dfdl:alignment="4" dfdl:initiator=":" dfdl:alignmentUnits="bytes" dfdl:leadingSkip="4" dfdl:trailingSkip="2" + daf:suppressSchemaDefinitionWarnings="alignmentAndInitiatorTextAlignmentNotCompatible"/> @@ -438,7 +442,7 @@ + minOccurs="2" maxOccurs="2" dfdl:leadingSkip="2" dfdl:trailingSkip="4" daf:suppressSchemaDefinitionWarnings="alignmentAndInitiatorTextAlignmentNotCompatible"/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PrefixedTests.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PrefixedTests.tdml index f47212e05e..82d201a360 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PrefixedTests.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/PrefixedTests.tdml @@ -457,7 +457,7 @@ - + @@ -2479,7 +2479,6 @@ @@ -2495,7 +2494,6 @@ diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section13/boolean/boolean.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section13/boolean/boolean.tdml index 02b0b82dd4..1e93d42f24 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section13/boolean/boolean.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section13/boolean/boolean.tdml @@ -21,6 +21,7 @@ xmlns:fn="http://www.w3.org/2005/xpath-functions" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" xmlns:ex="http://example.com" xmlns:tns="http://example.com" defaultRoundTrip="onePass"> @@ -34,10 +35,14 @@ - - - - + + + + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section13/nillable/nillable.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section13/nillable/nillable.tdml index 520a7d44db..da41170d19 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section13/nillable/nillable.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section13/nillable/nillable.tdml @@ -317,10 +317,10 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml index 8093dcfa88..ff77595773 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section13/text_number_props/TextNumberProps.tdml @@ -23,7 +23,8 @@ xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com" - xmlns="http://example.com" + xmlns="http://example.com" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" xmlns:tns="http://example.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" defaultRoundTrip="true"> @@ -32,7 +33,8 @@ - + @@ -346,7 +348,7 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" emptyValueDelimiterPolicy="both" - encodingErrorPolicy="error" encoding="US-ASCII" escapeSchemeRef="" + encodingErrorPolicy="replace" encoding="US-ASCII" escapeSchemeRef="" fillByte="f" floating="no" ignoreCase="no" initiatedContent="no" initiator="" leadingSkip="0" lengthKind="delimited" lengthUnits="bytes" nilValueDelimiterPolicy="both" occursCountKind="implicit" @@ -3573,7 +3575,8 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" emptyValueDelimiterPolicy="both" - encodingErrorPolicy="error" encoding="US-ASCII" escapeSchemeRef="" + encodingErrorPolicy="replace" encoding="US-ASCII" escapeSchemeRef="" + floating="no" textBidi="no" fillByte="%#r20;" ignoreCase="no" initiatedContent="no" initiator="" leadingSkip="0" lengthKind="implicit" lengthUnits="bytes" occursCountKind="parsed" outputNewLine="%LF;" representation="text" @@ -3604,7 +3607,8 @@ calendarLanguage="en" calendarPatternKind="implicit" calendarTimeZone="UTC" decimalSigned="yes" documentFinalTerminatorCanBeMissing="no" emptyValueDelimiterPolicy="both" - encodingErrorPolicy="error" encoding="US-ASCII" escapeSchemeRef="" + encodingErrorPolicy="replace" encoding="US-ASCII" escapeSchemeRef="" + floating="no" textBidi="no" fillByte="%#r20;" ignoreCase="no" initiatedContent="no" initiator="" leadingSkip="0" lengthKind="implicit" lengthUnits="bytes" occursCountKind="parsed" outputNewLine="%LF;" representation="text" diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml index b4b8d7552c..55bdb94485 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroup.tdml @@ -19,50 +19,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - not really doc - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + not really doc + + + + + + - + + model="emptySDEschema" description="Section 14 - DFDL-14-007R."> @@ -73,15 +73,15 @@ - + - + + model="emptySDEschema" description="Section 14 - DFDL-14-007R."> @@ -90,9 +90,9 @@ A complex type must have exactly one model-group element child which is a sequence, choice, or group reference. - - + + @@ -100,15 +100,15 @@ - + - + + model="emptySDEschema" description="Section 14 - DFDL-14-007R."> @@ -125,13 +125,13 @@ + dfdl:occursCountKind="expression" dfdl:occursCount="{ ../ex:count }"> - + @@ -141,8 +141,8 @@ + model="NadaParser.dfdl.xsd" description="Tests to make sure that the NadaParser generated in SpecifiedLengthExplicit is optimized out" + roundTrip="false"> 1, @@ -156,72 +156,72 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - Schema Definition Error - 'name' - element - - - - - - - - - 837 - 742.8 - -119 - 7108 - - - - - + + + + + + + + + + + + + + + + + + Schema Definition Error + 'name' + element + + + + + + + + + 837 + 742.8 + -119 + 7108 + + + + + @@ -241,7 +241,7 @@ + model="hiddenGroup1" description="Unit test of hidden group ref."> @@ -253,7 +253,7 @@ - + @@ -273,9 +273,9 @@ - + + model="hiddenGroup2" description="Unit test of hidden group ref."> @@ -284,7 +284,7 @@ A sequence with hiddenGroupRef cannot have children - + @@ -309,7 +309,7 @@ - + @@ -321,15 +321,15 @@ - + - + + model="hiddenGroupRefEmptyString" description="Section 14 - Hidden Elements DFDL-14-037R."> @@ -361,7 +361,7 @@ --> + model="hiddenGroupRefDoesNotExist" description="Section 14 - Hidden Elements DFDL-14-037R."> @@ -377,9 +377,9 @@ Schema: hiddenGroup3 Purpose: This test demonstrates that hidden groups can contain regular DFDL annotations. --> - + + model="hiddenGroup3" description="Section 14 - Hidden Elements DFDL-14-037R."> @@ -391,15 +391,15 @@ - + - + + model="hiddenGroup3" description="Section 14 - Hidden Elements DFDL-14-037R."> @@ -407,7 +407,7 @@ Assertion failed - + @@ -430,7 +430,7 @@ - + @@ -458,15 +458,15 @@ - + - + + model="hiddenGroup4" description="Section 14 - Hidden Elements - DFDL-14-041R."> @@ -478,15 +478,15 @@ - + - + + model="hiddenGroup4" description="Section 14 - Hidden Elements - DFDL-14-041R."> @@ -498,18 +498,18 @@ - + - - - - + + + + @@ -521,15 +521,15 @@ - + - + + model="hiddenGroupChoice" description="Section 14 - Hidden Groups - DFDL-14-042R"> @@ -541,7 +541,7 @@ - + + model="hiddenGroupChoice" description="Section 14 - Hidden Groups - DFDL-14-042R" + roundTrip="twoPass"> @@ -562,7 +562,7 @@ - + @@ -586,30 +586,30 @@ - + - + + model="hiddenGroupLoop" description="Section 14 - Hidden Groups - DFDL-14-042R"> - - Schema Definition Error + + Schema Definition Error circular - - + + + description="hiddenGroupRef"> - - + + @@ -739,64 +739,64 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + lengthKind="delimited" separator="" + leadingSkip='0' encoding="US-ASCII" ignoreCase='no' initiator="" + terminator="" initiatedContent="no" textNumberRep="standard" + separatorSuppressionPolicy="trailingEmpty" separatorPosition="infix" + documentFinalTerminatorCanBeMissing='yes' textTrimKind="none"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -815,7 +815,7 @@ - + @@ -827,17 +827,17 @@ - - - - - - - + + + + + + + - + @@ -849,27 +849,27 @@ - - - - - ex:ab - - - - + + + + + ex:ab + + + + - + - + + model="hiddenGroup5" description="Section 14 - When the dfdl:hiddenGroupRef property is specified, all other DFDL properties are ignored. - DFDL-14-039R"> @@ -879,15 +879,15 @@ Unable to parse - + - + + model="hiddenGroup6" description="SEE ERRATA 3.1 - attribute form no longer allowed for hiddenGroupRef (Previous req DFDL-7-018R)"> @@ -896,15 +896,15 @@ A sequence with hiddenGroupRef cannot have children - + - + + model="hiddenGroup7" description="Section 7 - The hiddenGroupRef property may be specified in attribute or short form DFDL-7-018R"> @@ -913,61 +913,61 @@ A sequence with hiddenGroupRef cannot have children - + - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + + description="occursCount with expressions" + roundTrip="twoPass"> - - + + @@ -983,55 +983,55 @@ - + - - - - - - - - - - - - - - - - - - - - - - + lengthKind="delimited" separator="" + leadingSkip='0' encoding="US-ASCII" ignoreCase='no' initiator="" + terminator="" initiatedContent="no" textNumberRep="standard" + separatorSuppressionPolicy="anyEmpty" separatorPosition="infix" + occursCountKind="parsed" textTrimKind="none"/> + + + + + + + + - - + + + + + + + + + + + + + + + + - + + description="inputValueCalc expressions and hiddenGroupRef"> - - + +
@@ -1047,242 +1047,241 @@ - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - A - B - C - - - D - E - F - - - G - H - I - - - - - A - B - C - - - D - E - F - - - G - H - I - - - - - A - B - C - - - D - E - F - - - G - H - I - - - - - + occursCountKind='parsed'/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A + B + C + + + D + E + F + + + G + H + I + + + + + A + B + C + + + D + E + F + + + G + H + I + + + + + A + B + C + + + D + E + F + + + G + H + I + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + dfdl:lengthKind="delimited" dfdl:outputValueCalc="{ 1 }" /> + dfdl:lengthKind="delimited" /> + dfdl:lengthKind="delimited" /> + dfdl:lengthKind="delimited" /> - - - - - - - - - - - - A - B - C - x - - - D - E - F - y - - - G - H - I - z - - - - - A - B - C - 1 - - - D - E - F - 2 - - - G - H - I - 3 - - - - - A - B - C - u - - - D - E - F - v - - - G - H - I - w - - - - - + + + + + + + + + + + + A + B + C + x + + + D + E + F + y + + + G + H + I + z + + + + + A + B + C + 1 + + + D + E + F + 2 + + + G + H + I + 3 + + + + + A + B + C + u + + + D + E + F + v + + + G + H + I + w + + + + + @@ -1291,7 +1290,7 @@ - + @@ -1302,9 +1301,9 @@ Schema: emptySDEschema Purpose: This test demonstrates that DFDL allows complexTypes with empty content (not to be confused with NO content) --> - + + model="noDefault" description="Section 14 - DFDL-14-007R."> @@ -1317,7 +1316,7 @@ + model="sequenceWithComplexType.dfdl.xsd" description=""> -;test;test2/ @@ -1361,7 +1360,7 @@ --> + model="hiddenGroupSeqWithRequiredElements" description="Section 14 - Hidden Groups - DFDL-14-042R"> @@ -1401,7 +1400,7 @@ --> + model="hiddenGroupChoiceWithAllRequiredBranches" description="Section 14 - Hidden Groups - DFDL-14-042R"> @@ -1452,7 +1451,7 @@ + model="groupsWithAnnotations" description="Section 14 - Groups - DFDL-14-042R"> @@ -1467,7 +1466,7 @@ + model="groupsWithAnnotations" description="Section 14 - Groups - DFDL-14-042R"> @@ -1481,7 +1480,7 @@ + model="SimilarModelGroupRoot.dfdl.xsd" description="Section 14 - Groups - DFDL-14-042R"> @@ -1507,7 +1506,7 @@ - + @@ -1523,7 +1522,7 @@ + model="hiddenGroupIVC" description="Section 14 - Groups - DFDL-14-042R"> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml index 97b7214741..2765480ffe 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section14/sequence_groups/SequenceGroupInitiatedContent.tdml @@ -115,7 +115,7 @@ - + - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice1773.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice1773.tdml index 74b91893ec..7a6c9a6ad2 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice1773.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/choice1773.tdml @@ -23,6 +23,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" xmlns:ex="http://example.com" xmlns:fn="http://www.w3.org/2005/xpath-functions"> @@ -76,14 +77,14 @@ - + { ../C eq "1" } - + { ../C eq "2" } @@ -116,7 +117,8 @@ - + @@ -132,7 +134,8 @@ - + @@ -145,7 +148,6 @@ - diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/testSharedGroups.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/testSharedGroups.tdml index 43a92e5b08..05b2ee961e 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/testSharedGroups.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section15/choice_groups/testSharedGroups.tdml @@ -38,6 +38,12 @@ + + + DFDL property + ignored + choiceDispatchKey="{ 'V' }" + + + + DFDL property + ignored + choiceDispatchKey="{ 'V' }" + (invalid) badElement + + + DFDL property + ignored + choiceDispatchKey="{ 'V' }" + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayComb.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayComb.tdml index 61259d8f34..c5886d8998 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayComb.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayComb.tdml @@ -39,11 +39,13 @@ - - - { ../foo gt 0 } - - + + + + { ../foo gt 0 } + + + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml index 7e720546bb..28c744d56e 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml @@ -51,7 +51,7 @@ - + - + @@ -277,7 +277,7 @@ - + @@ -322,8 +322,8 @@ - - + + @@ -673,7 +673,7 @@ - + - + - + - + @@ -1070,7 +1070,7 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/UnparseArrayDelimitedOptionalElem.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/UnparseArrayDelimitedOptionalElem.tdml index 984472a2e0..8f4bad538b 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/UnparseArrayDelimitedOptionalElem.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/UnparseArrayDelimitedOptionalElem.tdml @@ -23,14 +23,15 @@ xmlns:ex="http://example.com" xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"> - + - + separator="," initiator="" terminator="" representation="text" separatorPosition="infix" + textPadKind="padChar" textStringPadCharacter="."/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/arrays_optional_elements.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/arrays_optional_elements.dfdl.xsd index c8a578ecf1..ebb98a512b 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/arrays_optional_elements.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/arrays_optional_elements.dfdl.xsd @@ -18,7 +18,7 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/backtracking.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/backtracking.tdml index 2f417fc9b9..337de7e3fa 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/backtracking.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section16/array_optional_elem/backtracking.tdml @@ -26,7 +26,7 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AQ.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AQ.tdml index aa3421ae9b..acfa364184 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AQ.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AQ.tdml @@ -47,7 +47,7 @@ + dfdl:inputValueCalc="{ xs:float(../tns:x - 2) }" /> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AR.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AR.tdml index 79ea147a7e..05f176baf6 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AR.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/AR.tdml @@ -54,7 +54,7 @@ + dfdl:inputValueCalc="{ xsd:float(../tns:x - 2) }" /> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/computedLengthFields.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/computedLengthFields.tdml index 53298ebe05..677cdd07f2 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/computedLengthFields.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/computedLengthFields.tdml @@ -21,6 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions" + xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com"> @@ -465,7 +466,8 @@ + dfdl:alignment="8" + daf:suppressSchemaDefinitionWarnings="ignoreDFDLProperty"/> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/inputValueCalc.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/inputValueCalc.tdml index 0a48944eed..16522b2ed9 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/inputValueCalc.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/inputValueCalc.tdml @@ -18,6 +18,7 @@ @@ -80,7 +81,7 @@ + dfdl:inputValueCalc="{ xs:float(xs:int(../ex:e2) div xs:int(../ex:e3)) }" /> @@ -469,7 +470,9 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/outputValueCalc2.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/outputValueCalc2.tdml index d595c4befa..10a58484cc 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/outputValueCalc2.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section17/calc_value_properties/outputValueCalc2.tdml @@ -219,7 +219,9 @@ + dfdl:outputValueCalc="{ xs:unsignedByte(../IPSrc) }" + daf:suppressSchemaDefinitionWarnings="noEmptyDefault" + /> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml index a20b94a17f..67acc9b1be 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml @@ -202,7 +202,7 @@ - + @@ -213,7 +213,8 @@ - + @@ -224,7 +225,8 @@ - + @@ -2632,7 +2634,7 @@ blastoff + dfdl:inputValueCalc="{ xs:int(dfdl:checkConstraints(if(../ex:cnt eq 0) then ../ex:cnt else .)) }" /> @@ -2812,15 +2814,17 @@ blastoff dfdl:occursCountKind="parsed"> - - - + + + - - + + + - - - + + + - - + + + @@ -7363,14 +7369,17 @@ blastoff - - + + - - + + @@ -7436,6 +7445,9 @@ blastoff 2.5 + + Performing deprecated automatic conversion + @@ -7467,6 +7479,9 @@ blastoff by zero + + Performing deprecated automatic conversion + @@ -7474,6 +7489,9 @@ blastoff by zero + + Performing deprecated automatic conversion + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml index b479a547ce..e3f7e13beb 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml @@ -544,7 +544,7 @@ - { dfdl:contentLength(., 'bytes') eq 3 } + { dfdl:contentLength(., 'bytes') eq 3 } @@ -4442,7 +4442,7 @@ - + @@ -4453,7 +4453,7 @@ - + @@ -14840,7 +14840,7 @@ - + @@ -14865,7 +14865,7 @@ - + diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section23/runtime_properties/runtime-properties.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section23/runtime_properties/runtime-properties.tdml index f59e476fbb..be44652032 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/section23/runtime_properties/runtime-properties.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/section23/runtime_properties/runtime-properties.tdml @@ -47,7 +47,7 @@ if (xs:unsignedByte(../ex:bom) eq 10) then 'bigEndian' else ( if (xs:unsignedByte(../ex:bom) eq 20) then 'littleEndian' - else dfdlx:error() + else fn:error() ) }]]> @@ -70,7 +70,7 @@ if (xs:unsignedByte(../ex:bom) eq 10) then 'bigEndian' else ( if (xs:unsignedByte(fn:trace(../ex:bom,'bom')) eq 20) then 'littleEndian' - else dfdlx:error() + else fn:error() ) }]]> @@ -92,7 +92,7 @@ @@ -114,7 +114,7 @@ diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/udf/udfs.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/udf/udfs.tdml index 492831d424..367208f17f 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/udf/udfs.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/udf/udfs.tdml @@ -48,7 +48,7 @@ dfdl:inputValueCalc="{ jgsu:replace('Hello World. I am.')}" /> + dfdl:inputValueCalc="{ xs:string(sgiu:addBoxed('Hello', 'world'))}" /> diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/unparser/parseUnparseMode.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/unparser/parseUnparseMode.dfdl.xsd index 9edf6bbb13..cc132b223b 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/unparser/parseUnparseMode.dfdl.xsd +++ b/daffodil-test/src/test/resources/org/apache/daffodil/unparser/parseUnparseMode.dfdl.xsd @@ -84,7 +84,7 @@ However, asserts aren't evaluated when unparsing, so we only error out here when parsing. --> - { dfdlx:error() } + { fn:error() } diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/usertests/SepTests.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/usertests/SepTests.tdml index 7d0280ad14..5827385767 100644 --- a/daffodil-test/src/test/resources/org/apache/daffodil/usertests/SepTests.tdml +++ b/daffodil-test/src/test/resources/org/apache/daffodil/usertests/SepTests.tdml @@ -44,7 +44,8 @@ ref="ex:GeneralFormat" representation="text" lengthKind="delimited" - separatorPosition="infix"/> + separatorPosition="infix" + emptyElementParsePolicy="treatAsEmpty"/> @@ -139,7 +140,8 @@ ref="ex:GeneralFormat" representation="text" lengthKind="delimited" - separatorPosition="infix"/> + separatorPosition="infix" + emptyElementParsePolicy="treatAsEmpty"/> @@ -313,7 +316,7 @@ @@ -350,10 +353,6 @@ madonna,,,,,,,,, - - emptyElementParsePolicy is deprecated - Use dfdl:emptyElementParsePolicy - Parse Error Empty element not allowed @@ -361,7 +360,7 @@ - 1,2,,3,4,,,5,,6 diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section05/simple_types/TestSimpleTypes.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section05/simple_types/TestSimpleTypes.scala index a74e2ce1bb..e9b8ce259d 100644 --- a/daffodil-test/src/test/scala/org/apache/daffodil/section05/simple_types/TestSimpleTypes.scala +++ b/daffodil-test/src/test/scala/org/apache/daffodil/section05/simple_types/TestSimpleTypes.scala @@ -410,8 +410,6 @@ class TestSimpleTypes { @Test def test_Int01(): Unit = { runner.runOneTest("Int01") } @Test def test_int_error(): Unit = { runner.runOneTest("int_error") } - // Test warning_exercise moved to scala-debug until warnings are implemented. - @Test def test_UnsignedNumbers1(): Unit = { runner.runOneTest("UnsignedNumbers1") } @Test def test_unsignedLong_01(): Unit = { runner.runOneTest("unsignedLong_01") } @Test def test_unsignedLong_02(): Unit = { runner.runOneTest("unsignedLong_02") } diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestSepTests.scala b/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestSepTests.scala index 2453e67998..69b1cd1666 100644 --- a/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestSepTests.scala +++ b/daffodil-test/src/test/scala/org/apache/daffodil/usertests/TestSepTests.scala @@ -60,8 +60,8 @@ class TestSepTests { @Test def test_sep_ssp_never_7(): Unit = { runner.runOneTest("test_sep_ssp_never_7") } // DAFFODIL-2791 - @Test def test_treatAsMissing_occursIndex(): Unit = { - runner.runOneTest("test_treatAsMissing_occursIndex") + @Test def test_treatAsAbsent_occursIndex(): Unit = { + runner.runOneTest("test_treatAsAbsent_occursIndex") } }