Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new daffodil-tdml-junit library #1389

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add new daffodil-tdml-junit library #1389

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
17d4dd7
Add new daffodil-tdml-junit library
stevedlawrence Dec 10, 2024
67a5dd4
Rewrite functional TDML tests to use new JUnit API
stevedlawrence Dec 19, 2024
96fdb9e
fixup! Add new daffodil-tdml-junit library
stevedlawrence Dec 19, 2024
1b3b57c
fixup! Rewrite functional TDML tests to use new JUnit API
stevedlawrence Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ lazy val daffodil = project
sapi,
schematron,
slf4jLogger,
tdmlJunit,
tdmlLib,
tdmlProc,
testDaf,
Expand Down Expand Up @@ -161,6 +162,11 @@ lazy val tdmlProc = Project("daffodil-tdml-processor", file("daffodil-tdml-proce
.dependsOn(tdmlLib, codeGenC, core, slf4jLogger)
.settings(commonSettings)

lazy val tdmlJunit = Project("daffodil-tdml-junit", file("daffodil-tdml-junit"))
.dependsOn(tdmlProc)
.settings(commonSettings)
.settings(libraryDependencies ++= Dependencies.junit)

lazy val cli = Project("daffodil-cli", file("daffodil-cli"))
.dependsOn(
tdmlProc,
Expand All @@ -184,7 +190,7 @@ lazy val schematron = Project("daffodil-schematron", file("daffodil-schematron")
.settings(libraryDependencies ++= Dependencies.schematron)

lazy val testDaf = Project("daffodil-test", file("daffodil-test"))
.dependsOn(tdmlProc % "test", codeGenC % "test->test", udf % "test->test")
.dependsOn(tdmlJunit % "test", codeGenC % "test->test", udf % "test->test")
.settings(commonSettings, nopublish)
//
// Uncomment the following line to run these tests
Expand All @@ -193,7 +199,7 @@ lazy val testDaf = Project("daffodil-test", file("daffodil-test"))
//.settings(IBMDFDLCrossTesterPlugin.settings)

lazy val testIBM1 = Project("daffodil-test-ibm1", file("daffodil-test-ibm1"))
.dependsOn(tdmlProc % "test")
.dependsOn(tdmlJunit % "test")
.settings(commonSettings, nopublish)
//
// Uncomment the following line to run these tests
Expand All @@ -216,11 +222,11 @@ lazy val testIntegration =
)

lazy val tutorials = Project("daffodil-tutorials", file("tutorials"))
.dependsOn(tdmlProc % "test")
.dependsOn(tdmlJunit % "test")
.settings(commonSettings, nopublish)

lazy val testStdLayout = Project("daffodil-test-stdLayout", file("test-stdLayout"))
.dependsOn(tdmlProc % "test")
.dependsOn(tdmlJunit % "test")
.settings(commonSettings, nopublish)

// Choices here are Java LTS versions, 8, 11, 17, 21,...
Expand Down
14 changes: 7 additions & 7 deletions daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/nested.tdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
c/daffodil unparse -o c/nested.struct.dat infosets/nested.struct.dat.xml
-->

<tdml:parserTestCase model="nested.dfdl.xsd" name="nested.struct">
<tdml:parserTestCase model="nested.dfdl.xsd" name="nested_struct">
<tdml:document>
<tdml:documentPart type="file">data/nested.struct.dat</tdml:documentPart>
</tdml:document>
Expand All @@ -48,7 +48,7 @@
</tdml:infoset>
</tdml:parserTestCase>

<tdml:parserTestCase model="nested.dfdl.xsd" name="nested.struct.diag1">
<tdml:parserTestCase model="nested.dfdl.xsd" name="nested_struct_diag1">
<tdml:document>
<tdml:documentPart type="file">data/nested.struct.diag1.dat</tdml:documentPart>
</tdml:document>
Expand All @@ -62,7 +62,7 @@
</tdml:validationErrors>
</tdml:parserTestCase>

<tdml:parserTestCase model="nested.dfdl.xsd" name="nested.struct.diag2">
<tdml:parserTestCase model="nested.dfdl.xsd" name="nested_struct_diag2">
<tdml:document>
<tdml:documentPart type="file">data/nested.struct.diag2.dat</tdml:documentPart>
</tdml:document>
Expand All @@ -77,7 +77,7 @@
</tdml:parserTestCase>

<tdml:parserTestCase model="nested.dfdl.xsd"
name="nested.struct.err1"
name="nested_struct_err1"
root="NestedStruct">
<tdml:document>
<tdml:documentPart type="file">data/nested.struct.err1.dat</tdml:documentPart>
Expand All @@ -90,7 +90,7 @@
</tdml:parserTestCase>

<tdml:parserTestCase model="nested.dfdl.xsd"
name="nested.struct.err2"
name="nested_struct_err2"
root="NestedStruct">
<tdml:document>
<tdml:documentPart type="file">data/nested.struct.err2.dat</tdml:documentPart>
Expand All @@ -102,7 +102,7 @@
</tdml:errors>
</tdml:parserTestCase>

<tdml:parserTestCase model="nested.dfdl.xsd" name="nested.union.bar">
<tdml:parserTestCase model="nested.dfdl.xsd" name="nested_union_bar">
<tdml:document>
<tdml:documentPart type="file">data/nested.union.bar.dat</tdml:documentPart>
</tdml:document>
Expand All @@ -111,7 +111,7 @@
</tdml:infoset>
</tdml:parserTestCase>

<tdml:parserTestCase model="nested.dfdl.xsd" name="nested.union.foo">
<tdml:parserTestCase model="nested.dfdl.xsd" name="nested_union_foo">
<tdml:document>
<tdml:documentPart type="file">data/nested.union.foo.dat</tdml:documentPart>
</tdml:document>
Expand Down
30 changes: 15 additions & 15 deletions daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/simple.tdml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-boolean"
name="simple_boolean"
root="simple-boolean">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -48,7 +48,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-byte"
name="simple_byte"
root="simple-byte">
<tdml:document>
<tdml:documentPart type="byte">00</tdml:documentPart>
Expand All @@ -65,7 +65,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-double"
name="simple_double"
root="simple-double">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00 00 00 00 00</tdml:documentPart>
Expand All @@ -82,7 +82,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-float"
name="simple_float"
root="simple-float">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -99,7 +99,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-hexBinary"
name="simple_hexBinary"
root="simple-hexBinary">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -116,7 +116,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-hexBinaryPrefixed"
name="simple_hexBinaryPrefixed"
root="simple-hexBinaryPrefixed">
<tdml:document>
<tdml:documentPart type="byte">00 04 00 00 00 00</tdml:documentPart>
Expand All @@ -133,7 +133,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-int"
name="simple_int"
root="simple-int">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -150,7 +150,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-integer"
name="simple_integer"
root="simple-integer">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -167,7 +167,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-long"
name="simple_long"
root="simple-long">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00 00 00 00 00</tdml:documentPart>
Expand All @@ -184,7 +184,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-nonNegativeInteger"
name="simple_nonNegativeInteger"
root="simple-nonNegativeInteger">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -201,7 +201,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-short"
name="simple_short"
root="simple-short">
<tdml:document>
<tdml:documentPart type="byte">00 00</tdml:documentPart>
Expand All @@ -218,7 +218,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-unsignedByte"
name="simple_unsignedByte"
root="simple-unsignedByte">
<tdml:document>
<tdml:documentPart type="byte">00</tdml:documentPart>
Expand All @@ -235,7 +235,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-unsignedInt"
name="simple_unsignedInt"
root="simple-unsignedInt">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00</tdml:documentPart>
Expand All @@ -252,7 +252,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-unsignedLong"
name="simple_unsignedLong"
root="simple-unsignedLong">
<tdml:document>
<tdml:documentPart type="byte">00 00 00 00 00 00 00 00</tdml:documentPart>
Expand All @@ -269,7 +269,7 @@
-->
<tdml:parserTestCase
model="simple.dfdl.xsd"
name="simple-unsignedShort"
name="simple_unsignedShort"
root="simple-unsignedShort">
<tdml:document>
<tdml:documentPart type="byte">00 00</tdml:documentPart>
Expand Down
Loading
Loading