You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by mb...@apache.org on 2021/02/01 17:19:25 UTC
[incubator-daffodil] branch master updated: Enable 3 tests showing
apostrophes work properly now in TDML
This is an automated email from the ASF dual-hosted git repository.
mbeckerle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 0c6d14f Enable 3 tests showing apostrophes work properly now in TDML
0c6d14f is described below
commit 0c6d14f4e80134460bb3dd42ae204862b9e511a8
Author: Michael Beckerle <mb...@tresys.com>
AuthorDate: Fri Jan 29 09:57:05 2021 -0500
Enable 3 tests showing apostrophes work properly now in TDML
Also many tests differing only by the test config had identical test names in the TDML.
These were modified so the ones that specify a config have a suffix added to their names.
DAFFODIL-1928, DAFFODIL-1420
---
.../src/test/resources/test/tdml/tdmlQuoting.tdml | 4 +-
.../org/apache/daffodil/tdml/TestTDMLRunner2.scala | 22 ++++---
.../general/testUnparserFileBuffering.tdml | 73 +++++++++-------------
.../section00/general/TestFileBuffering.scala | 48 +++++++-------
.../section00/general/TestUnparserGeneral.scala | 3 +-
5 files changed, 72 insertions(+), 78 deletions(-)
diff --git a/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml b/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml
index c9cc863..69faa85 100644
--- a/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml
+++ b/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml
@@ -72,7 +72,7 @@
<tdml:parserTestCase name="apos_test1"
root="apostrophe" model="apostrophe"
- description="Can't deal properly with apostrophe (') marks within the document data in TDML " roundTrip="true">
+ description="Shows proper handling of apostrophe (') marks within the document data in TDML " roundTrip="true">
<tdml:document>'</tdml:document>
@@ -93,7 +93,7 @@
<tdml:parserTestCase name="apos_test2"
root="apostrophe" model="apostrophe"
- description="Can't deal properly with apostrophe (') marks within the document data in TDML " roundTrip="true">
+ description="Shows proper handling of apostrophe (') marks within the document data in TDML " roundTrip="true">
<tdml:document>'</tdml:document>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
index 46c4272..1f887a4 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/tdml/TestTDMLRunner2.scala
@@ -24,9 +24,20 @@ import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.junit.Test
import org.apache.daffodil.Implicits._
+import org.junit.AfterClass
+
+object TestTDMLRunner2 {
+ val runner = Runner("/test/tdml/", "tdmlQuoting.tdml")
+
+ @AfterClass def shutDown: Unit = {
+ runner.reset
+ }
+}
class TestTDMLRunner2 {
+ import TestTDMLRunner2._
+
val tdml = XMLUtils.TDML_NAMESPACE
val dfdl = XMLUtils.DFDL_NAMESPACE
val xsi = XMLUtils.XSI_NAMESPACE
@@ -510,13 +521,10 @@ abc # a comment
}
/**
- * Test illustrates problem with tdml runner correctly processes apostrophes (')
- * in the html format (') within the document or infoset data. The aposrophes are stripped out of
- * stripped out of actual or expected values causing the comparison to fail.
- *
- * Bug DAFFODIL-1928
+ * Tests illustrate tdml runner correctly processes apostrophes (')
+ * in the html format (') within the document or infoset data.
*/
- // @Test def test_apos_test1() { runner.runOneTest("apos_test1") }
- // @Test def test_apos_test2() { runner.runOneTest("apos_test2") }
+ @Test def test_apos_test1(): Unit = { runner.runOneTest("apos_test1") }
+ @Test def test_apos_test2(): Unit = { runner.runOneTest("apos_test2") }
}
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml
index bd1c5af..128a766 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml
@@ -55,24 +55,11 @@
</tdml:defineSchema>
<!--
- Test Name: apostrophe_01
- Schema: fixedLengthStrings
- Purpose: This test demonstrates that Daffodil can handle unparsing an apostrophe
- in the infoset, and parsing an apostrophe in the document.
--->
-
- <tdml:unparserTestCase name="apostrophe_01" root="e2" model="fixedLengthStrings" roundTrip="true"
- config="cfg_forceFileBuffering">
+ Note: Tests in this file are largely copies of those in testUnparserGeneral.tdml
+ modified to use a different config that forces file buffering.
- <tdml:infoset>
- <tdml:dfdlInfoset>
- <ex:e2>'</ex:e2>
- </tdml:dfdlInfoset>
- </tdml:infoset>
-
- <tdml:document>'</tdml:document>
-
- </tdml:unparserTestCase>
+ The test names are the same save a "_ffb" suffix, for "force file buffering".
+ -->
<!--
Test Name: puaInfosetChars_01
@@ -80,7 +67,7 @@
Purpose: When parsing illegal XML characters, they get mapped to PUA. This test demonstrates that when unparsing these mapped infosets, the characters get mapped back to their original values.
-->
- <tdml:parserTestCase name="puaInfosetChars_01" root="e1" model="illegalChars" roundTrip="true"
+ <tdml:parserTestCase name="puaInfosetChars_01_ffb" root="e1" model="illegalChars" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:document>
<tdml:documentPart type="byte">00</tdml:documentPart>
@@ -100,7 +87,7 @@
Purpose: When parsing illegal XML characters, they get mapped to PUA. This test demonstrates that when unparsing these mapped infosets, the characters get mapped back to their original values.
-->
- <tdml:parserTestCase name="puaInfosetChars_02" root="e1" model="illegalChars" roundTrip="true"
+ <tdml:parserTestCase name="puaInfosetChars_02_ffb" root="e1" model="illegalChars" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:document>
<tdml:documentPart type="byte">010203</tdml:documentPart>
@@ -120,7 +107,7 @@
Purpose: When parsing illegal XML characters, they get mapped to PUA. This test demonstrates that unparsing and unparsing actual PUA values is handled correctly.
-->
- <tdml:parserTestCase name="puaInfosetChars_03" root="e1" model="illegalChars" roundTrip="true"
+ <tdml:parserTestCase name="puaInfosetChars_03_ffb" root="e1" model="illegalChars" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:document></tdml:document>
@@ -138,7 +125,7 @@
Purpose: When parsing illegal XML characters, they get mapped to PUA. This test demonstrates that when unparsing these mapped infosets, the characters get mapped back to their original values.
-->
- <tdml:unparserTestCase name="puaInfosetChars_04" root="e1" model="illegalChars" roundTrip="true"
+ <tdml:unparserTestCase name="puaInfosetChars_04_ffb" root="e1" model="illegalChars" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -157,7 +144,7 @@
Purpose: This is a basic test of the unparse capabilities of Daffodil and the TDML Runner
-->
- <tdml:unparserTestCase name="unparseFixedLengthString01" root="e1" model="fixedLengthStrings" roundTrip="true"
+ <tdml:unparserTestCase name="unparseFixedLengthString01_ffb" root="e1" model="fixedLengthStrings" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -177,7 +164,7 @@
a parserTestCase.
-->
- <tdml:parserTestCase name="parseFixedLengthString01" root="e1" model="fixedLengthStrings" roundTrip="true"
+ <tdml:parserTestCase name="parseFixedLengthString01_ffb" root="e1" model="fixedLengthStrings" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:document>Hello</tdml:document>
@@ -195,7 +182,7 @@
Purpose: Test to see what happens when the fixed length of a string is '0' and when a default value is supplied
-->
- <tdml:parserTestCase name="parseFixedLengthStringLength0" root="e4" model="fixedLengthStrings" roundTrip="true"
+ <tdml:parserTestCase name="parseFixedLengthStringLength0_ffb" root="e4" model="fixedLengthStrings" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:document>[,2]</tdml:document>
@@ -217,7 +204,7 @@
Purpose: This is a basic test of the unparse capabilities of Daffodil and the TDML Runner
-->
- <tdml:unparserTestCase name="unparseFixedLengthString02" root="e2" model="fixedLengthStrings" roundTrip="true"
+ <tdml:unparserTestCase name="unparseFixedLengthString02_ffb" root="e2" model="fixedLengthStrings" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -237,7 +224,7 @@
In this case the test is referencing an external schema rather than an embedded one.
-->
- <tdml:unparserTestCase name="unparseFixedLengthString03" root="e1" model="generalSchema.dfdl.xsd"
+ <tdml:unparserTestCase name="unparseFixedLengthString03_ffb" root="e1" model="generalSchema.dfdl.xsd"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -257,7 +244,7 @@
In this case, the expected output does not match the unparsed output.
-->
- <tdml:unparserTestCase name="negativeUnparseTest01" root="e2" model="fixedLengthStrings"
+ <tdml:unparserTestCase name="negativeUnparseTest01_ffb" root="e2" model="fixedLengthStrings"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -286,7 +273,7 @@
In this case, the expected output does not match the unparsed output.
-->
- <tdml:unparserTestCase name="negativeUnparseTest02" root="e2" model="fixedLengthStrings"
+ <tdml:unparserTestCase name="negativeUnparseTest02_ffb" root="e2" model="fixedLengthStrings"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -314,7 +301,7 @@
an unparse error should occur.
-->
- <tdml:unparserTestCase name="negativeUnparseTest03" root="e1" model="fixedLengthStrings"
+ <tdml:unparserTestCase name="negativeUnparseTest03_ffb" root="e1" model="fixedLengthStrings"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -343,7 +330,7 @@
an unparse error should occur.
-->
- <tdml:unparserTestCase name="negativeUnparseTest04" root="e3" model="fixedLengthStrings"
+ <tdml:unparserTestCase name="negativeUnparseTest04_ffb" root="e3" model="fixedLengthStrings"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -368,7 +355,7 @@
In this case, the expected output does not match the unparsed output.
-->
- <tdml:unparserTestCase name="negativeUnparseTest05" root="e2" model="fixedLengthStrings"
+ <tdml:unparserTestCase name="negativeUnparseTest05_ffb" root="e2" model="fixedLengthStrings"
config="cfg_forceFileBuffering">
<tdml:infoset>
@@ -440,7 +427,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates unparsing a sequence of delimited strings
-->
- <tdml:unparserTestCase name="unparseDelimitedString01" model="delimitedStrings" root="e1" roundTrip="true"
+ <tdml:unparserTestCase name="unparseDelimitedString01_ffb" model="delimitedStrings" root="e1" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -453,7 +440,7 @@
<tdml:document>[1,2]</tdml:document>
</tdml:unparserTestCase>
- <tdml:parserTestCase name="parseDelimitedString01" model="delimitedStrings" root="e1"
+ <tdml:parserTestCase name="parseDelimitedString01_ffb" model="delimitedStrings" root="e1"
config="cfg_forceFileBuffering">
<tdml:document>[1,2]</tdml:document>
<tdml:infoset>
@@ -473,7 +460,7 @@
Purpose: This test demonstrates unparsing a sequence of delimited strings. In this case
there is too much data and an error should occur
-->
- <tdml:unparserTestCase name="unparseDelimitedString02" model="delimitedStrings" root="e1" roundTrip="false"
+ <tdml:unparserTestCase name="unparseDelimitedString02_ffb" model="delimitedStrings" root="e1" roundTrip="false"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -500,7 +487,7 @@
Purpose: This test demonstrates unparsing a sequence of delimited strings. In this case
there is not enough data and an error should occur
-->
- <tdml:unparserTestCase name="unparseDelimitedString03" model="delimitedStrings" root="e1" roundTrip="false"
+ <tdml:unparserTestCase name="unparseDelimitedString03_ffb" model="delimitedStrings" root="e1" roundTrip="false"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -525,7 +512,7 @@
Purpose: This test demonstrates unparsing a sequence of delimited strings. In this case the data is delimited by initiators.
-->
- <tdml:unparserTestCase name="unparseDelimitedString04" model="delimitedStrings" root="e2" roundTrip="true"
+ <tdml:unparserTestCase name="unparseDelimitedString04_ffb" model="delimitedStrings" root="e2" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -543,7 +530,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates unparsing a sequence of delimited strings. In this case the data is delimited by terminators.
-->
- <tdml:unparserTestCase name="unparseDelimitedString05" model="delimitedStrings" root="e3" roundTrip="true"
+ <tdml:unparserTestCase name="unparseDelimitedString05_ffb" model="delimitedStrings" root="e3" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -561,7 +548,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates unparsing a sequence of delimited strings. In this case the data is delimited by terminators.
-->
- <tdml:unparserTestCase name="unparseDelimitedString06" model="delimitedStrings" root="e4" roundTrip="true"
+ <tdml:unparserTestCase name="unparseDelimitedString06_ffb" model="delimitedStrings" root="e4" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -580,7 +567,7 @@
Purpose: This test demonstrates unparsing a delimited string. In this case the data is delimited by initiators.
-->
- <tdml:unparserTestCase name="unparseDelimitedString07" model="delimitedStrings" root="e5" roundTrip="true"
+ <tdml:unparserTestCase name="unparseDelimitedString07_ffb" model="delimitedStrings" root="e5" roundTrip="true"
config="cfg_forceFileBuffering">
<tdml:infoset>
<tdml:dfdlInfoset>
@@ -693,7 +680,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates roundtrip of an element with padding, OVC, and alignment
-->
- <tdml:unparserTestCase name="alignmentPaddingOVC1" model="alignmentPaddingOVC" root="e1"
+ <tdml:unparserTestCase name="alignmentPaddingOVC1_ffb" model="alignmentPaddingOVC" root="e1"
config="cfg_forceFileBuffering">
<tdml:document>
<tdml:documentPart type="text">xx20</tdml:documentPart><!-- length of below fields in bits -->
@@ -721,7 +708,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates roundtrip of an element with padding, OVC, and alignment
-->
- <tdml:unparserTestCase name="alignmentPaddingOVC2" model="alignmentPaddingOVC" root="e2"
+ <tdml:unparserTestCase name="alignmentPaddingOVC2_ffb" model="alignmentPaddingOVC" root="e2"
config="cfg_forceFileBuffering">
<tdml:document>
<tdml:documentPart type="text">20xx</tdml:documentPart><!-- length of below fields in bits -->
@@ -749,7 +736,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates roundtrip of an element with padding, OVC, and alignment
-->
- <tdml:unparserTestCase name="alignmentPaddingOVC3" model="alignmentPaddingOVC" root="e3"
+ <tdml:unparserTestCase name="alignmentPaddingOVC3_ffb" model="alignmentPaddingOVC" root="e3"
config="cfg_forceFileBuffering">
<tdml:document>
<tdml:documentPart type="text">x20x</tdml:documentPart><!-- length of below fields in bits -->
@@ -777,7 +764,7 @@
Schema: delimitedStrings
Purpose: This test demonstrates an SDE when explicit length is less than textOutputMinLength
-->
- <tdml:unparserTestCase name="alignmentPaddingOVC4" model="alignmentPaddingOVC"
+ <tdml:unparserTestCase name="alignmentPaddingOVC4_ffb" model="alignmentPaddingOVC"
roundTrip="none" config="cfg_forceFileBuffering">
<tdml:document>2AB;</tdml:document>
<tdml:warnings>
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestFileBuffering.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestFileBuffering.scala
index af62219..9debd85 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestFileBuffering.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestFileBuffering.scala
@@ -33,36 +33,36 @@ class TestUnparserFileBuffering {
import TestUnparserFileBuffering._
- @Test def test_puaInfosetChars_01(): Unit = { runner.runOneTest("puaInfosetChars_01") }
- @Test def test_puaInfosetChars_02(): Unit = { runner.runOneTest("puaInfosetChars_02") }
+ @Test def test_puaInfosetChars_01_ffb(): Unit = { runner.runOneTest("puaInfosetChars_01_ffb") }
+ @Test def test_puaInfosetChars_02_ffb(): Unit = { runner.runOneTest("puaInfosetChars_02_ffb") }
- @Test def test_unparseFixedLengthString01(): Unit = { runner.runOneTest("unparseFixedLengthString01") }
- @Test def test_unparseFixedLengthString02(): Unit = { runner.runOneTest("unparseFixedLengthString02") }
- @Test def test_unparseFixedLengthString03(): Unit = { runner.runOneTest("unparseFixedLengthString03") }
+ @Test def test_unparseFixedLengthString01_ffb(): Unit = { runner.runOneTest("unparseFixedLengthString01_ffb") }
+ @Test def test_unparseFixedLengthString02_ffb(): Unit = { runner.runOneTest("unparseFixedLengthString02_ffb") }
+ @Test def test_unparseFixedLengthString03_ffb(): Unit = { runner.runOneTest("unparseFixedLengthString03_ffb") }
- @Test def test_parseFixedLengthString01(): Unit = { runner.runOneTest("parseFixedLengthString01") }
- @Test def test_parseFixedLengthStringLength0(): Unit = { runner.runOneTest("parseFixedLengthStringLength0") }
+ @Test def test_parseFixedLengthString01_ffb(): Unit = { runner.runOneTest("parseFixedLengthString01_ffb") }
+ @Test def test_parseFixedLengthStringLength0_ffb(): Unit = { runner.runOneTest("parseFixedLengthStringLength0_ffb") }
- @Test def test_negativeUnparseTest01(): Unit = { runner.runOneTest("negativeUnparseTest01") }
- @Test def test_negativeUnparseTest02(): Unit = { runner.runOneTest("negativeUnparseTest02") }
- @Test def test_negativeUnparseTest03(): Unit = { runner.runOneTest("negativeUnparseTest03") }
- @Test def test_negativeUnparseTest04(): Unit = { runner.runOneTest("negativeUnparseTest04") }
- @Test def test_negativeUnparseTest05(): Unit = { runner.runOneTest("negativeUnparseTest05") }
+ @Test def test_negativeUnparseTest01_ffb(): Unit = { runner.runOneTest("negativeUnparseTest01_ffb") }
+ @Test def test_negativeUnparseTest02_ffb(): Unit = { runner.runOneTest("negativeUnparseTest02_ffb") }
+ @Test def test_negativeUnparseTest03_ffb(): Unit = { runner.runOneTest("negativeUnparseTest03_ffb") }
+ @Test def test_negativeUnparseTest04_ffb(): Unit = { runner.runOneTest("negativeUnparseTest04_ffb") }
+ @Test def test_negativeUnparseTest05_ffb(): Unit = { runner.runOneTest("negativeUnparseTest05_ffb") }
- @Test def test_unparseDelimitedString01(): Unit = { runner.runOneTest("unparseDelimitedString01") }
- @Test def test_unparseDelimitedString02(): Unit = { runner.runOneTest("unparseDelimitedString02") }
- @Test def test_unparseDelimitedString03(): Unit = { runner.runOneTest("unparseDelimitedString03") }
- @Test def test_unparseDelimitedString04(): Unit = { runner.runOneTest("unparseDelimitedString04") }
- @Test def test_unparseDelimitedString05(): Unit = { runner.runOneTest("unparseDelimitedString05") }
- @Test def test_unparseDelimitedString06(): Unit = { runner.runOneTest("unparseDelimitedString06") }
- @Test def test_unparseDelimitedString07(): Unit = { runner.runOneTest("unparseDelimitedString07") }
+ @Test def test_unparseDelimitedString01_ffb(): Unit = { runner.runOneTest("unparseDelimitedString01_ffb") }
+ @Test def test_unparseDelimitedString02_ffb(): Unit = { runner.runOneTest("unparseDelimitedString02_ffb") }
+ @Test def test_unparseDelimitedString03_ffb(): Unit = { runner.runOneTest("unparseDelimitedString03_ffb") }
+ @Test def test_unparseDelimitedString04_ffb(): Unit = { runner.runOneTest("unparseDelimitedString04_ffb") }
+ @Test def test_unparseDelimitedString05_ffb(): Unit = { runner.runOneTest("unparseDelimitedString05_ffb") }
+ @Test def test_unparseDelimitedString06_ffb(): Unit = { runner.runOneTest("unparseDelimitedString06_ffb") }
+ @Test def test_unparseDelimitedString07_ffb(): Unit = { runner.runOneTest("unparseDelimitedString07_ffb") }
- @Test def test_parseDelimitedString01(): Unit = { runner.runOneTest("parseDelimitedString01") }
+ @Test def test_parseDelimitedString01_ffb(): Unit = { runner.runOneTest("parseDelimitedString01_ffb") }
// DFDL-1650
- @Test def test_alignmentPaddingOVC1(): Unit = { runner.runOneTest("alignmentPaddingOVC1") }
- @Test def test_alignmentPaddingOVC2(): Unit = { runner.runOneTest("alignmentPaddingOVC2") }
- @Test def test_alignmentPaddingOVC3(): Unit = { runner.runOneTest("alignmentPaddingOVC3") }
- @Test def test_alignmentPaddingOVC4(): Unit = { runner.runOneTest("alignmentPaddingOVC4") }
+ @Test def test_alignmentPaddingOVC1_ffb(): Unit = { runner.runOneTest("alignmentPaddingOVC1_ffb") }
+ @Test def test_alignmentPaddingOVC2_ffb(): Unit = { runner.runOneTest("alignmentPaddingOVC2_ffb") }
+ @Test def test_alignmentPaddingOVC3_ffb(): Unit = { runner.runOneTest("alignmentPaddingOVC3_ffb") }
+ @Test def test_alignmentPaddingOVC4_ffb(): Unit = { runner.runOneTest("alignmentPaddingOVC4_ffb") }
}
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala
index 70aed65..a0653eb 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section00/general/TestUnparserGeneral.scala
@@ -33,8 +33,7 @@ class TestUnparserGeneral {
import TestUnparserGeneral._
- //DFDL-1420
- //@Test def test_apostrophe_01() { runner.runOneTest("apostrophe_01") }
+ @Test def test_apostrophe_01(): Unit = { runner.runOneTest("apostrophe_01") }
//DFDL-1395
//@Test def test_puaInfosetChars_03() { runner.runOneTest("puaInfosetChars_03") }