Fix grouping separator tests that
were incorrect due to a misinterpretation
of the spec.
DFDL-452
diff --git a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section13/text_number_props/TextNumberProps.tdml b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section13/text_number_props/TextNumberProps.tdml
index d1cc674..92a353b 100644
--- a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section13/text_number_props/TextNumberProps.tdml
+++ b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section13/text_number_props/TextNumberProps.tdml
@@ -115,8 +115,12 @@
-->
<xs:element name="tnp45" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberCheckPolicy="strict"
dfdl:textNumberPattern="#,##,###,####" dfdl:textStandardGroupingSeparator="," />
+ <xs:element name="tnp45b" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberCheckPolicy="strict"
+ dfdl:textNumberPattern="###,###,####" dfdl:textStandardGroupingSeparator="," />
+ <xs:element name="tnp45c" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberCheckPolicy="strict"
+ dfdl:textNumberPattern="##,#,###,####" dfdl:textStandardGroupingSeparator="," />
<xs:element name="tnp46" type="xs:int" dfdl:textNumberRep="standard" dfdl:textNumberCheckPolicy="strict"
- dfdl:textNumberPattern="#,###,###,###" dfdl:textStandardGroupingSeparator="," />
+ dfdl:textNumberPattern="#,###,##,#" dfdl:textStandardGroupingSeparator="," />
<xs:element name="tnp47" type="xs:float" dfdl:textNumberPattern="PP000"/>
<xs:element name="tnp48" type="xs:float" dfdl:textNumberPattern="000PP"/>
@@ -1680,7 +1684,7 @@
description="Section 13.6 - textStandardGroupingSeparator - DFDL-13-074R">
<tdml:document>
- <tdml:documentPart type="text">1,12,123,1234</tdml:documentPart>
+ <tdml:documentPart type="text">112,123,1234</tdml:documentPart>
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -1689,48 +1693,26 @@
</tdml:infoset>
</tdml:parserTestCase>
- <!--
- Test Name: textStandardGroupingSeparator14b
- Schema: textNumberPattern
- Root: tnp46
- Purpose: This test demonstrates that if a pattern contains multiple grouping separators, the interval between
- the last one and the end of the integer defines the primary grouping size, and the interval between
- the last two defines the secondary grouping size. All others are ignored,
- so "#,##,###,####" == "###,###,####" == "##,#,###,####".
- -->
-
- <tdml:parserTestCase name="textStandardGroupingSeparator14b" root="tnp46" model="textNumberPattern"
- description="Section 13.6 - textStandardGroupingSeparator - DFDL-13-074R">
-
- <tdml:document>
- <tdml:documentPart type="text">1,121,231,234</tdml:documentPart>
- </tdml:document>
- <tdml:infoset>
- <tdml:dfdlInfoset>
- <tnp45>1121231234</tnp45>
- </tdml:dfdlInfoset>
- </tdml:infoset>
- </tdml:parserTestCase>
<!--
Test Name: textStandardGroupingSeparator15
Schema: textNumberPattern
- Root: tnp45
+ Root: tnp45b
Purpose: This test demonstrates that if a pattern contains multiple grouping separators, the interval between
the last one and the end of the integer defines the primary grouping size, and the interval between
the last two defines the secondary grouping size. All others are ignored,
so "#,##,###,####" == "###,###,####" == "##,#,###,####".
-->
- <tdml:parserTestCase name="textStandardGroupingSeparator15" root="tnp45" model="textNumberPattern"
+ <tdml:parserTestCase name="textStandardGroupingSeparator15" root="tnp45b" model="textNumberPattern"
description="Section 13.6 - textStandardGroupingSeparator - DFDL-13-074R">
<tdml:document>
- <tdml:documentPart type="text">12,1,123,1234</tdml:documentPart>
+ <tdml:documentPart type="text">121,123,1234</tdml:documentPart>
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <tnp45>1211231234</tnp45>
+ <tnp45b>1211231234</tnp45b>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -1738,22 +1720,22 @@
<!--
Test Name: textStandardGroupingSeparator16
Schema: textNumberPattern
- Root: tnp45
+ Root: tnp45c
Purpose: This test demonstrates that if a pattern contains multiple grouping separators, the interval between
the last one and the end of the integer defines the primary grouping size, and the interval between
the last two defines the secondary grouping size. All others are ignored,
so "#,##,###,####" == "###,###,####" == "##,#,###,####".
-->
- <tdml:parserTestCase name="textStandardGroupingSeparator16" root="tnp45" model="textNumberPattern"
+ <tdml:parserTestCase name="textStandardGroupingSeparator16" root="tnp45c" model="textNumberPattern"
description="Section 13.6 - textStandardGroupingSeparator - DFDL-13-074R">
<tdml:document>
- <tdml:documentPart type="text">1,1,1234,1234</tdml:documentPart>
+ <tdml:documentPart type="text">121,123,1234</tdml:documentPart>
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <tnp45>1211231234</tnp45>
+ <tnp45c>1211231234</tnp45c>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -1772,11 +1754,11 @@
description="Section 13.6 - textStandardGroupingSeparator - DFDL-13-074R">
<tdml:document>
- <tdml:documentPart type="text">123,1,123,123</tdml:documentPart>
+ <tdml:documentPart type="text">12,12,12,1</tdml:documentPart>
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <tnp45>1121231234</tnp45>
+ <tnp46>1212121</tnp46>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberPropsDebug.scala b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberPropsDebug.scala
index 2ac2a35..4ebf877 100644
--- a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberPropsDebug.scala
+++ b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberPropsDebug.scala
@@ -76,11 +76,6 @@
@Test def test_textStandardGroupingSeparator12() { runner.runOneTest("textStandardGroupingSeparator12") }
@Test def test_textStandardDecimalSeparator17() { runner.runOneTest("textStandardDecimalSeparator17") }
- @Test def test_textStandardGroupingSeparator14() { runner.runOneTest("textStandardGroupingSeparator14") }
- @Test def test_textStandardGroupingSeparator15() { runner.runOneTest("textStandardGroupingSeparator15") }
- @Test def test_textStandardGroupingSeparator16() { runner.runOneTest("textStandardGroupingSeparator16") }
- @Test def test_textStandardGroupingSeparator17() { runner.runOneTest("textStandardGroupingSeparator17") }
-
// DFDL-853
@Test def test_textNumberPattern_pSymbol01() { runner.runOneTest("textNumberPattern_pSymbol01") }
@Test def test_textNumberPattern_pSymbol02() { runner.runOneTest("textNumberPattern_pSymbol02") }
diff --git a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberProps.scala b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberProps.scala
index 2b07ee2..062fe44 100644
--- a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberProps.scala
+++ b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section13/text_number_props/TestTextNumberProps.scala
@@ -126,10 +126,10 @@
@Test def test_textStandardGroupingSeparator10() { runner.runOneTest("textStandardGroupingSeparator10") }
@Test def test_textStandardGroupingSeparator11() { runner.runOneTest("textStandardGroupingSeparator11") }
@Test def test_textStandardGroupingSeparator13() { runner.runOneTest("textStandardGroupingSeparator13") }
-// @Test def test_textStandardGroupingSeparator14() { runner.runOneTest("textStandardGroupingSeparator14") }
-// @Test def test_textStandardGroupingSeparator15() { runner.runOneTest("textStandardGroupingSeparator15") }
-// @Test def test_textStandardGroupingSeparator16() { runner.runOneTest("textStandardGroupingSeparator16") }
-// @Test def test_textStandardGroupingSeparator17() { runner.runOneTest("textStandardGroupingSeparator17") }
+ @Test def test_textStandardGroupingSeparator14() { runner.runOneTest("textStandardGroupingSeparator14") }
+ @Test def test_textStandardGroupingSeparator15() { runner.runOneTest("textStandardGroupingSeparator15") }
+ @Test def test_textStandardGroupingSeparator16() { runner.runOneTest("textStandardGroupingSeparator16") }
+ @Test def test_textStandardGroupingSeparator17() { runner.runOneTest("textStandardGroupingSeparator17") }
// DFDL-851
// @Test def test_textStandardGroupingSeparator12() { runner.runOneTest("textStandardGroupingSeparator12") }
