Modifying a few tdml tests to be Windows compatible.
These all involve minor changes (LF vs CRLF) that do not affect the
purpose of the test.
DFDL-877
diff --git a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section12/length_properties/LengthProperties.tdml b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section12/length_properties/LengthProperties.tdml
index 4904b6b..9c30b55 100644
--- a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section12/length_properties/LengthProperties.tdml
+++ b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section12/length_properties/LengthProperties.tdml
@@ -666,22 +666,14 @@
<!--
Test name: LengthProp_longTextLength
Schema: LengthProperties-lengthNumeric.dfdl.xsd
- Purpose: This document is only 556 bytes (expected 557 bytes) and should
+ Purpose: This document is not enough bytes (expected 557 bytes) and should
cause an error.
-->
<tdml:parserTestCase name="LengthProp_longTextLength"
root="LP_04" model="LengthProperties-lengthNumeric.dfdl.xsd"
description="Section 12 Length Properties - DFDL-12-161R">
- <tdml:document><![CDATA[Four score and seven years ago our fathers brought forth on this
-continent a new nation, conceived in liberty, and dedicated to the
-proposition that all men are created equal. Now we are engaged in
-a great civil war, testing whether that nation, or any nation, so
-conceived and so dedicated, can long endure. We are met on a great
-battle-field of that war. We have come to dedicate a portion of
-that field, as a final resting place for those who here gave their
-lives that that nation might live. It is altogether fitting and
-proper that we should do this]]></tdml:document>
+ <tdml:document><![CDATA[Four score and seven years ago our fathers brought forth on this continent a new nation, conceived in liberty, and dedicated to the proposition that all men are created equal. Now we are engaged in a great civil war, testing whether that nation, or any nation, so conceived and so dedicated, can long endure. We are met on a great battle-field of that war. We have come to dedicate a portion of that field, as a final resting place for those who here gave their lives that that nation might live. It is altogether fitting and proper that we should do this]]></tdml:document>
<tdml:errors>
<tdml:error>Parse failed to find exactly 557 characters</tdml:error>
</tdml:errors>
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 f826c37..76735a8 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
@@ -3267,7 +3267,7 @@
dfdl:textStandardExponentRep="%NL;" />
<xs:element name="expCharEntities" dfdl:lengthKind="delimited" dfdl:terminator="]" type="xsd:double"
- dfdl:textStandardExponentRep="%LF;" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
+ dfdl:textStandardExponentRep="%SP;" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
<xs:element name="expCharEntities2" dfdl:lengthKind="delimited" dfdl:terminator="]" type="xsd:double"
dfdl:textStandardExponentRep="%HT;" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
@@ -3333,13 +3333,13 @@
dfdl:textStandardNaNRep="%NL;" />
<xs:element name="nanCharEntities" dfdl:lengthKind="delimited" dfdl:terminator="]" type="xsd:double"
- dfdl:textStandardNaNRep="nota%LF;number" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
+ dfdl:textStandardNaNRep="nota%SP;number" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
<xs:element name="infCharClasses" dfdl:lengthKind="delimited" dfdl:terminator="]" type="xsd:double"
dfdl:textStandardInfinityRep="%NL;" />
<xs:element name="infCharEntities" dfdl:lengthKind="delimited" dfdl:terminator="]" type="xsd:double"
- dfdl:textStandardInfinityRep="infin%LF;ity" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
+ dfdl:textStandardInfinityRep="infin%SP;ity" dfdl:textNumberPattern="###0.###E00;-###0.###E00"/>
<xs:element name="zero" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -3610,8 +3610,7 @@
description="Parse a double with textStandardExponentRep containing a DFDL character entity">
<tdml:document>
- <tdml:documentPart type="text"><![CDATA[1234567.89
-2]]]></tdml:documentPart>
+ <tdml:documentPart type="text"><![CDATA[1234567.89 2]]]></tdml:documentPart>
</tdml:document>
<tdml:infoset>
@@ -3875,8 +3874,7 @@
description="Parse a double with textStandardNaNRep containing a DFDL character entity">
<tdml:document>
- <tdml:documentPart type="text"><![CDATA[nota
-number]]]></tdml:documentPart>
+ <tdml:documentPart type="text"><![CDATA[nota number]]]></tdml:documentPart>
</tdml:document>
<tdml:infoset>
@@ -3906,8 +3904,7 @@
description="Parse a double with textStandardInfinityRep containing a DFDL character entity">
<tdml:document>
- <tdml:documentPart type="text"><![CDATA[infin
-ity]]]></tdml:documentPart>
+ <tdml:documentPart type="text"><![CDATA[infin ity]]]></tdml:documentPart>
</tdml:document>
<tdml:infoset>
diff --git a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/expressions.tdml b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/expressions.tdml
index de45ce0..dae98cd 100644
--- a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/expressions.tdml
+++ b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/expressions.tdml
@@ -481,7 +481,7 @@
<xs:complexType>
<xs:sequence>
<xs:element name="e1" type="xs:int" maxOccurs="unbounded"
- dfdl:lengthKind="delimited" dfdl:terminator="]%#xA;=" />
+ dfdl:lengthKind="delimited" dfdl:terminator="]%NL;=" />
</xs:sequence>
</xs:complexType>
</xs:element>
