mbeckerle closed pull request #105: Modified general format to have
calendarTimeZone="" not UTC.
URL: https://github.com/apache/incubator-daffodil/pull/105
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-lib/src/main/resources/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
index 295501d9c..ad09d819f 100644
---
a/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
+++
b/daffodil-lib/src/main/resources/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
@@ -38,7 +38,7 @@
calendarLanguage="en"
calendarObserveDST="yes"
calendarPatternKind="implicit"
- calendarTimeZone="UTC"
+ calendarTimeZone=""
decimalSigned="yes"
documentFinalTerminatorCanBeMissing="no"
emptyValueDelimiterPolicy="both"
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
index 0732927f4..459b0495c 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
@@ -693,7 +693,7 @@
<tdml:document><![CDATA[2014-03-24T03:45:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTimeImp>2014-03-24T03:45:30.000000+00:00</dateTimeImp>
+ <dateTimeImp>2014-03-24T03:45:30.000000</dateTimeImp>
</tdml:dfdlInfoset>
</tdml:infoset>
<tdml:validationErrors>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
index 1b2d1c24d..7f7d44470 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
@@ -4808,7 +4808,7 @@
<tdml:document><![CDATA[2013-03-24T03:45:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTimeImp>2013-03-24T03:45:30.000000+00:00</dateTimeImp>
+ <dateTimeImp>2013-03-24T03:45:30.000000</dateTimeImp>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -4967,8 +4967,8 @@
</xs:annotation>
<xs:simpleType>
<xs:restriction base="xs:date">
- <xs:enumeration value="2013-02-15+00:00" />
- <xs:enumeration value="1988-03-24+00:00" />
+ <xs:enumeration value="2013-02-15" />
+ <xs:enumeration value="1988-03-24" />
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -5192,7 +5192,7 @@
<tdml:document>Month March, day 24, year 1988</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <enum_e7>1988-03-24+00:00</enum_e7>
+ <enum_e7>1988-03-24</enum_e7>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6154,7 +6154,7 @@
<tdml:document>Today is the 16th day of March, year 2012</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <mImE_e13>2012-03-16+00:00</mImE_e13>
+ <mImE_e13>2012-03-16</mImE_e13>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6202,7 +6202,7 @@
<tdml:document>11:00:00</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <mImE_e14>11:00:00.000000+00:00</mImE_e14>
+ <mImE_e14>11:00:00.000000</mImE_e14>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
index 1085ea13b..6c3258b43 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
@@ -53,7 +53,7 @@
<r>
<lang>de</lang>
<variant>1996</variant>
- <date>2013-03-01+00:00</date>
+ <date>2013-03-01</date>
</r>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -112,7 +112,7 @@
<tns:r>
<lang>de</lang>
<variant>1996</variant>
- <date>2013-03-01+00:00</date>
+ <date>2013-03-01</date>
<dateString>2013-03-01</dateString>
</tns:r>
</tdml:dfdlInfoset>
@@ -176,10 +176,10 @@
<tns:r>
<lang>de</lang>
<variant>1996</variant>
- <date>2013-03-01+00:00</date>
+ <date>2013-03-01</date>
<lang2>en</lang2>
<variant2>us</variant2>
- <date2>2013-03-01+00:00</date2>
+ <date2>2013-03-01</date2>
<dateString>2013-03-01</dateString>
</tns:r>
</tdml:dfdlInfoset>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
index eb802561c..0f787c8c0 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
@@ -2104,7 +2104,7 @@
<tdml:document><![CDATA[Wednesday, July 10, '96]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateText>1996-07-10+00:00</dateText>
+ <dateText>1996-07-10</dateText>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -2115,7 +2115,7 @@
<tdml:document><![CDATA[12:08 PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <timeText>12:08:00.000000+00:00</timeText>
+ <timeText>12:08:00.000000</timeText>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -2873,7 +2873,7 @@
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTimeBinPacked>1645-12-25T19:36:50.000000+00:00</dateTimeBinPacked>
+ <dateTimeBinPacked>1645-12-25T19:36:50.000000</dateTimeBinPacked>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -4754,7 +4754,7 @@
<tdml:document><![CDATA[1995-03-24]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateImp>1995-03-24+00:00</dateImp>
+ <dateImp>1995-03-24</dateImp>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -4831,7 +4831,7 @@
<tdml:document><![CDATA[2013-03-24T03:45:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTimeImp>2013-03-24T03:45:30.000000+00:00</dateTimeImp>
+ <dateTimeImp>2013-03-24T03:45:30.000000</dateTimeImp>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -4941,7 +4941,7 @@
<tdml:document><![CDATA[Today is the 25th day of January, year
2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date01>2013-01-25+00:00</date01>
+ <date01>2013-01-25</date01>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5045,7 +5045,7 @@
<tdml:document><![CDATA[02-13-2013 BC]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date13>-2012-02-13+00:00</date13>
+ <date13>-2012-02-13</date13>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5080,7 +5080,7 @@
<tdml:document><![CDATA[100 2012]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date15>2012-04-09+00:00</date15>
+ <date15>2012-04-09</date15>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5098,7 +5098,7 @@
<tdml:document><![CDATA[100 2011]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date15>2011-04-10+00:00</date15>
+ <date15>2011-04-10</date15>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5116,7 +5116,7 @@
<tdml:document><![CDATA[2 02 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date16>2013-02-10+00:00</date16>
+ <date16>2013-02-10</date16>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5136,7 +5136,7 @@
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date30>1998-04-30+00:00</date30>
+ <date30>1998-04-30</date30>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5156,7 +5156,7 @@
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date30>1998-04-30+00:00</date30>
+ <date30>1998-04-30</date30>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5174,7 +5174,7 @@
<tdml:document><![CDATA[2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date27>2013-01-01+00:00</date27>
+ <date27>2013-01-01</date27>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5192,7 +5192,7 @@
<tdml:document><![CDATA[]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date28>1970-01-01+00:00</date28>
+ <date28>1970-01-01</date28>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5210,7 +5210,7 @@
<tdml:document><![CDATA[08]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date29>1970-08-01+00:00</date29>
+ <date29>1970-08-01</date29>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5230,7 +5230,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<date21>
- <superfull>2013-03-25+00:00</superfull>
+ <superfull>2013-03-25</superfull>
</date21>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -5289,7 +5289,7 @@
<tdml:document><![CDATA[Freitag März 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date24>2013-03-01+00:00</date24>
+ <date24>2013-03-01</date24>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5308,7 +5308,7 @@
<tdml:document><![CDATA[Lunes Noviembre 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date25>2013-11-04+00:00</date25>
+ <date25>2013-11-04</date25>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5327,7 +5327,7 @@
<tdml:document><![CDATA[Monday November 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date26>2013-11-04+00:00</date26>
+ <date26>2013-11-04</date26>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5345,7 +5345,7 @@
<tdml:document><![CDATA[пятница мар. 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date32>2013-03-01+00:00</date32>
+ <date32>2013-03-01</date32>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5366,7 +5366,7 @@
<tdml:document><![CDATA[01 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date17>2013-01-06+00:00</date17>
+ <date17>2013-01-06</date17>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5387,7 +5387,7 @@
<tdml:document><![CDATA[01 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date18>2012-12-30+00:00</date18>
+ <date18>2012-12-30</date18>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5427,7 +5427,7 @@
<tdml:document><![CDATA[01 03 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date19>2013-03-03+00:00</date19>
+ <date19>2013-03-03</date19>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5466,7 +5466,7 @@
<tdml:document><![CDATA[It is 11:53AM on the 1st of April, year
2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime01>2013-04-01T11:53:00.000000+00:00</dateTime01>
+ <dateTime01>2013-04-01T11:53:00.000000</dateTime01>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5542,7 +5542,7 @@
<tdml:document><![CDATA[2013-01-31T23:62:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime02>2013-02-01T00:02:30.000000+00:00</dateTime02>
+ <dateTime02>2013-02-01T00:02:30.000000</dateTime02>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5561,7 +5561,7 @@
<tdml:document><![CDATA[2000-12-45]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date02>2001-01-14+00:00</date02>
+ <date02>2001-01-14</date02>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5581,7 +5581,7 @@
<tdml:document><![CDATA[2000-01-366]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date03>2000-12-31+00:00</date03>
+ <date03>2000-12-31</date03>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5601,7 +5601,7 @@
<tdml:document><![CDATA[2001-01-366]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date03>2002-01-01+00:00</date03>
+ <date03>2002-01-01</date03>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5620,7 +5620,7 @@
<tdml:document><![CDATA[2000-02-29]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date02>2000-02-29+00:00</date02>
+ <date02>2000-02-29</date02>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5640,7 +5640,7 @@
<tdml:document><![CDATA[2001-02-29]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date02>2001-03-01+00:00</date02>
+ <date02>2001-03-01</date02>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5710,7 +5710,7 @@
<tdml:document><![CDATA[day 1 of the week, month 02 year
2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date05>2013-02-04+00:00</date05>
+ <date05>2013-02-04</date05>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5732,7 +5732,7 @@
<tdml:document><![CDATA[day 2 of the week, month 02 year
2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date05>2013-02-05+00:00</date05>
+ <date05>2013-02-05</date05>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5849,7 +5849,7 @@
<tdml:document><![CDATA[22:43]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time16>22:43:00.000000+00:00</time16>
+ <time16>22:43:00.000000</time16>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5869,7 +5869,7 @@
<tdml:document><![CDATA[03:43PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time17>12:43:00.000000+00:00</time17>
+ <time17>12:43:00.000000</time17>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5889,7 +5889,7 @@
<tdml:document><![CDATA[23:43AM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time17>00:43:00.000000+00:00</time17>
+ <time17>00:43:00.000000</time17>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5907,7 +5907,7 @@
<tdml:document><![CDATA[03:43AM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time17b>03:43:00.000000+00:00</time17b>
+ <time17b>03:43:00.000000</time17b>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5925,7 +5925,7 @@
<tdml:document><![CDATA[03:43PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time17b>15:43:00.000000+00:00</time17b>
+ <time17b>15:43:00.000000</time17b>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5943,7 +5943,7 @@
<tdml:document><![CDATA[00:43PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time18>12:43:00.000000+00:00</time18>
+ <time18>12:43:00.000000</time18>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -5996,7 +5996,7 @@
<tdml:document><![CDATA[00:43]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time19>00:43:00.000000+00:00</time19>
+ <time19>00:43:00.000000</time19>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6184,7 +6184,7 @@
<tdml:document><![CDATA[08:43:30.9678]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time03>08:43:30.967000+00:00</time03>
+ <time03>08:43:30.967000</time03>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6202,7 +6202,7 @@
<tdml:document><![CDATA[Mon, 01 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time03>08:43:31.000000+00:00</time03>
+ <time03>08:43:31.000000</time03>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6220,7 +6220,7 @@
<tdml:document><![CDATA[...03...24...1988]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date08>1988-03-24+00:00</date08>
+ <date08>1988-03-24</date08>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6239,7 +6239,7 @@
<tdml:document><![CDATA[....2013-03-24....]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date09>2013-03-24+00:00</date09>
+ <date09>2013-03-24</date09>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6258,7 +6258,7 @@
<tdml:document><![CDATA[2013-03-24xxxx]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date10>2013-03-24+00:00</date10>
+ <date10>2013-03-24</date10>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6277,7 +6277,7 @@
<tdml:document><![CDATA[dddddddddddddddddddddddddddddd2013-03-24]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <date11>2013-03-24+00:00</date11>
+ <date11>2013-03-24</date11>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6298,7 +6298,7 @@
<tdml:document><![CDATA[....12:30:30....]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time10>12:30:30.000000+00:00</time10>
+ <time10>12:30:30.000000</time10>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6317,7 +6317,7 @@
<tdml:document><![CDATA[::::::12:30:30]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time11>12:30:30.000000+00:00</time11>
+ <time11>12:30:30.000000</time11>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6336,7 +6336,7 @@
<tdml:document><![CDATA[3:30:38.001]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time12>03:30:38.001000+00:00</time12>
+ <time12>03:30:38.001000</time12>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6355,7 +6355,7 @@
<tdml:document><![CDATA[3:30:38.001435]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time13>03:30:38.001000+00:00</time13>
+ <time13>03:30:38.001000</time13>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6406,7 +6406,7 @@
<tdml:document><![CDATA[3:30:38.002345276]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time29>03:30:38.002000+00:00</time29>
+ <time29>03:30:38.002000</time29>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6558,7 +6558,7 @@
<tdml:document><![CDATA[03@54$%^&*()5]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time20>03:54:05.000000+00:00</time20>
+ <time20>03:54:05.000000</time20>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6577,7 +6577,7 @@
<tdml:document><![CDATA[03@54$%^!@#.,/.'}{}{*()5]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time21>03:54:05.000000+00:00</time21>
+ <time21>03:54:05.000000</time21>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6596,7 +6596,7 @@
<tdml:document><![CDATA[28]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time22>00:28:00.000000+00:00</time22>
+ <time22>00:28:00.000000</time22>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6615,7 +6615,7 @@
<tdml:document><![CDATA[]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time23>00:00:00.000000+00:00</time23>
+ <time23>00:00:00.000000</time23>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6634,7 +6634,7 @@
<tdml:document><![CDATA[.]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <time24>00:00:00.000000+00:00</time24>
+ <time24>00:00:00.000000</time24>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6676,7 +6676,7 @@
<tdml:document><![CDATA[27:30:30 February-29-2012]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime04>2012-03-01T03:30:30.000000+00:00</dateTime04>
+ <dateTime04>2012-03-01T03:30:30.000000</dateTime04>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6697,7 +6697,7 @@
<tdml:document><![CDATA[01 02 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime05>2013-02-05T00:00:00.000000+00:00</dateTime05>
+ <dateTime05>2013-02-05T00:00:00.000000</dateTime05>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6718,7 +6718,7 @@
<tdml:document><![CDATA[01 02 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime06>2013-02-07T00:00:00.000000+00:00</dateTime06>
+ <dateTime06>2013-02-07T00:00:00.000000</dateTime06>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6739,7 +6739,7 @@
<tdml:document><![CDATA[01 02 2013]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime07>2013-01-31T00:00:00.000000+00:00</dateTime07>
+ <dateTime07>2013-01-31T00:00:00.000000</dateTime07>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6760,7 +6760,7 @@
<tdml:document><![CDATA[01 02 2013 12:43:30PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime08>2013-02-03T12:43:30.000000+00:00</dateTime08>
+ <dateTime08>2013-02-03T12:43:30.000000</dateTime08>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6781,7 +6781,7 @@
<tdml:document><![CDATA[01 01 2013 12:43:30PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime08>2013-01-06T12:43:30.000000+00:00</dateTime08>
+ <dateTime08>2013-01-06T12:43:30.000000</dateTime08>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6802,7 +6802,7 @@
<tdml:document><![CDATA[02 01 2013 12:43:30PM]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime08>2013-01-13T12:43:30.000000+00:00</dateTime08>
+ <dateTime08>2013-01-13T12:43:30.000000</dateTime08>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6821,7 +6821,7 @@
<tdml:document><![CDATA[.....03.04.1999 04:31:44PM.....]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime09>1999-03-04T16:31:44.000000+00:00</dateTime09>
+ <dateTime09>1999-03-04T16:31:44.000000</dateTime09>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6840,7 +6840,7 @@
<tdml:document><![CDATA[03.04.1999
04:31:44PM:::::::::::::::::::::::::::::::::::::::::]]></tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime10>1999-03-04T16:31:44.000000+00:00</dateTime10>
+ <dateTime10>1999-03-04T16:31:44.000000</dateTime10>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6863,7 +6863,7 @@
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime11>1999-03-04T16:31:44.000000+00:00</dateTime11>
+ <dateTime11>1999-03-04T16:31:44.000000</dateTime11>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
@@ -6886,7 +6886,7 @@
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTime12>1999-03-04T17:01:44.000000+00:00</dateTime12>
+ <dateTime12>1999-03-04T17:01:44.000000</dateTime12>
</tdml:dfdlInfoset>
</tdml:infoset>
</tdml:parserTestCase>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
index 17eea33a1..636e89d27 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
@@ -1553,7 +1553,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateT>2013-03-31+00:00</dateT>
+ <dateT>2013-03-31</dateT>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -1577,7 +1577,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateT2>2013-05-06+00:00</dateT2>
+ <dateT2>2013-05-06</dateT2>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -1601,7 +1601,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <timeT>04:09:23.000000+00:00</timeT>
+ <timeT>04:09:23.000000</timeT>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -1625,7 +1625,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
- <dateTimeT>2013-05-03T03:30:30.000000+00:00</dateTimeT>
+ <dateTimeT>2013-05-03T03:30:30.000000</dateTimeT>
</tdml:dfdlInfoset>
</tdml:infoset>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
index 0d6badb0c..1e2392be7 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section13/packed/packed.tdml
@@ -284,7 +284,7 @@
</tdml:document>
<tdml:infoset>
<tdml:dfdlInfoset>
- <cal01>1961-02-01+00:00</cal01>
+ <cal01>1961-02-01</cal01>
</tdml:dfdlInfoset>
</tdml:infoset>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
index cb1a6b616..4e65aee61 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/expressions.tdml
@@ -701,6 +701,18 @@
</xs:element>
<xs:element name="e35">
+ <xs:complexType>
+ <xs:sequence dfdl:separator=",">
+ <xs:element name="dateTime1" type="xs:dateTime"
dfdl:calendarCheckPolicy="lax" dfdl:calendarPatternKind="explicit"
dfdl:calendarPattern="uuuu-MM-dd'T'HH:mm:ss"
+ dfdl:calendarTimeZone="UTC"/>
+ <xs:element name="dateTime2" type="xs:dateTime"
dfdl:calendarCheckPolicy="lax" dfdl:calendarPatternKind="explicit"
dfdl:calendarPattern="uuuu-MM-dd'T'HH:mm:ssXXXXX"
+ dfdl:calendarTimeZone="UTC"/>
+ <xs:element name="oneLTtwo" type="xs:boolean" dfdl:inputValueCalc="{
../ex:dateTime1 lt ../ex:dateTime2 }"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="e35a">
<xs:complexType>
<xs:sequence dfdl:separator=",">
<xs:element name="dateTime1" type="xs:dateTime"
dfdl:calendarCheckPolicy="lax" dfdl:calendarPatternKind="explicit"
dfdl:calendarPattern="uuuu-MM-dd'T'HH:mm:ss"/>
@@ -5581,8 +5593,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e37>
- <dateTime1>1988-03-24T04:55:23.000000+00:00</dateTime1>
- <dateTime2>1988-03-24T04:55:24.000000+00:00</dateTime2>
+ <dateTime1>1988-03-24T04:55:23.000000</dateTime1>
+ <dateTime2>1988-03-24T04:55:24.000000</dateTime2>
<lessThanEqualTo>true</lessThanEqualTo>
</e37>
</tdml:dfdlInfoset>
@@ -5603,8 +5615,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e38>
- <dateTime1>1988-03-24T04:55:24.000000+00:00</dateTime1>
- <dateTime2>1988-03-24T04:55:23.000000+00:00</dateTime2>
+ <dateTime1>1988-03-24T04:55:24.000000</dateTime1>
+ <dateTime2>1988-03-24T04:55:23.000000</dateTime2>
<greaterThanEqualTo>true</greaterThanEqualTo>
</e38>
</tdml:dfdlInfoset>
@@ -5625,8 +5637,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e18>
- <dateTime1>1988-03-24T04:55:24.000000+00:00</dateTime1>
- <dateTime2>1988-03-24T04:55:23.000000+00:00</dateTime2>
+ <dateTime1>1988-03-24T04:55:24.000000</dateTime1>
+ <dateTime2>1988-03-24T04:55:23.000000</dateTime2>
<oneGTtwo>true</oneGTtwo>
</e18>
</tdml:dfdlInfoset>
@@ -5647,8 +5659,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e19>
- <dateTime1>1988-03-24T04:55:23.000000+00:00</dateTime1>
- <dateTime2>1988-03-24T04:55:24.000000+00:00</dateTime2>
+ <dateTime1>1988-03-24T04:55:23.000000</dateTime1>
+ <dateTime2>1988-03-24T04:55:24.000000</dateTime2>
<oneLTtwo>true</oneLTtwo>
</e19>
</tdml:dfdlInfoset>
@@ -5669,8 +5681,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e20>
- <dateTime1>1988-03-24T04:55:23.000000+00:00</dateTime1>
- <dateTime2>1988-03-24T04:55:24.000000+00:00</dateTime2>
+ <dateTime1>1988-03-24T04:55:23.000000</dateTime1>
+ <dateTime2>1988-03-24T04:55:24.000000</dateTime2>
<notEqual>true</notEqual>
</e20>
</tdml:dfdlInfoset>
@@ -5691,8 +5703,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e21>
- <dateTime1>1988-03-24T04:55:23.000000+00:00</dateTime1>
- <dateTime2>1988-03-24T04:55:23.000000+00:00</dateTime2>
+ <dateTime1>1988-03-24T04:55:23.000000</dateTime1>
+ <dateTime2>1988-03-24T04:55:23.000000</dateTime2>
<same>true</same>
</e21>
</tdml:dfdlInfoset>
@@ -5713,8 +5725,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e22>
- <date1>1988-03-23+00:00</date1>
- <date2>1988-03-24+00:00</date2>
+ <date1>1988-03-23</date1>
+ <date2>1988-03-24</date2>
<lessThanEqualTo>true</lessThanEqualTo>
</e22>
</tdml:dfdlInfoset>
@@ -5735,8 +5747,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e23>
- <date1>1988-03-24+00:00</date1>
- <date2>1988-03-23+00:00</date2>
+ <date1>1988-03-24</date1>
+ <date2>1988-03-23</date2>
<greaterThanEqualTo>true</greaterThanEqualTo>
</e23>
</tdml:dfdlInfoset>
@@ -5757,8 +5769,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e24>
- <date1>1988-03-24+00:00</date1>
- <date2>1988-03-23+00:00</date2>
+ <date1>1988-03-24</date1>
+ <date2>1988-03-23</date2>
<oneGTtwo>true</oneGTtwo>
</e24>
</tdml:dfdlInfoset>
@@ -5779,8 +5791,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e25>
- <date1>1988-03-24+00:00</date1>
- <date2>1988-03-25+00:00</date2>
+ <date1>1988-03-24</date1>
+ <date2>1988-03-25</date2>
<oneLTtwo>true</oneLTtwo>
</e25>
</tdml:dfdlInfoset>
@@ -5801,8 +5813,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e26>
- <date1>1988-03-24+00:00</date1>
- <date2>1988-03-25+00:00</date2>
+ <date1>1988-03-24</date1>
+ <date2>1988-03-25</date2>
<notEqual>true</notEqual>
</e26>
</tdml:dfdlInfoset>
@@ -5823,8 +5835,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e27>
- <date1>1988-03-24+00:00</date1>
- <date2>1988-03-24+00:00</date2>
+ <date1>1988-03-24</date1>
+ <date2>1988-03-24</date2>
<same>true</same>
</e27>
</tdml:dfdlInfoset>
@@ -5845,8 +5857,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e28>
- <time1>04:55:23.000000+00:00</time1>
- <time2>04:55:24.000000+00:00</time2>
+ <time1>04:55:23.000000</time1>
+ <time2>04:55:24.000000</time2>
<lessThanEqualTo>true</lessThanEqualTo>
</e28>
</tdml:dfdlInfoset>
@@ -5867,8 +5879,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e29>
- <time1>04:55:24.000000+00:00</time1>
- <time2>04:55:23.000000+00:00</time2>
+ <time1>04:55:24.000000</time1>
+ <time2>04:55:23.000000</time2>
<greaterThanEqualTo>true</greaterThanEqualTo>
</e29>
</tdml:dfdlInfoset>
@@ -5889,8 +5901,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e30>
- <time1>04:55:24.000000+00:00</time1>
- <time2>04:55:23.000000+00:00</time2>
+ <time1>04:55:24.000000</time1>
+ <time2>04:55:23.000000</time2>
<oneGTtwo>true</oneGTtwo>
</e30>
</tdml:dfdlInfoset>
@@ -5911,8 +5923,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e31>
- <time1>04:55:23.000000+00:00</time1>
- <time2>04:55:24.000000+00:00</time2>
+ <time1>04:55:23.000000</time1>
+ <time2>04:55:24.000000</time2>
<oneLTtwo>true</oneLTtwo>
</e31>
</tdml:dfdlInfoset>
@@ -5933,8 +5945,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e32>
- <time1>04:55:23.000000+00:00</time1>
- <time2>04:55:24.000000+00:00</time2>
+ <time1>04:55:23.000000</time1>
+ <time2>04:55:24.000000</time2>
<notEqual>true</notEqual>
</e32>
</tdml:dfdlInfoset>
@@ -5955,8 +5967,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e33>
- <time1>04:55:23.000000+00:00</time1>
- <time2>04:55:23.000000+00:00</time2>
+ <time1>04:55:23.000000</time1>
+ <time2>04:55:23.000000</time2>
<same>true</same>
</e33>
</tdml:dfdlInfoset>
@@ -5978,8 +5990,8 @@ c]]></value>
<tdml:infoset>
<tdml:dfdlInfoset>
<e34>
- <dateTime1>2000-01-15T00:00:00.000000+00:00</dateTime1>
- <dateTime2>2000-02-15T00:00:00.000000+00:00</dateTime2>
+ <dateTime1>2000-01-15T00:00:00.000000</dateTime1>
+ <dateTime2>2000-02-15T00:00:00.000000</dateTime2>
<oneLTtwo>true</oneLTtwo>
</e34>
</tdml:dfdlInfoset>
@@ -6010,6 +6022,23 @@ c]]></value>
</tdml:infoset>
</tdml:parserTestCase>
+ <tdml:parserTestCase name="comparison_operators_46a" root="e35a"
+ model="comparisonOperators" description="Section 23 - DFDL Expressions -
DFDL-23-068R1"
+ roundTrip="twoPass">
+
+
<tdml:document><![CDATA[2000-01-01T12:00:00,1999-12-31T23:00:00+00:00]]></tdml:document>
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <e35>
+ <dateTime1>2000-01-01T12:00:00.000000+00:00</dateTime1>
+ <dateTime2>1999-12-31T23:00:00.000000+00:00</dateTime2>
+ <oneLTtwo>false</oneLTtwo>
+ </e35>
+ </tdml:dfdlInfoset>
+ </tdml:infoset>
+ </tdml:parserTestCase>
+
+
<!--
Test Name: comparison_operators_47
Schema: comparisonOperators
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/functions.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/functions.tdml
index be070a54b..709c53511 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/functions.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_expressions/functions.tdml
@@ -113,7 +113,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dtFunctions>
- <bulkDateTime>1988-03-24T04:55:23.000000+00:00</bulkDateTime>
+ <bulkDateTime>1988-03-24T04:55:23.000000</bulkDateTime>
<year>1988</year>
<month>3</month>
<day>24</day>
@@ -140,7 +140,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dtFunctions>
- <bulkDateTime>1988-04-05T04:55:23.000000+00:00</bulkDateTime>
+ <bulkDateTime>1988-04-05T04:55:23.000000</bulkDateTime>
<year>1988</year>
<month>4</month>
<day>5</day>
@@ -166,7 +166,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dFunctions>
- <bulkDate>2013-02-24+00:00</bulkDate>
+ <bulkDate>2013-02-24</bulkDate>
<year>2013</year>
<month>2</month>
<day>24</day>
@@ -190,7 +190,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dFunctions>
- <bulkDate>2012-03-01+00:00</bulkDate>
+ <bulkDate>2012-03-01</bulkDate>
<year>2012</year>
<month>3</month>
<day>1</day>
diff --git
a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
index 30e797790..cde9b9e7f 100644
---
a/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
+++
b/daffodil-test/src/test/resources/org/apache/daffodil/section23/dfdl_functions/Functions.tdml
@@ -996,8 +996,8 @@
<tdml:dfdlInfoset>
<e_concat3>
<one>-5000.0</one>
- <two>2004-04-12T13:20:00.000000+00:00</two>
- <concat>-5000.02004-04-12T13:20:00.000000+00:00</concat>
+ <two>2004-04-12T13:20:00.000000</two>
+ <concat>-5000.02004-04-12T13:20:00.000000</concat>
</e_concat3>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -2157,7 +2157,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_yearfromdatetime2>
- <date>2034-12-31T23:00:00.000000+00:00</date>
+ <date>2034-12-31T23:00:00.000000</date>
<year>2034</year>
</e_yearfromdatetime2>
</tdml:dfdlInfoset>
@@ -2178,7 +2178,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_yearfromdatetime2>
- <date>0000-01-01T23:00:00.000000+00:00</date>
+ <date>0000-01-01T23:00:00.000000</date>
<year>0</year>
</e_yearfromdatetime2>
</tdml:dfdlInfoset>
@@ -2217,7 +2217,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_monthfromdatetime2>
- <date>2034-12-31T23:00:00.000000+00:00</date>
+ <date>2034-12-31T23:00:00.000000</date>
<month>12</month>
</e_monthfromdatetime2>
</tdml:dfdlInfoset>
@@ -2256,7 +2256,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_dayfromdatetime2>
- <date>2034-12-31T23:00:00.000000+00:00</date>
+ <date>2034-12-31T23:00:00.000000</date>
<day>31</day>
</e_dayfromdatetime2>
</tdml:dfdlInfoset>
@@ -2295,7 +2295,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_hoursfromdatetime2>
- <date>2034-12-31T23:00:00.000000+00:00</date>
+ <date>2034-12-31T23:00:00.000000</date>
<hours>23</hours>
</e_hoursfromdatetime2>
</tdml:dfdlInfoset>
@@ -2334,7 +2334,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_minutesfromdatetime2>
- <date>2034-12-31T23:00:00.000000+00:00</date>
+ <date>2034-12-31T23:00:00.000000</date>
<minutes>0</minutes>
</e_minutesfromdatetime2>
</tdml:dfdlInfoset>
@@ -2373,7 +2373,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_secondsfromdatetime2>
- <date>2034-12-31T23:00:00.000000+00:00</date>
+ <date>2034-12-31T23:00:00.000000</date>
<seconds>0</seconds>
</e_secondsfromdatetime2>
</tdml:dfdlInfoset>
@@ -2394,7 +2394,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_secondsfromdatetime3>
- <date>2014-07-19T23:00:05.180000+00:00</date>
+ <date>2014-07-19T23:00:05.180000</date>
<seconds>5.18</seconds>
</e_secondsfromdatetime3>
</tdml:dfdlInfoset>
@@ -2415,14 +2415,14 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_xfromdatetime1>
- <date>2013-04-01T11:53:06.000000+00:00</date>
+ <date>2013-04-01T11:53:06.000000</date>
<year>2013</year>
<month>4</month>
<day>1</day>
<hours>11</hours>
<minutes>53</minutes>
<seconds>6</seconds>
- <timeZone>+00:00</timeZone>
+ <timeZone></timeZone>
</e_xfromdatetime1>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -2543,7 +2543,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_yearfromdate2>
- <date>2034-12-31+00:00</date>
+ <date>2034-12-31</date>
<year>2034</year>
</e_yearfromdate2>
</tdml:dfdlInfoset>
@@ -2564,7 +2564,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_yearfromdate2>
- <date>0000-01-01+00:00</date>
+ <date>0000-01-01</date>
<year>0</year>
</e_yearfromdate2>
</tdml:dfdlInfoset>
@@ -2603,7 +2603,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_monthfromdate2>
- <date>2034-12-31+00:00</date>
+ <date>2034-12-31</date>
<month>12</month>
</e_monthfromdate2>
</tdml:dfdlInfoset>
@@ -2642,7 +2642,7 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_dayfromdate2>
- <date>2034-12-31+00:00</date>
+ <date>2034-12-31</date>
<day>31</day>
</e_dayfromdate2>
</tdml:dfdlInfoset>
@@ -2665,11 +2665,11 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_xfromdate1>
- <date>2000-12-31+00:00</date>
+ <date>2000-12-31</date>
<year>2000</year>
<month>12</month>
<day>31</day>
- <timeZone>+00:00</timeZone>
+ <timeZone></timeZone>
</e_xfromdate1>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -2715,11 +2715,11 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<e_xfromdate1>
- <date>-0020-04-08+00:00</date>
+ <date>-0020-04-08</date>
<year>-20</year>
<month>4</month>
<day>8</day>
- <timeZone>+00:00</timeZone>
+ <timeZone></timeZone>
</e_xfromdate1>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -6859,9 +6859,9 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dateTime01>
- <date>1996-03-31+00:00</date>
- <time>04:55:30.000000+00:00</time>
- <dateTime>1996-03-31T04:55:30.000000+00:00</dateTime>
+ <date>1996-03-31</date>
+ <time>04:55:30.000000</time>
+ <dateTime>1996-03-31T04:55:30.000000</dateTime>
</dateTime01>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -6884,9 +6884,9 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dateTime01>
- <date>1996-01-31+00:00</date>
- <time>04:55:30.000000+00:00</time>
- <dateTime>1996-01-31T04:55:30.000000+00:00</dateTime>
+ <date>1996-01-31</date>
+ <time>04:55:30.000000</time>
+ <dateTime>1996-01-31T04:55:30.000000</dateTime>
</dateTime01>
</tdml:dfdlInfoset>
</tdml:infoset>
@@ -8074,8 +8074,8 @@
<tdml:infoset>
<tdml:dfdlInfoset>
<dateTime04>
- <string>1998-03-04T12:30:34.123456+00:00</string>
- <dateTime>1998-03-04T12:30:34.123456+00:00</dateTime>
+ <string>1998-03-04T12:30:34.123456</string>
+ <dateTime>1998-03-04T12:30:34.123456</dateTime>
</dateTime04>
</tdml:dfdlInfoset>
</tdml:infoset>
diff --git
a/daffodil-test/src/test/scala-debug/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
b/daffodil-test/src/test/scala-debug/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
index 39fd52407..2d2369d39 100644
---
a/daffodil-test/src/test/scala-debug/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
+++
b/daffodil-test/src/test/scala-debug/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
@@ -58,6 +58,9 @@ class TestDFDLExpressionsDebug {
import TestDFDLExpressionsDebug._
+ // DAFFODIL-1986
+ @Test def test_comparison_operators_46a() {
runner.runOneTest("comparison_operators_46a") }
+
//DFDL-1287
@Test def test_internal_space_preserved4() {
runner.runOneTest("internal_space_preserved4") }
@Test def test_internal_space_not_preserved2() {
runner.runOneTest("internal_space_not_preserved2") }
diff --git
a/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
b/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
index 309fc4507..b237035d3 100644
---
a/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
+++
b/daffodil-test/src/test/scala/org/apache/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
@@ -158,6 +158,9 @@ class TestDFDLExpressions {
@Test def test_comparison_operators_45() {
runner.runOneTest("comparison_operators_45") }
@Test def test_comparison_operators_46() {
runner.runOneTest("comparison_operators_46") }
+ // DAFFODIL-1986
+ // @Test def test_comparison_operators_46a() {
runner.runOneTest("comparison_operators_46a") }
+
// from XPath Spec Sec 10.4.6.1 Examples
@Test def test_comparison_operators_47() {
runner.runOneTest("comparison_operators_47") }
@Test def test_comparison_operators_48() {
runner.runOneTest("comparison_operators_48") }
----------------------------------------------------------------
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
