fixup! Address unexpected warnings

- update warnings to do keyword searching - fix bug in test DAFFODIL-2926
apache · Sep 23, 2024 · dee7ebb · dee7ebb
1 parent 3697303
commit dee7ebb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 17 deletions.
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
@@ -806,8 +806,11 @@
     </tdml:infoset>
     <tdml:warnings>
       <tdml:warning>FacetsContradict</tdml:warning>
-      <tdml:warning>'t' contradicts with value of 'minLength' facet</tdml:warning>
-      <tdml:warning>'three' contradicts with value of 'maxLength' facet</tdml:warning>
+      <tdml:warning>'t'</tdml:warning>
+      <tdml:warning>three</tdml:warning>
+      <tdml:warning>contradicts</tdml:warning>
+      <tdml:warning>minLength</tdml:warning>
+      <tdml:warning>maxLength</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 
@@ -831,8 +834,11 @@
     </tdml:validationErrors>
     <tdml:warnings>
       <tdml:warning>FacetsContradict</tdml:warning>
-      <tdml:warning>'t' contradicts with value of 'minLength' facet</tdml:warning>
-      <tdml:warning>'three' contradicts with value of 'maxLength' facet</tdml:warning>
+      <tdml:warning>'t'</tdml:warning>
+      <tdml:warning>three</tdml:warning>
+      <tdml:warning>contradicts</tdml:warning>
+      <tdml:warning>minLength</tdml:warning>
+      <tdml:warning>maxLength</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 
@@ -856,8 +862,11 @@
     </tdml:validationErrors>
     <tdml:warnings>
       <tdml:warning>FacetsContradict</tdml:warning>
-      <tdml:warning>'t' contradicts with value of 'minLength' facet</tdml:warning>
-      <tdml:warning>'three' contradicts with value of 'maxLength' facet</tdml:warning>
+      <tdml:warning>'t'</tdml:warning>
+      <tdml:warning>three</tdml:warning>
+      <tdml:warning>contradicts</tdml:warning>
+      <tdml:warning>minLength</tdml:warning>
+      <tdml:warning>maxLength</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 
@@ -880,8 +889,11 @@
     </tdml:validationErrors>
     <tdml:warnings>
       <tdml:warning>FacetsContradict</tdml:warning>
-      <tdml:warning>'t' contradicts with value of 'minLength' facet</tdml:warning>
-      <tdml:warning>'three' contradicts with value of 'maxLength' facet</tdml:warning>
+      <tdml:warning>'t'</tdml:warning>
+      <tdml:warning>three</tdml:warning>
+      <tdml:warning>contradicts</tdml:warning>
+      <tdml:warning>minLength</tdml:warning>
+      <tdml:warning>maxLength</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 
@@ -900,8 +912,11 @@
     </tdml:infoset>
     <tdml:warnings>
       <tdml:warning>FacetsContradict</tdml:warning>
-      <tdml:warning>'t' contradicts with value of 'minLength' facet</tdml:warning>
-      <tdml:warning>'three' contradicts with value of 'maxLength' facet</tdml:warning>
+      <tdml:warning>'t'</tdml:warning>
+      <tdml:warning>three</tdml:warning>
+      <tdml:warning>contradicts</tdml:warning>
+      <tdml:warning>minLength</tdml:warning>
+      <tdml:warning>maxLength</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 
@@ -924,8 +939,11 @@
     </tdml:validationErrors>
     <tdml:warnings>
       <tdml:warning>FacetsContradict</tdml:warning>
-      <tdml:warning>'t' contradicts with value of 'minLength' facet</tdml:warning>
-      <tdml:warning>'three' contradicts with value of 'maxLength' facet</tdml:warning>
+      <tdml:warning>'t'</tdml:warning>
+      <tdml:warning>three</tdml:warning>
+      <tdml:warning>contradicts</tdml:warning>
+      <tdml:warning>minLength</tdml:warning>
+      <tdml:warning>maxLength</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 

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
@@ -552,7 +552,7 @@
     <tdml:infoset>
       <tdml:dfdlInfoset xmlns:xs="http://www.w3.org/2001/XMLSchema"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-        <int03 xsi:type="xs:string">37</int03>
+        <int03 xsi:type="xs:int">37</int03>
       </tdml:dfdlInfoset>
     </tdml:infoset>
     <tdml:warnings>

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
@@ -2650,7 +2650,9 @@
     <!-- test will fail after escapeScheme is refactored -->
     <tdml:warnings>
       <tdml:warning>Cannot set variable</tdml:warning>
-      <tdml:warning>EscapeChar after reading the default value</tdml:warning>
+      <tdml:warning>EscapeChar</tdml:warning>
+      <tdml:warning>after reading</tdml:warning>
+      <tdml:warning>default value</tdml:warning>
     </tdml:warnings>
   </tdml:parserTestCase>
 

diff --git a/...test/src/test/resources/org/apache/daffodil/section15/choice_groups/testSharedGroups.tdml b/...test/src/test/resources/org/apache/daffodil/section15/choice_groups/testSharedGroups.tdml
@@ -40,7 +40,9 @@
     </infoset>
     <!-- test will fail with missing warning once DAFFODIL-2875 is fixed -->
     <warnings>
-      <warning>DFDL property was ignored: choiceDispatchKey="{ 'V' }"</warning>
+      <warning>DFDL property</warning>
+      <warning>ignored</warning>
+      <warning>choiceDispatchKey="{ 'V' }"</warning>
     </warnings>
   </unparserTestCase>
 
@@ -59,7 +61,9 @@
     </infoset>
     <!-- test will fail with missing warning once DAFFODIL-2875 is fixed -->
     <warnings>
-      <warning>DFDL property was ignored: choiceDispatchKey="{ 'V' }"</warning>
+      <warning>DFDL property</warning>
+      <warning>ignored</warning>
+      <warning>choiceDispatchKey="{ 'V' }"</warning>
     </warnings>
   </unparserTestCase>
 
@@ -86,7 +90,9 @@
     </errors>
     <!-- test will fail with missing warning once DAFFODIL-2875 is fixed -->
     <warnings>
-      <warning>DFDL property was ignored: choiceDispatchKey="{ 'V' }"</warning>
+      <warning>DFDL property</warning>
+      <warning>ignored</warning>
+      <warning>choiceDispatchKey="{ 'V' }"</warning>
     </warnings>
   </unparserTestCase>