You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by ja...@apache.org on 2018/07/09 14:52:49 UTC

[incubator-daffodil] 12/13: Updated a couple tests that I thought were blocked

This is an automated email from the ASF dual-hosted git repository.

jadams pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git

commit 021445d054d2a2556bfe24bb9907ca8ba25cb208
Author: Josh Adams <ja...@tresys.com>
AuthorDate: Tue Jun 19 10:38:01 2018 -0400

    Updated a couple tests that I thought were blocked
    
    Turns out TDMLRunner was working correctly and we just needed to set an
    approperiate encoding to get these couple tests to run.
---
 .../src/test/resources/org/apache/daffodil/section13/zoned/zoned.tdml | 4 ++--
 .../org/apache/daffodil/section13/zoned/TestZonedDebug.scala          | 2 --
 .../test/scala/org/apache/daffodil/section13/zoned/TestZoned.scala    | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section13/zoned/zoned.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section13/zoned/zoned.tdml
index 3e1cd8f..7a79dea 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section13/zoned/zoned.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section13/zoned/zoned.tdml
@@ -375,7 +375,7 @@
     description="Test of a negative number with zonedSignStyle=asciiTandemModified with overpunch on first char">
 
     <tdml:document>
-      <tdml:documentPart type="text">&#x81;234567890</tdml:documentPart>
+      <tdml:documentPart type="text" encoding="ISO-8859-1">&#x81;234567890</tdml:documentPart>
     </tdml:document>
     <tdml:infoset>
       <tdml:dfdlInfoset>
@@ -415,7 +415,7 @@
     description="Test of a negative number with zonedSignStyle=asciiTandemModified with overpunch on last char">
 
     <tdml:document>
-      <tdml:documentPart type="text">123456789&#x80;</tdml:documentPart>
+      <tdml:documentPart type="text" encoding="ISO-8859-1">123456789&#x80;</tdml:documentPart>
     </tdml:document>
     <tdml:infoset>
       <tdml:dfdlInfoset>
diff --git a/daffodil-test/src/test/scala-debug/org/apache/daffodil/section13/zoned/TestZonedDebug.scala b/daffodil-test/src/test/scala-debug/org/apache/daffodil/section13/zoned/TestZonedDebug.scala
index 31df828..d72a153 100644
--- a/daffodil-test/src/test/scala-debug/org/apache/daffodil/section13/zoned/TestZonedDebug.scala
+++ b/daffodil-test/src/test/scala-debug/org/apache/daffodil/section13/zoned/TestZonedDebug.scala
@@ -34,6 +34,4 @@ object TestZoned {
 class TestZoned {
   import TestZoned._
 
-  @Test def testZonedTandemModified02(): Unit = { runner.runOneTest("ZonedTandemModified02") } // DAFFODIL-1957 TDML Runner Bug
-  @Test def testZonedTandemModified05(): Unit = { runner.runOneTest("ZonedTandemModified05") } // DAFFODIL-1957 TDML Runner Bug
 }
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section13/zoned/TestZoned.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section13/zoned/TestZoned.scala
index 106ec61..73f9ace 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section13/zoned/TestZoned.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section13/zoned/TestZoned.scala
@@ -62,8 +62,8 @@ class TestZoned {
   @Test def testZonedCARealiaModified05(): Unit = { runner.runOneTest("ZonedCARealiaModified05") }
 
   @Test def testZonedTandemModified01(): Unit = { runner.runOneTest("ZonedTandemModified01") }
-  //@Test def testZonedTandemModified02(): Unit = { runner.runOneTest("ZonedTandemModified02") } - DAFFODIL-1957 TDML Runner bug
+  @Test def testZonedTandemModified02(): Unit = { runner.runOneTest("ZonedTandemModified02") }
   @Test def testZonedTandemModified03(): Unit = { runner.runOneTest("ZonedTandemModified03") }
   @Test def testZonedTandemModified04(): Unit = { runner.runOneTest("ZonedTandemModified04") }
-  //@Test def testZonedTandemModified05(): Unit = { runner.runOneTest("ZonedTandemModified05") } - DAFFODIL-1957 TDML Runner bug
+  @Test def testZonedTandemModified05(): Unit = { runner.runOneTest("ZonedTandemModified05") }
 }