mbeckerle closed pull request #147: DAFFODIL-20 - All ibm-provided tests run,
or are specific to other tickets.
URL: https://github.com/apache/incubator-daffodil/pull/147
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
index 5fbc9e2d2..459d2e042 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/alignment_bytes_12.dfdl.xsd
@@ -33,6 +33,7 @@
initiatedContent="no"
textPadKind="none" textTrimKind="none" textStringJustification="left"
occursCountKind="implicit"
separatorSuppressionPolicy="trailingEmpty"
bitOrder="mostSignificantBitFirst"
+ binaryNumberRep="binary"
/>
</xs:appinfo>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
index a7ad8ff55..148920d3d 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol101.dfdl.xsd
@@ -79,9 +79,10 @@
dfdl:representation="text"
dfdl:textBooleanJustification="right"
dfdl:lengthUnits="bytes"
- dfdl:lengthKind="implicit"
+ dfdl:lengthKind="explicit"
+ dfdl:length="4"
dfdl:textBooleanTrueRep="true"
- dfdl:textBooleanFalseRep="no">
+ dfdl:textBooleanFalseRep="nope">
</xs:element>
</xs:sequence>
</xs:complexType>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol102.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol102.dfdl.xsd
index d71715b60..069d15079 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol102.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpabol102.dfdl.xsd
@@ -24,10 +24,11 @@
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/";>
<dfdl:format initiator="" terminator="" leadingSkip="0"
trailingSkip="0" truncateSpecifiedLengthString="no" separator="" textBidi="no"
floating="no" ref="booleanBinary" escapeSchemeRef=""
- encodingErrorPolicy="error" encoding="utf-8"
byteOrder="bigEndian" lengthUnits="characters"
+ encodingErrorPolicy="error" encoding="utf-8"
byteOrder="bigEndian" lengthUnits="bytes"
textOutputMinLength="1" alignment="1"
alignmentUnits="bytes"
fillByte="f" occursCountKind="implicit"
ignoreCase="no"
- lengthKind="delimited" sequenceKind="ordered"
initiatedContent="no" />
+ lengthKind="delimited" sequenceKind="ordered"
initiatedContent="no"
+ textPadKind="none" />
</xs:appinfo>
</xs:annotation>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadeloneini_01.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadeloneini_01.dfdl.xsd
index d707ecc56..4d52d9de1 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadeloneini_01.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadeloneini_01.dfdl.xsd
@@ -67,7 +67,7 @@
<xs:complexType>
<xs:sequence dfdl:sequenceKind="ordered"
dfdl:initiatedContent="no" dfdl:separator="* -"
- dfdl:separatorPosition="prefix"
dfdl:separatorSuppressionPolicy="never">
+ dfdl:separatorPosition="prefix"
dfdl:separatorSuppressionPolicy="anyEmpty">
<xs:element name="Test1" type="xs:int"
dfdl:initiator="Test1:"
dfdl:terminator="+" />
<xs:element name="Test2" minOccurs="0"
maxOccurs="1" type="xs:string"
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext1.tdml
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext1.tdml
index 6b75eaf6d..941bb0fdb 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext1.tdml
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext1.tdml
@@ -553,8 +553,7 @@ entity NL and also use of UTF-16 encoding - DFDL-6-045R"
<tdml:dfdlInfoset>
<Fixed_bin_cal_sequence>
<mystr>a</mystr>
- <bincal2 xsi:type="xs:dateTime">
-
1970-01-01T00:01:00.000000+00:00</bincal2>
+ <bincal2
xsi:type="xs:dateTime"><![CDATA[1970-01-01T00:01:00+00:00]]></bincal2>
</Fixed_bin_cal_sequence>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -740,7 +739,7 @@ entity NL and also use of UTF-16 encoding - DFDL-6-045R"
</tdml:infoset>
</tdml:parserTestCase>
-<tdml:parserTestCase name="length_delimited_12_05" unsupported="true"
+<tdml:parserTestCase name="length_delimited_12_05"
model="dpadelbcd_01.dfdl.xsd" description="Section 12.3 Properties for
specifying length - binary - bcd - delimited"
root="mybinDecimal2">
<tdml:document><tdml:documentPart
type="byte">1234567840</tdml:documentPart></tdml:document>
@@ -819,7 +818,7 @@ entity NL and also use of UTF-16 encoding - DFDL-6-045R"
<tdml:parserTestCase name="multiple_delimiters2"
model="dpaextdeltxt101.dfdl.xsd" description="Section 14 Sequence groups with
delimiters, a whitespace separated list for separator - DFDL-14-008R"
root="myStringSeq4"
- roundTrip="twoPass">
+ roundTrip="twoPass" implementations="daffodil">
<tdml:document>abcde|fghij|klmno::pqrst|uvwzy|z]</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -839,7 +838,28 @@ entity NL and also use of UTF-16 encoding - DFDL-6-045R"
</tdml:infoset>
</tdml:parserTestCase>
-
+ <tdml:parserTestCase name="multiple_delimiters2_ibm"
+ model="dpaextdeltxt101.dfdl.xsd" description="Section 14 Sequence groups with
delimiters, a whitespace separated list for separator - DFDL-14-008R"
+ root="myStringSeq4"
+ roundTrip="twoPass" implementations="ibm">
+ <tdml:document>abcde|fghij|klmno::pqrst|uvwzy|z]</tdml:document>
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <myStringSeq4>
+ <seq1>
+ <element1>abcde</element1>
+ <element2>fghij</element2>
+ <element3>klmno</element3>
+ </seq1>
+ <seq2>
+ <element1>pqrst</element1>
+ <element2>uvwzy</element2>
+ <element3>z</element3>
+ </seq2>
+ </myStringSeq4>
+</tdml:dfdlInfoset>
+</tdml:infoset>
+ </tdml:parserTestCase>
</tdml:testSuite>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext2.tdml
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext2.tdml
index aa976170f..eb72ec775 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext2.tdml
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaext2.tdml
@@ -261,7 +261,8 @@
<tdml:parserTestCase name="simple_type_properties_text_calendar_13_01"
root="myDateTime"
model="./fvt/ext/dpa/dpacaltxt_43.dfdl.xsd"
description="Section 13.10 Properties for calendar text
-calendarPattern, calendarPatternKind, celendarFirstDayOfWeek
- calendardDaysInFirstWeek , Section 13.12 -
textCalendarJustification, textCalendarPadCharacter">
+ calendardDaysInFirstWeek , Section 13.12 -
textCalendarJustification, textCalendarPadCharacter"
+ roundTrip="twoPass">
<tdml:document>xxxx2011040506MON01@</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -275,7 +276,8 @@
<tdml:parserTestCase name="simple_type_properties_text_calendar_13_02"
root="calendar_group"
roundTrip="twoPass"
model="./fvt/ext/dpa/dpacaltxt_43.dfdl.xsd"
- description="Section 13.10 Properties for calendar text -
implicit patterns for date, time, and dateTime ">
+ description="Section 13.10 Properties for calendar text -
implicit patterns for date, time, and dateTime "
+ implementations="daffodil">
<tdml:document>2010-12-30*04:05:06+01:00*2010-12-30T04:05:06@@</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -287,6 +289,27 @@
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
+
+ <!-- Until DAFFODIL-2026 (type-dependent comparison for TDML tests) is
implemented, we need
+ some tests to be split into IBM tests, and Daffodil tests since different
equivalent infosets are
+ allowed. -->
+ <tdml:parserTestCase name="simple_type_properties_text_calendar_13_02_ibm"
root="calendar_group"
+ roundTrip="twoPass"
+ model="./fvt/ext/dpa/dpacaltxt_43.dfdl.xsd"
+ description="Section 13.10 Properties for calendar text - implicit
patterns for date, time, and dateTime "
+ implementations="ibm">
+
<tdml:document>2010-12-30*04:05:06+01:00*2010-12-30T04:05:06@@</tdml:document>
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <calendar_group>
+ <date1 xsi:type="xs:date">2010-12-30Z</date1>
+ <time1 xsi:type="xs:time">04:05:06.000+01:00</time1>
+ <datetime1
xsi:type="xs:dateTime">2010-12-30T04:05:06.000Z</datetime1>
+ </calendar_group>
+ </tdml:dfdlInfoset>
+ </tdml:infoset>
+ </tdml:parserTestCase>
+
<tdml:parserTestCase name="simple_type_properties_text_calendar_13_03"
root="myDateTime"
roundTrip="twoPass"
@@ -387,7 +410,7 @@
<tdml:parserTestCase name="sequences_separated_14_04" root="groupElem2"
model="./fvt/ext/dpa/dpadeloneini_01.dfdl.xsd"
description="Section 14 Sequences Groups - missing optional
element 3 ">
- <tdml:document>*Test1:1+*Test2:myString+*</tdml:document>
+ <tdml:document>*Test1:1+*Test2:myString+</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<groupElem2>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
index a77cce8cc..71dfbc47a 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaimptxt.dfdl.xsd
@@ -44,7 +44,8 @@
dfdl:lengthKind="implicit">
<xs:simpleType>
<xs:restriction base="xs:string">
- <xs:maxLength value="5"/>
+ <xs:maxLength value="5"/>
+ <xs:minLength value="5"/>
</xs:restriction>
</xs:simpleType>
</xs:element>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
index 56f3aac03..13fbd759f 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc82_01.dfdl.xsd
@@ -51,7 +51,7 @@
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/";>
<dfdl:defineFormat name="myFormat">
- <dfdl:format initiator="" terminator=""
leadingSkip="0" trailingSkip="0" truncateSpecifiedLengthString="no"
separator="" textBidi="no" floating="no" encodingErrorPolicy="error"
encodingErrorPolicy="error" encoding="ASCII" />
+ <dfdl:format initiator="" terminator=""
leadingSkip="0" trailingSkip="0" truncateSpecifiedLengthString="no"
separator="" textBidi="no" floating="no" encodingErrorPolicy="error"
encoding="ASCII" />
</dfdl:defineFormat>
</xs:appinfo>
</xs:annotation>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
index 208eb7d71..6428ef5a2 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
@@ -18,7 +18,7 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema";
targetNamespace="http://example.com";
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:tns="http://example.com";>
<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
@@ -42,12 +42,12 @@
<complexType>
<sequence>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
- <element name="x" type="xsd:boolean" maxOccurs="unbounded"
+ <element name="x" type="xs:boolean" maxOccurs="unbounded"
dfdl:textBooleanTrueRep="yes Y 1" dfdl:textBooleanFalseRep="no N
0" />
</sequence>
<sequence dfdl:separator="," dfdl:terminator="%NL;">
- <element name="y" type="xsd:boolean" maxOccurs="unbounded"
- dfdl:textBooleanTrueRep="{ xsd:string(1*10) }"
dfdl:textBooleanFalseRep="{'a b c'}" />
+ <element name="y" type="xs:boolean" maxOccurs="unbounded"
+ dfdl:textBooleanTrueRep="{ xs:string(1*10) }"
dfdl:textBooleanFalseRep="{'a b c'}" />
</sequence>
</sequence>
</complexType>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
index b0de2b824..5f87878db 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
@@ -26,7 +26,8 @@
<tdml:defineSchema name="baseline">
<xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
- <dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed" />
+ <dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed"
+ encodingErrorPolicy="error"/>
<xs:element name="e1" dfdl:lengthKind="implicit"
dfdl:terminator=".">
@@ -38,11 +39,12 @@
</xs:sequence>
</xs:complexType>
</xs:element>
-
+
</tdml:defineSchema>
-
+
<tdml:parserTestCase name="baseline" root="e1"
- model="baseline" description="Baseline. Basic Separators">
+ model="baseline" description="Baseline. Basic Separators"
+ implementations="daffodil">
<tdml:document>
<tdml:documentPart type="text"><![CDATA[5;6;7;8;.]]></tdml:documentPart>
@@ -59,11 +61,57 @@
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
+
+ <tdml:defineSchema name="baseline_ibm">
+ <xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed"
+ encodingErrorPolicy="error"/>
+
+ <xs:element name="e1a" dfdl:lengthKind="implicit"
+ dfdl:terminator=".">
+ <xs:complexType>
+ <xs:sequence dfdl:separator=";" dfdl:terminator=";">
+ <xs:element name="s1" type="xs:int"
+ dfdl:lengthKind="delimited" minOccurs="0"
+ dfdl:occursCountKind="parsed" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ </tdml:defineSchema>
+
+
+ <tdml:parserTestCase name="baseline_ibm" root="e1a"
+ model="baseline_ibm" description="Baseline. Basic Separators"
+ implementations="ibm">
+
+ <tdml:document>
+ <tdml:documentPart type="text"><![CDATA[5;6;7;8;.]]></tdml:documentPart>
+ </tdml:document>
+
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <e1a>
+ <s1>5</s1>
+ <s1>6</s1>
+ <s1>7</s1>
+ <s1>8</s1>
+ </e1a>
+ </tdml:dfdlInfoset>
+ </tdml:infoset>
+
+ <tdml:warnings>
+ <tdml:warning>separator</tdml:warning>
+ <tdml:warning>terminator</tdml:warning>
+ </tdml:warnings>
+ </tdml:parserTestCase>
+
<tdml:defineSchema name="basicNest">
<xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
- <dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed" />
+ <dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed"
+ encodingErrorPolicy="error"/>
<xs:element name="e1" dfdl:lengthKind="implicit"
dfdl:terminator=".">
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
index 39c9fd7cc..fdebbadb6 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
@@ -29,7 +29,8 @@
<tdml:defineSchema name="nestedGroupRefs1">
<xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
- occursCountKind="parsed" />
+ occursCountKind="parsed"
+ encodingErrorPolicy="error"/>
<xs:element name="root">
<xs:complexType>
diff --git
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
index c0189fdf0..bf7fabfa3 100644
---
a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
+++
b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
@@ -25,7 +25,8 @@
<tdml:defineSchema name="seqDelim">
<xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
- <dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
+ <dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
+ encodingErrorPolicy="error" />
<xs:element name="ch1" dfdl:lengthKind="delimited">
<xs:complexType>
diff --git
a/daffodil-test-ibm1/src/test/scala-debug/org/apache/daffodil/IBMTests2.scala
b/daffodil-test-ibm1/src/test/scala-debug/org/apache/daffodil/IBMTests2.scala
index 111e0c615..f40b68ecd 100644
---
a/daffodil-test-ibm1/src/test/scala-debug/org/apache/daffodil/IBMTests2.scala
+++
b/daffodil-test-ibm1/src/test/scala-debug/org/apache/daffodil/IBMTests2.scala
@@ -22,21 +22,7 @@ import org.apache.daffodil.tdml.DFDLTestSuite
import org.apache.daffodil.util.Misc
import org.junit.Test
-/**
- * Delete this class once these regressions have been addressed.
- */
-//class IBMTestRegressions {
-//
-// val testDir = "/test-suite/ibm-contributed/"
-// val tdml1 = testDir + "dpaext1.tdml"
-// val tdml2 = testDir + "dpaext2.tdml"
-// lazy val runner1 = new DFDLTestSuite(Misc.getRequiredResource(tdml1))
-// lazy val runner2 = new DFDLTestSuite(Misc.getRequiredResource(tdml2))
-//
-// // Nothing here! Great!
-//}
-
-class IBMTestsThatThrow {
+class IBMTestsThatFail {
val testDir = "/test-suite/ibm-contributed/"
val tdml1 = testDir + "dpaext1.tdml"
@@ -44,22 +30,15 @@ class IBMTestsThatThrow {
lazy val runner1 = new DFDLTestSuite(Misc.getRequiredResource(tdml1))
lazy val runner2 = new DFDLTestSuite(Misc.getRequiredResource(tdml2))
- @Test def test_alignment_bytes_12_05() {
runner1.runOneTest("alignment_bytes_12_05") } //DFDL-99 binary dateTime
-
- @Test def test_length_implicit_12_02() {
runner1.runOneTest("length_implicit_12_02") } // implicit length string - bug
in IBM test (doesn't have minLength - both are required)
-
- @Test def test_length_delimited_12_05() {
runner1.runOneTest("length_delimited_12_05") } // DAFFODIL-1541 Need support
for handling delimited data with encoding other than ISO-8859-1
-
- @Test def test_simple_type_properties_text_number_13_01() {
runner2.runOneTest("simple_type_properties_text_number_13_01") } // DFDL-452
text number advanced props
- @Test def test_simple_type_properties_text_number_13_03() {
runner2.runOneTest("simple_type_properties_text_number_13_03") } // DFDL-452
textStandardBase (base 16)
-
- @Test def test_simple_type_properties_text_boolean_13_03() {
runner2.runOneTest("simple_type_properties_text_boolean_13_03") } // DFDL-462
boolean type
- @Test def test_simple_type_properties_bin_boolean_13_01() {
runner2.runOneTest("simple_type_properties_bin_boolean_13_01") } // DFDL-461
boolean type
+ // DAFFODIL-1541 Need support for handling delimited data with encoding
other than ISO-8859-1
+ @Test def test_length_delimited_12_05() {
runner1.runOneTest("length_delimited_12_05") }
- @Test def test_simple_type_properties_text_calendar_13_01() {
runner2.runOneTest("simple_type_properties_text_calendar_13_01") } //
DAFFODIL-1945
+ // DAFFODIL-853 text number advanced props (V Symbol)
+ @Test def test_simple_type_properties_text_number_13_01() {
runner2.runOneTest("simple_type_properties_text_number_13_01") }
- @Test def test_sequences_separated_14_04() {
runner2.runOneTest("sequences_separated_14_04") } // left over data
+ // DAFFODIL-840 textStandardBase (base 16)
+ @Test def test_simple_type_properties_text_number_13_03() {
runner2.runOneTest("simple_type_properties_text_number_13_03") }
- // Needs dfdl:utf16Width='variable' implementation
+ // DAFFODIL-551 Needs dfdl:utf16Width='variable' implementation
@Test def test_syntax_entities_6_03() {
runner1.runOneTest("syntax_entities_6_03") }
}
diff --git
a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests.scala
b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests.scala
index 4e398602b..09263c8f5 100644
--- a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests.scala
+++ b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests.scala
@@ -47,6 +47,8 @@ class IBMTestsThatPass {
// Doesn't work for a user, possible locale issue (DAFFODIL-1945)
// @Test def test_simple_type_properties_text_calendar_13_01() {
runner2.runOneTest("simple_type_properties_text_calendar_13_01") }
@Test def test_simple_type_properties_text_calendar_13_02() {
runner2.runOneTest("simple_type_properties_text_calendar_13_02") }
+ // Equivalent IBM test needed until DAFFODIL-2026 is implemented
+ @Test def test_simple_type_properties_text_calendar_13_02_ibm() {
runner2.runOneTest("simple_type_properties_text_calendar_13_02_ibm") }
@Test def test_simple_type_properties_text_calendar_13_03() {
runner2.runOneTest("simple_type_properties_text_calendar_13_03") }
@Test def test_simple_type_properties_text_calendar_13_04() {
runner2.runOneTest("simple_type_properties_text_calendar_13_04") }
diff --git
a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests3.scala
b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests3.scala
index 42b9b99af..c8dc15efa 100644
--- a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests3.scala
+++ b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/IBMTests3.scala
@@ -50,6 +50,9 @@ class IBMTestsThatPass2 {
@Test def test_multiple_delimiters2() {
runner1.runOneTest("multiple_delimiters2") }
+ // Fails on IBM DFDL
+ // @Test def test_multiple_delimiters2_ibm() {
runner1.runOneTest("multiple_delimiters2_ibm") }
+
@Test def test_syntax_entities_6_01() {
runner1.runOneTest("syntax_entities_6_01") }
@Test def test_syntax_entities_6_02() {
runner1.runOneTest("syntax_entities_6_02") }
//
@@ -87,4 +90,15 @@ class IBMTestsThatPass2 {
// @Test def test_length_explicit_12_01() {
runner1.runOneTest("length_explicit_12_01") }
@Test def test_length_explicit_12_02() {
runner1.runOneTest("length_explicit_12_02") }
@Test def test_length_delimited_12_06() {
runner1.runOneTest("length_delimited_12_06") }
+
+ @Test def test_alignment_bytes_12_05() {
runner1.runOneTest("alignment_bytes_12_05") } //DFDL-99 binary dateTime
+
+ @Test def test_length_implicit_12_02() {
runner1.runOneTest("length_implicit_12_02") } // implicit length string - bug
in IBM test (doesn't have minLength - both are required)
+ @Test def test_simple_type_properties_text_boolean_13_03() {
runner2.runOneTest("simple_type_properties_text_boolean_13_03") } // DFDL-462
boolean type
+ @Test def test_simple_type_properties_bin_boolean_13_01() {
runner2.runOneTest("simple_type_properties_bin_boolean_13_01") } // DFDL-461
boolean type
+
+ @Test def test_simple_type_properties_text_calendar_13_01() {
runner2.runOneTest("simple_type_properties_text_calendar_13_01") } //
DAFFODIL-1945
+
+ @Test def test_sequences_separated_14_04() {
runner2.runOneTest("sequences_separated_14_04") } // left over data
+
}
diff --git
a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/TresysTests.scala
b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/TresysTests.scala
index 21532a8d2..d5197dba7 100644
--- a/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/TresysTests.scala
+++ b/daffodil-test-ibm1/src/test/scala/org/apache/daffodil/TresysTests.scala
@@ -109,7 +109,11 @@ class TresysTests {
// not found. Debug later.
// @Test def test_duplicateDefineFormatsOneSchema() {
runnerMD.runOneTest("duplicateDefineFormatsOneSchema") }
- @Test def test_nested_separator_delimited_baseline() {
runnerNSD.runOneTest("baseline") }
+ @Test def test_nested_separator_delimited_baseline() {
runnerNSD.trace.runOneTest("baseline") }
+
+ // Fails in IBM DFDL - ambiguous separator/terminator not accepted.
+ @Test def test_nested_separator_delimited_baseline_ibm() {
runnerNSD.trace.runOneTest("baseline_ibm") }
+
@Test def test_nested_separator_delimited_basicNest() {
runnerNSD.runOneTest("basicNest") }
// Fails infinite loop
// @Test def test_nested_separator_delimited_basicNest2() {
runnerNSD.runOneTest("basicNest2")}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
