From 809e26b34cc74359c6748e4f17be056fc9516abd Mon Sep 17 00:00:00 2001 From: Tejas Tiwari Date: Mon, 5 Jan 2026 07:27:05 -0500 Subject: [PATCH] Remove duplicated TDML content under test space/test 1 Rename the TDML file for clarity, and retain coverage for schemas and TDML files located in paths with spaces. Signed-off-by: Tejas Tiwari DAFFODIL-2539 --- .../test space/test 1/namespaces.tdml | 2063 ----------------- .../test space/test 1/spaceInNames.tdml | 48 + .../section00/general/TestGeneral.scala | 4 +- 3 files changed, 50 insertions(+), 2065 deletions(-) delete mode 100644 daffodil-test/src/test/resources/test space/test 1/namespaces.tdml create mode 100644 daffodil-test/src/test/resources/test space/test 1/spaceInNames.tdml diff --git a/daffodil-test/src/test/resources/test space/test 1/namespaces.tdml b/daffodil-test/src/test/resources/test space/test 1/namespaces.tdml deleted file mode 100644 index 305877acaf..0000000000 --- a/daffodil-test/src/test/resources/test space/test 1/namespaces.tdml +++ /dev/null @@ -1,2063 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 123 - - - - - - - - - - - - data - - - - - - - - - - - moredata - - - - - - - - - - - 3 - - - - - - - - - - - - - a - - - - - - - - - - - - 00011011 - - - - - 4 - 0 - 1 - 2 - 3 - - - - - - - - - -
- 118 - Ridgewood Circle - Rochester - NY -
-
-
-
- - - - - - - - - James - River -
- 118 - Ridgewood Circle - Rochester - NY -
-
-
-
-
- - - - - - - - - James - River -
- 118 - Ridgewood Circle - Rochester - NY -
-
-
-
-
- - - - - - - - - - - - - - - - Parse Error: Alternative failed - - - - - - - - - - - 123 - - - - - - - - - - - - - - - - - - - - - - - 5555 - - - - - - - - - - - - 10 - - - - - - - - - - Assertion - failed - dfdl:checkConstraints - - - - - - - - - Schema Definition Error - MinExclusive(11) must be less than or equal to MaxInclusive(10) - - - - - - - - - Schema Definition Error - MaxInclusive and MaxExclusive cannot be specified for the same simple type - - - - - - - - - Assertion failed for dfdl:checkConstraints(.) - - - - - - - - - - - - 1 - 3 - 2 - 5 - - - 5 - 4 - 3 - 1 - - - - - - - - - - - - - - 3 - 4 - 2 - 1 - 44 - 643 - 3 - 5 - 1 - - - - - - - - - - - - - 3 - 6 - 44 - 22 - 44 - 2 - 1 - 63 - 1 - - - - - - - - - - - - - - 53 - 41 - - - - - - - - - - - - Schema Definition Error - Overlapping properties - textNumberPadCharacter overlaps between nest2 and nestType. - - - - - - - - - - - - 5632 - - - - - - - - - - - - Parse Error - Insufficient Bits - - - - - - - - - Schema Definition Error: Property lengthKind is not defined - Default Properties - Non-default Properties - multi_A_03.dfdl.xsd - multi_B_03.dfdl.xsd - multi_C_03.dfdl.xsd - multi_D_03.dfdl.xsd - multi_E_03.dfdl.xsd - Location line 30 column 109 - - - - - - - - - - - 5632 - - - - - - - - - - - - - 5632 - - - - - - - - - - - - - 345432 - - - - - - - - - - - - - - 12345 - 123456 - 323 - - - 13222 - 764536 - 400 - - - - - - - - - - - - - - - 333 - 421 - 234 - - - 123 - 123 - 123 - 123 - - - - - - - - - - - - Schema Definition Error - - cannot contain two global components - same name - vagueElem - - - - - - - - - Schema Definition Error - More than one definition for name: pipes - - - - - - - - - Schema Definition Error - leadingSkip - initiator - separator - terminator - defineFormat - format - - - - - - - - - - - 333 - 343 - - - - - - - - - - - Schema Definition Error - Unknown time zone - Location line - - subfolder/multi_C_06_nons.dfdl.xsd - calendarTimeZone defined as '5 o'clock somewhere' - - - - - - - - - - - 1988-03-24+00:00 - - - - - - - - - - - - - one - two - - - - - - - - - - - Schema Definition Error - Import element specifies namespace http://b00.com but namespace http://b06.com of imported schema does not match - - - - - - - - - - - one - 55 - - - - - - - - - - 35 35 - 2C - 00 41 00 3A 00 6F 00 6E 00 65 00 3A 00 41 - - - - - 55 - one - - - - - - - - - - 35 35 - 00 6F 00 6E 00 65 - - - - - 55 - one - - - - - - - - - - 35 35 2c - 00 6F 00 6E 00 65 - - - - - 55 - one - - - - - - - - 1,2,3 - - - - - 1 - 2 - 3 - - - - - - - - - 98% 53% 100% - - - - - 98 - 53 - 100 - - - - - - - - - - - - - - foo1 - foo2 - - - - - - - - - - - - - foo1 - foo2 - - - - - - - - - - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - - - - - shi - shi - - - - - - - - - - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - - - Schema Definition Error - Error loading schema - 'shi:shi:string' is not a valid value for 'QName' - - - - - - - - - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - - - - - - - shi - shi - - shi - - - - - - - - - - - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - shi - - - - - - shi - shi - shi - - - - - - - - - - - shishishi122shishishi - - Schema Definition Error - MinInclusive(16) must be less than or equal to MaxInclusive(10) - shishi - Location line - section06/namespaces/shi - - - - - - - - - shi - shi - shi - 5 - shi - shi - shi - 12345 - shi - shi - shi - shi - shi - shi - shi - - - - - - 5 - 12345 - shi - - - - - - - - - - - 1 - - - 1 - - - - - - - - 03-04-2013,04-12-1997,05-22-1980 - - - - 2013-03-04+00:00 - 1997-04-12+00:00 - 1980-05-22+00:00 - - - - - - - - - thisIsNotAnInteger - - Parse Error - Convert to Integer (for xs:int) - Unable to parse 'thisIsNotAnInteger' - - - - - - - thisIsNotAnInteger - - Parse Error - Convert to Integer (for xs:int) - Unable to parse 'thisIsNotAnInteger' - - - - - - - thisIsNotAnInteger - - Schema Definition Error - No type definition found for 'foo:stringy' - - - - - - - 7 - - - - 7 - - - - - - - - - - - Schema Definition Error - Attribute 'textStringJustification' is not allowed to appear in element 'xs:element'.) - - - - - - - - - - - - - - a - - - - - - - - - - - - - d - - - - - - - - - - Schema Definition Error - Prefix fn has not been declared - - - - - - - 1:42 - - - 42 - - - - - - - - 1:42 - - - 42 - - - - - - - - 1:42 - - Schema Definition Error - Element or attribute do not match QName production: QName::=(NCName':')?NCName - - - - - - - 1:42 - - - 42 - - - - - - - - 1:42 - - Schema Definition Error - The prefix "xmlns" cannot be bound to any namespace explicitly; neither can the namespace for "xmlns" be bound to any prefix explicitly - - - - - - - - 512345 - - - - 5 - 12345 - - - - - - - - - - ....//.... - - - - ..../.... - - - - - - - - - - ....//.... - - - - ....//.... - - - - - - - - - - - - - -
- last - first - middle - DOB -
- - jones - robert - brandon - 1988-03-24 - - - johnson - john - henry - 1986-01-23 - - - jonesington - david - frederick - 1986-02-19 - -
-
-
-
- - - - - - - - - -
- last - first - middle - DOB -
- - jones - robert - brandon - 1988-03-24 - - - johnson - john - henry - 1986-01-23 - - - jonesington - david - frederick - 1986-02-19 - -
-
-
-
- - - - - - Schema Definition Error - line 15 - - - - - - - xyzzy,querty - - xyzzy - int - - - - - - - - - Schema Definition Error - Invalid dfdl annotation - xs:format - Schema context: - Location line 10 column 71 - section06/namespaces/multi_base_04_invalid.dfdl.xsd - - - - - - - - - Schema Definition Error - Invalid dfdl annotation - xs:format - Schema context: - Location line 10 column 71 - section06/namespaces/multi_B_04_invalid.dfdl.xsd - - - -
diff --git a/daffodil-test/src/test/resources/test space/test 1/spaceInNames.tdml b/daffodil-test/src/test/resources/test space/test 1/spaceInNames.tdml new file mode 100644 index 0000000000..ddabb7aab8 --- /dev/null +++ b/daffodil-test/src/test/resources/test space/test 1/spaceInNames.tdml @@ -0,0 +1,48 @@ + + + + + + + + + + + Schema Definition Error + cannot contain two global components + same name + vagueElem + + + + + diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala index c9fb785e47..1c022ecf8a 100644 --- a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala +++ b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestGeneral.scala @@ -81,7 +81,7 @@ class TestSpace1 extends TdmlTests { } object TestSpace2 extends TdmlSuite { - val tdmlResource = "/test space/test 1/namespaces.tdml" + val tdmlResource = "/test space/test 1/spaceInNames.tdml" } class TestSpace2 extends TdmlTests { @@ -91,7 +91,7 @@ class TestSpace2 extends TdmlTests { val e = intercept[Exception] { test } val m = e.getMessage() assertTrue(m.toLowerCase.contains("required resource")) - assertTrue(m.contains("/test%20space/test%201/namespaces.tdml")) + assertTrue(m.contains("/test%20space/test%201/spaceInNames.tdml")) assertTrue(m.toLowerCase.contains("not found")) } }