Updating test input and moving working test to scala
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.tdml
index 4ff486f..7e1a7d2 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.tdml
@@ -5,7 +5,7 @@
<parserTestCase name="AY000" root="list" model="AY.dfdl.xsd"
description="escape character and escape block, variable length">
- <document><![CDATA[INITIATOR1it#TERMINATOR1em#ST0TERMINATOR1SEPARATORINITIATOR1item1#SEPARATORTERMINATOR1SEPARATORINITIATOR2START,item2ENDTERMINATOR2SEPARATORINITIATOR2STARTitem3TERMINATOR2SEPARATORINITIATOR2iENDtSTARTem4TERMINATOR2SEPARATORINITIATOR2STARTitTERMINATOR2em5ENDTERMINATOR2]]></document>
+ <document><![CDATA[INITIATOR1it#TERMINATOR1em#ST0TERMINATOR1SEPARATORINITIATOR1item1#SEPARATORTERMINATOR1SEPARATORINITIATOR2START,item2ENDTERMINATOR2SEPARATORINITIATOR2STARTSTARTitem3ENDTERMINATOR2SEPARATORINITIATOR2iENDtSTARTem4TERMINATOR2SEPARATORINITIATOR2STARTitTERMINATOR2em5ENDTERMINATOR2]]></document>
<infoset>
<dfdlInfoset>
<list xmlns="http://www.example.org/example1/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
diff --git a/daffodil-test-ibm1/src/test/scala-debug/edu/illinois/ncsa/daffodil/TresysTests2.scala b/daffodil-test-ibm1/src/test/scala-debug/edu/illinois/ncsa/daffodil/TresysTests2.scala
index c9364de..9e2bf20 100644
--- a/daffodil-test-ibm1/src/test/scala-debug/edu/illinois/ncsa/daffodil/TresysTests2.scala
+++ b/daffodil-test-ibm1/src/test/scala-debug/edu/illinois/ncsa/daffodil/TresysTests2.scala
@@ -117,10 +117,6 @@
lazy val runnerBG = new DFDLTestSuite(Misc.getRequiredResource(bg))
@Test def test_BG000() { runnerBG.runOneTest("BG000") } // needs text numbers: advanced properties (DFDL-452)
- val ay = testDir + "AY.tdml"
- lazy val runnerAY = new DFDLTestSuite(Misc.getRequiredResource(ay))
- @Test def test_AY000() { runnerAY.runOneTest("AY000") } // escape schemes
-
val sq = testDir + "sequence.tdml"
lazy val runnerSQ = new DFDLTestSuite(Misc.getRequiredResource(sq))
@Test def test_seq1() { runnerSQ.runOneTest("seq1") }
diff --git a/daffodil-test-ibm1/src/test/scala/edu/illinois/ncsa/daffodil/TresysTests.scala b/daffodil-test-ibm1/src/test/scala/edu/illinois/ncsa/daffodil/TresysTests.scala
index bf30009..2df8ffb 100644
--- a/daffodil-test-ibm1/src/test/scala/edu/illinois/ncsa/daffodil/TresysTests.scala
+++ b/daffodil-test-ibm1/src/test/scala/edu/illinois/ncsa/daffodil/TresysTests.scala
@@ -152,10 +152,9 @@
@Test def test_AW000() { runnerAW.runOneTest("AW000") } // escape schemes
@Test def test_AW001() { runnerAW.runOneTest("AW001") }
- // Commented out as part of DFDL-940, due to DFDL-941
- // val ay = testDir + "AY.tdml"
- // lazy val runnerAY = new DFDLTestSuite(Misc.getRequiredResource(ay))
- // @Test def test_AY000() { runnerAY.runOneTest("AY000") } // escape schemes
+ val ay = testDir + "AY.tdml"
+ lazy val runnerAY = new DFDLTestSuite(Misc.getRequiredResource(ay))
+ @Test def test_AY000() { runnerAY.runOneTest("AY000") } // escape schemes
val az = testDir + "AZ.tdml"
lazy val runnerAZ = new DFDLTestSuite(Misc.getRequiredResource(az))
