Modify test to properly test scenario when a missing optional
element is followed by a scalar. Remove duplicate test.
DFDL-1302
diff --git a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml
index ef92d43..b466df2 100644
--- a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml
+++ b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/ArrayOptionalElem.tdml
@@ -58,30 +58,9 @@
</xs:sequence>
</xs:complexType>
</xs:element>
-
+
</tdml:defineSchema>
-<!--
- Test Name: impOptArrayThenScalar02b
- Schema: s1
- Root: r4
- Purpose: This test demonsrates parsing a sequence of an optional array and a scalar
- with occursCountKind="implicit." In this case the optional array is not present.
--->
-
- <tdml:parserTestCase name="impOptArrayThenScalar02b" root="r4"
- model="s1">
- <tdml:document><![CDATA[3]]></tdml:document>
- <tdml:infoset xmlns="http://example.com">
- <tdml:dfdlInfoset>
- <r4>
- <sca>3</sca>
- </r4>
- </tdml:dfdlInfoset>
- </tdml:infoset>
-
- </tdml:parserTestCase>
-
<tdml:defineSchema name="array-optionalElem.dfdl.xsd">
<dfdl:format lengthKind="delimited" lengthUnits="bytes"
diff --git a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/UnparseArrayParsedOptionalElem.tdml b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/UnparseArrayParsedOptionalElem.tdml
index f858d62..5f26770 100644
--- a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/UnparseArrayParsedOptionalElem.tdml
+++ b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section16/array_optional_elem/UnparseArrayParsedOptionalElem.tdml
@@ -42,9 +42,9 @@
<dfdl:format lengthKind="explicit" length="1" ref="ex:daffodilTest1"
separator="" initiator="" terminator="" occursCountKind="parsed"
ignoreCase="no" textNumberRep="standard" representation="text"
- textPadKind='padChar' textStringPadCharacter="%SP;" />
+ textPadKind='padChar' textStringPadCharacter="%SP;" textNumberJustification="center"/>
<dfdl:defineFormat name="root">
- <dfdl:format lengthKind="implicit" ref="ex:daffodilTest1"
+ <dfdl:format lengthKind="implicit" ref="ex:daffodilTest1" textNumberJustification="center"
separator="" initiator="" terminator="" representation="text" />
</dfdl:defineFormat>
@@ -83,6 +83,16 @@
</xs:complexType>
</xs:element>
+ <xs:element name="r4b" dfdl:ref="ex:root">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="opt" type="xs:float" minOccurs="0"
+ maxOccurs="3" />
+ <xs:element name="sca" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
</tdml:defineSchema>
<!--
@@ -274,19 +284,19 @@
<!--
Test Name: parsedOptArrayThenScalar03
Schema: s1
- Root: r4
+ Root: r4b
Purpose: This test demonsrates unparsing a sequence of an optional array and a scalar
with occursCountKind="parsed." In this case the optional array is not present.
-->
- <tdml:unparserTestCase name="parsedOptArrayThenScalar03" root="r4"
+ <tdml:unparserTestCase name="parsedOptArrayThenScalar03" root="r4b"
model="s1">
<tdml:infoset xmlns="http://example.com">
<tdml:dfdlInfoset>
- <r4>
+ <r4b>
<sca>3</sca>
- </r4>
+ </r4b>
</tdml:dfdlInfoset>
</tdml:infoset>
<tdml:document><![CDATA[3]]></tdml:document>
diff --git a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElemDebug.scala b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElemDebug.scala
index 15b1396..e65440e 100644
--- a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElemDebug.scala
+++ b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElemDebug.scala
@@ -50,7 +50,5 @@
@Test def test_arrayExpressions03() { runner.runOneTest("arrayExpressions03") }
- //DFDL-1302
- @Test def test_impOptArrayThenScalar02b() { runner.runOneTest("impOptArrayThenScalar02b") }
}
diff --git a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElemDebug.scala b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElemDebug.scala
index a2a822b..3591381 100644
--- a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElemDebug.scala
+++ b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElemDebug.scala
@@ -86,7 +86,4 @@
//DFDL-1301
@Test def test_fixedUnparseArrayTooManyElements01() { runner_fixed.runOneTest("fixedUnparseArrayTooManyElements01") }
- //DFDL-1302
- @Test def test_parsedOptArrayThenScalar03() { runner_parsed.runOneTest("parsedOptArrayThenScalar03") }
-
}
diff --git a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElem.scala b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElem.scala
index 909ee59..911aeae 100644
--- a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElem.scala
+++ b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestArrayOptionalElem.scala
@@ -91,9 +91,6 @@
import TestArrayOptionalElem._
- //DFDL-1302
- //@Test def test_impOptArrayThenScalar02b() { runner.runOneTest("impOptArrayThenScalar02b") }
-
@Test def test_arrayExpressions01() { runner.runOneTest("arrayExpressions01") }
@Test def test_arrayExpressions02() { runner.runOneTest("arrayExpressions02") }
@Test def test_arrayExpressions02b() { runner.runOneTest("arrayExpressions02b") }
diff --git a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElem.scala b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElem.scala
index d525827..dd793bd 100644
--- a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElem.scala
+++ b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section16/array_optional_elem/TestUnparseArrayOptionalElem.scala
@@ -95,9 +95,6 @@
@Test def test_impOptScalarThenArray03() { runner_imp.runOneTest("impOptScalarThenArray03") }
@Test def test_impOptArrayThenScalar03() { runner_imp.runOneTest("impOptArrayThenScalar03") }
- //DFDL-1302
- //@Test def test_parsedOptArrayThenScalar03() { runner_parsed.runOneTest("parsedOptArrayThenScalar03") }
-
@Test def test_fixedOptPresent() { runner_fixed.runOneTest("fixedOptPresent") }
@Test def test_fixedOptPresentArray() { runner_fixed.runOneTest("fixedOptPresentArray") }
@Test def test_fixedOptAbsentArray() { runner_fixed.runOneTest("fixedOptAbsentArray") }
@@ -126,5 +123,6 @@
@Test def test_parsedOptScalarThenArray02() { runner_parsed.runOneTest("parsedOptScalarThenArray02") }
@Test def test_parsedOptArrayThenScalar() { runner_parsed.runOneTest("parsedOptArrayThenScalar") }
@Test def test_parsedOptArrayThenScalar02() { runner_parsed.runOneTest("parsedOptArrayThenScalar02") }
+ @Test def test_parsedOptArrayThenScalar03() { runner_parsed.runOneTest("parsedOptArrayThenScalar03") }
}
