Modifying tests to represent true implicit time format (timezone was incorrect) DFDL-620
diff --git a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section05/simple_types/SimpleTypes.tdml b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section05/simple_types/SimpleTypes.tdml
index 4a094fb..443fe99 100644
--- a/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section05/simple_types/SimpleTypes.tdml
+++ b/daffodil-test/src/test/resources/edu/illinois/ncsa/daffodil/section05/simple_types/SimpleTypes.tdml
@@ -2201,9 +2201,9 @@
<xs:restriction base="xs:time"/>
</xs:simpleType>
- <xs:element name="timeImp" type="xs:time" dfdl:calendarPatternKind="implicit" dfdl:lengthKind="explicit" dfdl:length="11" />
- <xs:element name="time01" type="xs:time" dfdl:calendarCheckPolicy="lax" dfdl:calendarPatternKind="implicit" dfdl:lengthKind="explicit" dfdl:length="11" />
- <xs:element name="time02" type="xs:time" dfdl:calendarCheckPolicy="strict" dfdl:calendarPatternKind="implicit" dfdl:lengthKind="explicit" dfdl:length="11" />
+ <xs:element name="timeImp" type="xs:time" dfdl:calendarPatternKind="implicit" dfdl:lengthKind="delimited"/>
+ <xs:element name="time01" type="xs:time" dfdl:calendarCheckPolicy="lax" dfdl:calendarPatternKind="implicit" dfdl:lengthKind="delimited" />
+ <xs:element name="time02" type="xs:time" dfdl:calendarCheckPolicy="strict" dfdl:calendarPatternKind="implicit" dfdl:lengthKind="delimited" />
<xs:element name="time03" type="ex:strictExplicTime" dfdl:calendarPattern="hh:mm:ss.SSSS"/>
<xs:element name="time04" type="ex:strictExplicTime" dfdl:calendarPattern="hh:mm.zzz"/>
@@ -2216,9 +2216,9 @@
<xs:element name="time08" type="ex:strictExplicTime" dfdl:calendarPattern="hh:mm:ss" dfdl:calendarTimeZone="UTC+1"/>
<xs:element name="time09" type="ex:strictExplicTime" dfdl:calendarPattern="hh:mm:ss" dfdl:calendarTimeZone="UTC+1:30"/>
- <xs:element name="time10" type="xs:time" dfdl:calendarCheckPolicy="strict" dfdl:calendarPatternKind="implicit" dfdl:textTrimKind="padChar"
+ <xs:element name="time10" type="xs:time" dfdl:calendarCheckPolicy="strict" dfdl:calendarPatternKind="explicit" dfdl:calendarPattern="HH:mm:ss" dfdl:textTrimKind="padChar"
dfdl:textCalendarJustification="center" dfdl:textCalendarPadCharacter="." dfdl:lengthKind="delimited" />
- <xs:element name="time11" type="xs:time" dfdl:calendarCheckPolicy="strict" dfdl:calendarPatternKind="implicit" dfdl:textTrimKind="padChar"
+ <xs:element name="time11" type="xs:time" dfdl:calendarCheckPolicy="strict" dfdl:calendarPatternKind="explicit" dfdl:calendarPattern="HH:mm:ss" dfdl:textTrimKind="padChar"
dfdl:textCalendarJustification="right" dfdl:textCalendarPadCharacter=":" dfdl:lengthKind="delimited" />
<xs:element name="time12" type="ex:strictExplicTime" dfdl:calendarPattern="hh:mm:ss.SSS"/>
@@ -2316,7 +2316,7 @@
<tdml:parserTestCase name="timeImplicitPattern" root="timeImp"
model="dateTimeSchema" description="Section 13 Simple Types - calendarPatternKind - DFDL-13-138R">
- <tdml:document><![CDATA[12:43:20GMT]]></tdml:document>
+ <tdml:document><![CDATA[12:43:20+00:00]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<timeImp>12:43:20Z</timeImp>
@@ -2965,7 +2965,7 @@
<tdml:parserTestCase name="timeLaxCheckPolicy01" root="time01"
model="dateTimeSchema" description="Section 13 Simple Types - calendarCheckPolicy - DFDL-13-139R">
- <tdml:document><![CDATA[05:62:30GMT]]></tdml:document>
+ <tdml:document><![CDATA[05:62:30+00:00]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<time01>06:02:30Z</time01>
@@ -2983,7 +2983,7 @@
<tdml:parserTestCase name="timeLaxCheckPolicy02" root="time01"
model="dateTimeSchema" description="Section 13 Simple Types - calendarCheckPolicy - DFDL-13-139R">
- <tdml:document><![CDATA[28:62:30GMT]]></tdml:document>
+ <tdml:document><![CDATA[28:62:30-00:00]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<time01>05:02:30Z</time01>
@@ -3001,7 +3001,7 @@
<tdml:parserTestCase name="timeLaxCheckPolicy03" root="time01"
model="dateTimeSchema" description="Section 13 Simple Types - calendarCheckPolicy - DFDL-13-139R">
- <tdml:document><![CDATA[28:62:90GMT]]></tdml:document>
+ <tdml:document><![CDATA[28:62:90+00:00]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<time01>05:03:30Z</time01>
@@ -3749,7 +3749,7 @@
<tdml:parserTestCase name="timeTrim01" root="time10"
model="dateTimeSchema" description="Section 13 Simple Types - textCalendarJustification - DFDL-13-165R">
- <tdml:document><![CDATA[....12:30:30GMT....]]></tdml:document>
+ <tdml:document><![CDATA[....12:30:30....]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<time10>12:30:30Z</time10>
@@ -3767,7 +3767,7 @@
<tdml:parserTestCase name="timeTrim02" root="time11"
model="dateTimeSchema" description="Section 13 Simple Types - textCalendarJustification - DFDL-13-165R">
- <tdml:document><![CDATA[::::::12:30:30GMT]]></tdml:document>
+ <tdml:document><![CDATA[::::::12:30:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
<time11>12:30:30Z</time11>
diff --git a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes2.scala b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes2.scala
index bf3bfd9..22963a4 100644
--- a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes2.scala
+++ b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes2.scala
@@ -61,6 +61,11 @@
///////////////////////// DFDL-105, DFDL-102, DFDL-100 /////////////////////////////
+ @Test def test_timeImplicitPattern() { runner.runOneTest("timeImplicitPattern") }
+ @Test def test_timeLaxCheckPolicy01() { runner.runOneTest("timeLaxCheckPolicy01") }
+ @Test def test_timeLaxCheckPolicy02() { runner.runOneTest("timeLaxCheckPolicy02") }
+ @Test def test_timeLaxCheckPolicy03() { runner.runOneTest("timeLaxCheckPolicy03") }
+
@Test def test_dateTimeLaxCheckPolicy01() { runner.runOneTest("dateTimeLaxCheckPolicy01") }
@Test def test_timeFractionalSeconds01() { runner.runOneTest("timeFractionalSeconds01") }
diff --git a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes.scala b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes.scala
index bac3317..abe05d6 100644
--- a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes.scala
+++ b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section05/simple_types/TestSimpleTypes.scala
@@ -109,8 +109,8 @@
@Test def test_millisecondAccuracy2() { runner.runOneTest("millisecondAccuracy2") }
@Test def test_millisecondAccuracy3() { runner.runOneTest("millisecondAccuracy3") }
// @Test def test_millisecondAccuracy4() { runner.runOneTest("millisecondAccuracy4") }
- @Test def test_timeLaxCheckPolicy02() { runner.runOneTest("timeLaxCheckPolicy02") }
- @Test def test_timeLaxCheckPolicy03() { runner.runOneTest("timeLaxCheckPolicy03") }
+// @Test def test_timeLaxCheckPolicy02() { runner.runOneTest("timeLaxCheckPolicy02") }
+// @Test def test_timeLaxCheckPolicy03() { runner.runOneTest("timeLaxCheckPolicy03") }
@Test def test_timeStrictCheckPolicy02() { runner.runOneTest("timeStrictCheckPolicy02") }
@Test def test_timeFormatting() { runner.runOneTest("timeFormatting") }
@@ -153,7 +153,7 @@
@Test def test_dateTimeText() { runner.runOneTest("dateTimeText") }
@Test def test_dateImplicitPattern() { runner.runOneTest("dateImplicitPattern") }
@Test def test_dateImplicitPatternFail() { runner.runOneTest("dateImplicitPatternFail") }
- @Test def test_timeImplicitPattern() { runner.runOneTest("timeImplicitPattern") }
+// @Test def test_timeImplicitPattern() { runner.runOneTest("timeImplicitPattern") }
@Test def test_timeImplicitPatternFail() { runner.runOneTest("timeImplicitPatternFail") }
@Test def test_dateTimeImplicitPattern() { runner.runOneTest("dateTimeImplicitPattern") }
@@ -164,7 +164,7 @@
@Test def test_datePattern01() { runner.runOneTest("datePattern01") }
// @Test def test_datePattern01b() { runner.runOneTest("datePattern01b") }
- @Test def test_timeLaxCheckPolicy01() { runner.runOneTest("timeLaxCheckPolicy01") }
+// @Test def test_timeLaxCheckPolicy01() { runner.runOneTest("timeLaxCheckPolicy01") }
// @Test def test_dateTimeLaxCheckPolicy01() { runner.runOneTest("dateTimeLaxCheckPolicy01") }
@Test def test_dateLaxCheckPolicy01() { runner.runOneTest("dateLaxCheckPolicy01") }
@Test def test_dateLaxCheckPolicy02() { runner.runOneTest("dateLaxCheckPolicy02") }
