Modified general format to have calendarTimeZone="" not UTC.

Updated tests to not expect "+00:00" on end of every date/time/datetime. DAFFODIL-1930
apache · Aug 16, 2018 · 4522a82 · 4522a82
1 parent 62da5b5
commit 4522a82
Show file tree

Hide file tree

Showing 12 changed files with 188 additions and 153 deletions.
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
@@ -38,7 +38,7 @@
           calendarLanguage="en"
           calendarObserveDST="yes"
           calendarPatternKind="implicit"
-          calendarTimeZone="UTC"
+          calendarTimeZone=""
           decimalSigned="yes"
           documentFinalTerminatorCanBeMissing="no"
           emptyValueDelimiterPolicy="both"

diff --git a/...l-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml b/...l-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
@@ -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/...rc/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml b/...rc/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>