Moving working date tests from scala-debug to scala
DFDL-1126
diff --git a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
index 4404260..de677e5 100644
--- a/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
+++ b/daffodil-test/src/test/scala-debug/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressionsDebug.scala
@@ -250,12 +250,6 @@
@Test def test_substringafter_06() { runner2.runOneTest("substringafter_06") }
@Test def test_substringafter_07() { runner2.runOneTest("substringafter_07") }
- // DFDL-1126
- @Test def test_xfromdatetime_04() { runner2.runOneTest("xfromdatetime_04") }
- @Test def test_xfromdate_03() { runner2.runOneTest("xfromdate_03") }
- @Test def test_yearfromdatetime_03() { runner2.runOneTest("yearfromdatetime_03") }
- @Test def test_yearfromdate_03() { runner2.runOneTest("yearfromdate_03") }
-
val testDir4 = "/edu/illinois/ncsa/daffodil/section23/runtime_properties/"
val rp = testDir4 + "runtime-properties.tdml"
lazy val runner4 = new DFDLTestSuite(Misc.getRequiredResource(rp))
diff --git a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
index c287115..47fb515 100644
--- a/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
+++ b/daffodil-test/src/test/scala/edu/illinois/ncsa/daffodil/section23/dfdl_expressions/TestDFDLExpressions.scala
@@ -421,6 +421,7 @@
@Test def test_yearfromdatetime_01() { runner2.runOneTest("yearfromdatetime_01") }
@Test def test_yearfromdatetime_02() { runner2.runOneTest("yearfromdatetime_02") }
+ @Test def test_yearfromdatetime_03() { runner2.runOneTest("yearfromdatetime_03") }
@Test def test_monthfromdatetime_01() { runner2.runOneTest("monthfromdatetime_01") }
@Test def test_monthfromdatetime_02() { runner2.runOneTest("monthfromdatetime_02") }
@Test def test_dayfromdatetime_01() { runner2.runOneTest("dayfromdatetime_01") }
@@ -436,9 +437,11 @@
@Test def test_xfromdatetime_01() { runner2.runOneTest("xfromdatetime_01") }
@Test def test_xfromdatetime_02() { runner2.runOneTest("xfromdatetime_02") }
@Test def test_xfromdatetime_03() { runner2.runOneTest("xfromdatetime_03") }
+ @Test def test_xfromdatetime_04() { runner2.runOneTest("xfromdatetime_04") }
@Test def test_yearfromdate_01() { runner2.runOneTest("yearfromdate_01") }
@Test def test_yearfromdate_02() { runner2.runOneTest("yearfromdate_02") }
+ @Test def test_yearfromdate_03() { runner2.runOneTest("yearfromdate_03") }
@Test def test_monthfromdate_01() { runner2.runOneTest("monthfromdate_01") }
@Test def test_monthfromdate_02() { runner2.runOneTest("monthfromdate_02") }
@Test def test_dayfromdate_01() { runner2.runOneTest("dayfromdate_01") }
@@ -446,6 +449,7 @@
@Test def test_xfromdate_01() { runner2.runOneTest("xfromdate_01") }
@Test def test_xfromdate_02() { runner2.runOneTest("xfromdate_02") }
+ @Test def test_xfromdate_03() { runner2.runOneTest("xfromdate_03") }
@Test def test_hoursfromtime_01() { runner2.runOneTest("hoursfromtime_01") }
@Test def test_hoursfromtime_02() { runner2.runOneTest("hoursfromtime_02") }
@@ -458,12 +462,6 @@
@Test def test_xfromtime_02() { runner2.runOneTest("xfromtime_02") }
@Test def test_xfromtime_03() { runner2.runOneTest("xfromtime_03") }
- // DFDL-1126
- //@Test def test_xfromdatetime_04() { runner2.runOneTest("xfromdatetime_04") }
- //@Test def test_xfromdate_03() { runner2.runOneTest("xfromdate_03") }
- //@Test def test_yearfromdatetime_03() { runner2.runOneTest("yearfromdatetime_03") }
- //@Test def test_yearfromdate_03() { runner2.runOneTest("yearfromdate_03") }
-
@Test def test_ubyte_constructor_01() { runner2.runOneTest("ubyte_constructor_01") }
@Test def test_ubyte_constructor_02() { runner2.runOneTest("ubyte_constructor_02") }
@Test def test_ubyte_constructor_03() { runner2.runOneTest("ubyte_constructor_03") }
