This is an automated email from the ASF dual-hosted git repository.
mbeckerle pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
The following commit(s) were added to refs/heads/main by this push:
new 14f9fbedf Move src/it tests to src/test except UDF testing
14f9fbedf is described below
commit 14f9fbedf2846242cd16d4e0eabac32fb4457623
Author: Michael Beckerle <[email protected]>
AuthorDate: Thu Jan 19 10:20:51 2023 -0500
Move src/it tests to src/test except UDF testing
Removed excess package depth.
DAFFODIL-2772
---
build.sbt | 2 +-
daffodil-cli/build.sbt | 10 ++
.../daffodil/{udf => cliTest}/TestCLIUdfs.scala | 4 +-
.../apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd | 0
.../org/apache/daffodil/CLI/bits_parsing.dfdl.xsd | 0
.../apache/daffodil/CLI/blob_backtracking.dfdl.xsd | 0
.../apache/daffodil/CLI/charClassEntities.dfdl.xsd | 0
.../org/apache/daffodil/CLI/cli_schema.dfdl.xsd | 0
.../org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd | 0
.../org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd | 0
.../org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd | 0
.../org/apache/daffodil/CLI/complex_types.dfdl.xsd | 0
.../apache/daffodil/CLI/global_element.dfdl.xsd | 2 +-
.../daffodil/CLI/global_element_import.dfdl.xsd | 2 +-
.../org/apache/daffodil/CLI/input/gen_blob.py | 0
.../org/apache/daffodil/CLI/input/hextest.txt | Bin
.../org/apache/daffodil/CLI/input/input1.txt | 0
.../org/apache/daffodil/CLI/input/input1.txt.xml | 0
.../org/apache/daffodil/CLI/input/input10.txt | 0
.../org/apache/daffodil/CLI/input/input11.txt | 0
.../org/apache/daffodil/CLI/input/input12.txt | 0
.../org/apache/daffodil/CLI/input/input13.txt | 0
.../org/apache/daffodil/CLI/input/input14.exi | 0
.../org/apache/daffodil/CLI/input/input14.exisa | 0
.../org/apache/daffodil/CLI/input/input14.txt | 0
.../org/apache/daffodil/CLI/input/input15.txt | 0
.../org/apache/daffodil/CLI/input/input16.txt | 0
.../org/apache/daffodil/CLI/input/input18.exi | 0
.../org/apache/daffodil/CLI/input/input18.exisa | 0
.../org/apache/daffodil/CLI/input/input18.json | 0
.../org/apache/daffodil/CLI/input/input18.txt | 0
.../org/apache/daffodil/CLI/input/input19.txt | Bin
.../org/apache/daffodil/CLI/input/input2.txt | 0
.../org/apache/daffodil/CLI/input/input3.txt | 0
.../org/apache/daffodil/CLI/input/input4.txt | 0
.../org/apache/daffodil/CLI/input/input5.txt | 0
.../org/apache/daffodil/CLI/input/input6.txt | 0
.../org/apache/daffodil/CLI/input/input7.txt | 0
.../org/apache/daffodil/CLI/input/input8.txt | 0
.../org/apache/daffodil/CLI/input/input9.txt | 0
.../org/apache/daffodil/CLI/input/input9.txt.xml | 0
.../org/apache/daffodil/CLI/input/inputBig1M.txt | 0
.../org/apache/daffodil/CLI/input/prefix.txt | 0
.../apache/daffodil/CLI/input/test_DFDL-714.txt | 2 +-
.../org/apache/daffodil/CLI/input/uuid.txt | 0
.../org/apache/daffodil/CLI/large_blob.dfdl.xsd | 0
.../apache/daffodil/CLI/prefixed_length.dfdl.xsd | 0
.../apache/daffodil/CLI/suppressWarnTest.dfdl.xsd | 0
.../CLI/testNonCompatibleImplementation.tdml | 0
.../org/apache/daffodil/CLI/trace_input.dfdl.xsd | 112 ++++++++++-----------
.../daffodil/CLI/unqualified_path_step.dfdl.xsd | 0
.../daffodil/CLI/xcatalog_import_failure.dfdl.xsd | 0
.../org/apache/daffodil/CLI/xcatalog_invalid.xml | 0
.../resources/test/cli/fixedLength.dfdl.xsd | 0
.../resources/test/cli/unboundedBinary.dfdl.xsd | 0
.../scala/org/apache/daffodil/CLI/Util.scala | 0
.../org/apache/daffodil/cliTest}/TestBlob.scala | 25 ++---
.../apache/daffodil/cliTest}/TestCLIDebugger.scala | 96 +++++++++---------
.../daffodil/cliTest}/TestCLIGenerateC.scala | 4 +-
.../apache/daffodil/cliTest}/TestCLIParsing.scala | 67 ++++++------
.../daffodil/cliTest}/TestCLIPerformance.scala | 35 ++++---
.../daffodil/cliTest}/TestCLISaveParser.scala | 21 ++--
.../apache/daffodil/cliTest}/TestCLITunables.scala | 33 +++---
.../daffodil/cliTest}/TestCLIUnparsing.scala | 53 +++++-----
.../org/apache/daffodil/cliTest}/TestCLItdml.scala | 9 +-
.../daffodil/cliTest}/TestEXIEncodeDecode.scala | 4 +-
.../{ => cliTest}/TestValidatorPatterns.scala | 3 +-
.../cliTest}/schematron/TestEmbedded.scala | 2 +-
.../cliTest}/schematron/TestSvrlOutput.scala | 10 +-
.../cliTest}/schematron/TestValidating.scala | 8 +-
.../src/test/resources/xsd/unit_price.dfdl.xsd | 2 +-
project/Rat.scala | 56 +++++------
72 files changed, 278 insertions(+), 284 deletions(-)
diff --git a/build.sbt b/build.sbt
index 99a22b3ef..17d7a29c7 100644
--- a/build.sbt
+++ b/build.sbt
@@ -178,7 +178,7 @@ lazy val commonSettings = Seq(
sourceManaged := baseDirectory.value / "src_managed",
resourceManaged := baseDirectory.value / "resource_managed",
libraryDependencies ++= Dependencies.common,
- IntegrationTest / parallelExecution := false,
+ // IntegrationTest / parallelExecution := false, // allow test in parallel
testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "--verbosity=1"),
) ++ Defaults.itSettings
diff --git a/daffodil-cli/build.sbt b/daffodil-cli/build.sbt
index cc2c57b1b..6d07885cb 100644
--- a/daffodil-cli/build.sbt
+++ b/daffodil-cli/build.sbt
@@ -23,11 +23,21 @@ enablePlugins(JavaAppPackaging)
enablePlugins(RpmPlugin)
enablePlugins(WindowsPlugin)
+// CLI tests are not thread safe
+// due to use of temporary buffer used to capture stdout/stderr.
+// So we cannot test in parallel
+Test / parallelExecution := false
+IntegrationTest / parallelExecution := false
+
// need 'sbt stage' to build the CLI for cli integration tests
(IntegrationTest / test) := (IntegrationTest / test).dependsOn(Compile /
stage).value
(IntegrationTest / testOnly) := (IntegrationTest / testOnly).dependsOn(Compile
/ stage).evaluated
(IntegrationTest / testQuick) := (IntegrationTest /
testQuick).dependsOn(Compile / stage).evaluated
+// Add the classes in src/test/ to the IntegrationTest classpath
+// so we can share CLI utliities in Util.scala
+(IntegrationTest / dependencyClasspath) ++= (Test / exportedProducts).value
+
executableScriptName := "daffodil"
Universal / packageName := "apache-daffodil-" + version.value + "-bin"
//tarball name
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
b/daffodil-cli/src/it/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
similarity index 99%
rename from daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
rename to
daffodil-cli/src/it/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
index 2898a2b1f..396e6d0e3 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/udf/TestCLIUdfs.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/cliTest/TestCLIUdfs.scala
@@ -15,12 +15,10 @@
* limitations under the License.
*/
-package org.apache.daffodil.udf
+package org.apache.daffodil.cliTest
import java.nio.file.Path
-
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
similarity index 97%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
index 702f34dd5..a6975fd5f 100644
---
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
+++
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
@@ -32,7 +32,7 @@
</xs:annotation>
<xs:import namespace="http://complexSchema.com";
- schemaLocation="./complex_types.dfdl.xsd" />
+ schemaLocation="complex_types.dfdl.xsd" />
<xs:element name="elem" type="a:dfdl_913">
</xs:element>
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
similarity index 95%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
index 6e4c43bb7..42dbff5df 100644
---
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
+++
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
@@ -21,6 +21,6 @@
targetNamespace="http://importSchema.com";>
<xs:import namespace="http://baseSchema.com";
- schemaLocation="./global_element.dfdl.xsd" />
+ schemaLocation="global_element.dfdl.xsd" />
</xs:schema>
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/gen_blob.py
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/gen_blob.py
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/gen_blob.py
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/gen_blob.py
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt.xml
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt.xml
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt.xml
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt.xml
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input10.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input10.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exi
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exi
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exi
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exi
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exisa
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exisa
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exisa
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exisa
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exi
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exi
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exi
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exi
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exisa
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exisa
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exisa
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exisa
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.json
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.json
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input19.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input19.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt.xml
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt.xml
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt.xml
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt.xml
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/prefix.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/prefix.txt
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/prefix.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/prefix.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
similarity index 92%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
index dc2ac0822..e70c211a5 100644
---
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
+++
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
@@ -1 +1 @@
-Hello World
+Hello World
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt
similarity index 100%
rename from daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt
rename to daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/prefixed_length.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/prefixed_length.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/prefixed_length.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/prefixed_length.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd
similarity index 97%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd
index 758cdcedd..559acd6d6 100644
--- a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd
+++
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xs:schema
- targetNamespace="http://example.com";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/";
- xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions";
- xmlns:ex="http://example.com";
- xmlns="http://example.com";
- xmlns:fn="http://www.w3.org/2005/xpath-functions";
- elementFormDefault="unqualified">
-
- <xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
-
- <xs:annotation>
- <xs:appinfo source="http://www.ogf.org/dfdl/"; >
- <dfdl:format ref="ex:GeneralFormat" representation="text" terminator=""
/>
- </xs:appinfo>
- </xs:annotation>
-
- <xs:element name="output">
- <xs:complexType>
- <xs:sequence>
- <xs:sequence
dfdl:hiddenGroupRef="hidden_message" />
- <xs:element name="message" type="xs:string"
dfdl:inputValueCalc="{
- if (dfdlx:trace(../Hidden_Value eq '0',
'value')) then 'hello'
- else fn:error('Unrecognized value')}"
dfdl:terminator=""/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:group name="hidden_message">
- <xs:sequence>
- <xs:element name="Hidden_Value" type="xs:string"
dfdl:length="1" dfdl:lengthKind="explicit" dfdl:outputValueCalc="{
- if (dfdlx:trace(../message eq 'hello',
'value')) then '0'
- else fn:error('Unrecognized value')}"
- />
- </xs:sequence>
- </xs:group>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xs:schema
+ targetNamespace="http://example.com";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/";
+ xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions";
+ xmlns:ex="http://example.com";
+ xmlns="http://example.com";
+ xmlns:fn="http://www.w3.org/2005/xpath-functions";
+ elementFormDefault="unqualified">
+
+ <xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+
+ <xs:annotation>
+ <xs:appinfo source="http://www.ogf.org/dfdl/"; >
+ <dfdl:format ref="ex:GeneralFormat" representation="text" terminator=""
/>
+ </xs:appinfo>
+ </xs:annotation>
+
+ <xs:element name="output">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:sequence
dfdl:hiddenGroupRef="hidden_message" />
+ <xs:element name="message" type="xs:string"
dfdl:inputValueCalc="{
+ if (dfdlx:trace(../Hidden_Value eq '0',
'value')) then 'hello'
+ else fn:error('Unrecognized value')}"
dfdl:terminator=""/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:group name="hidden_message">
+ <xs:sequence>
+ <xs:element name="Hidden_Value" type="xs:string"
dfdl:length="1" dfdl:lengthKind="explicit" dfdl:outputValueCalc="{
+ if (dfdlx:trace(../message eq 'hello',
'value')) then '0'
+ else fn:error('Unrecognized value')}"
+ />
+ </xs:sequence>
+ </xs:group>
+</xs:schema>
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/xcatalog_import_failure.dfdl.xsd
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/xcatalog_import_failure.dfdl.xsd
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/xcatalog_import_failure.dfdl.xsd
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/xcatalog_import_failure.dfdl.xsd
diff --git
a/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/xcatalog_invalid.xml
b/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/xcatalog_invalid.xml
similarity index 100%
rename from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/xcatalog_invalid.xml
rename to
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/xcatalog_invalid.xml
diff --git a/daffodil-cli/src/it/resources/test/cli/fixedLength.dfdl.xsd
b/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/it/resources/test/cli/fixedLength.dfdl.xsd
rename to daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
diff --git a/daffodil-cli/src/it/resources/test/cli/unboundedBinary.dfdl.xsd
b/daffodil-cli/src/test/resources/test/cli/unboundedBinary.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/it/resources/test/cli/unboundedBinary.dfdl.xsd
rename to daffodil-cli/src/test/resources/test/cli/unboundedBinary.dfdl.xsd
diff --git a/daffodil-cli/src/it/scala/org/apache/daffodil/CLI/Util.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
similarity index 100%
rename from daffodil-cli/src/it/scala/org/apache/daffodil/CLI/Util.scala
rename to daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
diff --git a/daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestBlob.scala
similarity index 84%
rename from daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
rename to daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestBlob.scala
index 31d7ee104..8d854d981 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/blob/TestBlob.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestBlob.scala
@@ -15,21 +15,18 @@
* limitations under the License.
*/
-package org.apache.daffodil.blob
+package org.apache.daffodil.cliTest
import java.net.URI
import java.nio.file.Files.exists
import java.nio.file.Path
import java.nio.file.Paths
-
import org.apache.commons.io.FileUtils
-
import org.junit.Test
import org.junit.Assume.assumeTrue
import org.junit.Assert.assertEquals
import scala.io.Source
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -43,7 +40,7 @@ class TestBlob {
* will need to generate the test file(s) using the gen_blob.py script. It
can
* be found in and should be run from the directory:
*
- * daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/
+ * daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/
*
* Please note that the md5sum that is printed out from the script is the
hash
* of just the blob portion of the file that is generated, it does not
include
@@ -51,7 +48,7 @@ class TestBlob {
*
* Make sure that the generated file is located in the following directory:
*
- * daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/
+ * daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/
*
* The exact command used to generate the blob for each test will be listed
in
* a comment above that test
@@ -84,8 +81,8 @@ class TestBlob {
*
***/
@Test def test_1MB_blob(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/1MB.bin")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/1MB.bin")
assumeTrue("large test input file must be manually generated",
exists(input))
@@ -113,8 +110,8 @@ class TestBlob {
*
***/
@Test def test_2GB_blob(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/2049MB.bin")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/large_blob.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/2049MB.bin")
assumeTrue("large test input file must be manually generated",
exists(input))
@@ -144,8 +141,8 @@ class TestBlob {
*
***/
@Test def test_blob_backtracking(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/2049MB.bin")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/2049MB.bin")
assumeTrue("large test input file must be manually generated",
exists(input))
@@ -165,8 +162,8 @@ class TestBlob {
*
***/
@Test def test_blob_backtracking_streaming_fail(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/2049MB.bin")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/blob_backtracking.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/2049MB.bin")
assumeTrue("large test input file must be manually generated",
exists(input))
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
similarity index 88%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
index 2b1829430..ea18ad3a1 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIDebugger.scala
@@ -15,15 +15,13 @@
* limitations under the License.
*/
-package org.apache.daffodil.debugger
+package org.apache.daffodil.cliTest
import org.junit.Test
import java.nio.file.Files
import java.nio.charset.StandardCharsets.UTF_8
-
import net.sf.expectit.matcher.Matchers.regexp
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -31,7 +29,7 @@ class TestCLIdebugger {
@Test def test_3385_CLI_Debugger_invalidExpressions(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -62,7 +60,7 @@ class TestCLIdebugger {
@Test def test_1591_CLI_Debugger_invalidCommandError(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -74,7 +72,7 @@ class TestCLIdebugger {
@Test def test_1335_CLI_Debugger_dataAndWrapLength(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("debug")
@@ -93,7 +91,7 @@ class TestCLIdebugger {
@Test def test_982_CLI_Debugger_simpleDebugger(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -104,7 +102,7 @@ class TestCLIdebugger {
@Test def test_1326_CLI_Debugger_displaysTesting(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -138,8 +136,8 @@ class TestCLIdebugger {
}
@Test def test_1339_CLI_Debugger_removeHidden(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
runCLI(args"-d parse -s $schema -r e $input") { cli =>
cli.expect("(debug)")
@@ -158,8 +156,8 @@ class TestCLIdebugger {
}
@Test def test_3268_CLI_Debugger_removeHidden2(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
runCLI(args"-d parse -s $schema -r e $input") { cli =>
cli.expect("(debug)")
@@ -177,7 +175,7 @@ class TestCLIdebugger {
@Test def test_1331_CLI_Debugger_breakpointTesting4(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -226,7 +224,7 @@ class TestCLIdebugger {
@Test def test_1463_CLI_Debugger_breakOnValueOfElement(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -275,8 +273,8 @@ class TestCLIdebugger {
}
@Test def test_1338_CLI_Debugger_pointsOfUncertaintyInfo(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
runCLI(args"-d parse -s $schema -r Item2 $input") { cli =>
cli.expect("(debug)")
@@ -301,7 +299,7 @@ class TestCLIdebugger {
@Test def test_1328_CLI_Debugger_breakpointTesting(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -335,7 +333,7 @@ class TestCLIdebugger {
@Test def test_1329_CLI_Debugger_breakpointTesting2(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -364,7 +362,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_SDE_message(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -383,7 +381,7 @@ class TestCLIdebugger {
@Test def test_1330_CLI_Debugger_breakpointTesting3(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -416,7 +414,7 @@ class TestCLIdebugger {
@Test def test_1333_CLI_Debugger_settingInfosetLines(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -452,7 +450,7 @@ class TestCLIdebugger {
@Test def test_1334_CLI_Debugger_infoBitPosition(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -477,7 +475,7 @@ class TestCLIdebugger {
@Test def test_1337_CLI_Debugger_childIndex(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -503,7 +501,7 @@ class TestCLIdebugger {
@Test def test_1340_CLI_Debugger_infoPath(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -526,7 +524,7 @@ class TestCLIdebugger {
@Test def test_1382_CLI_Debugger_dataAndWrapLength2(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -547,8 +545,8 @@ class TestCLIdebugger {
}
@Test def test_1863_CLI_Debugger_groupIndex01(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt")
runCLI(args"-d parse -r list -s $schema $input") { cli =>
cli.expect("(debug)")
@@ -573,8 +571,8 @@ class TestCLIdebugger {
}
@Test def test_1029_CLI_Debugger_validation1(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt")
runCLI(args"-d parse -r list -s $schema $input") { cli =>
cli.expect("(debug)")
@@ -591,7 +589,7 @@ class TestCLIdebugger {
@Test def test_3258_CLI_Debugger_infodata(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -614,7 +612,7 @@ class TestCLIdebugger {
@Test def test_3264_CLI_Debugger_undefined_command(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -632,7 +630,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_delimiterStack(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -663,7 +661,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_utf16_encoding(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt")
runCLI(args"-d parse -s $schema -r e2 $input") { cli =>
cli.expect("(debug)")
@@ -677,7 +675,7 @@ class TestCLIdebugger {
@Test def test_1337_CLI_Debugger_info_infoset(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -861,7 +859,7 @@ class TestCLIdebugger {
@Test def test_3585_CLI_Debugger_simpleDebugger_unparse(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
runCLI(args"-d unparse -s $schema -r e1 $input") { cli =>
cli.expect("(debug)")
@@ -875,8 +873,8 @@ class TestCLIdebugger {
}
@Test def test_3585_CLI_Debugger_prefixLength(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/prefixed_length.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/prefix.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/prefixed_length.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/prefix.txt")
runCLI(args"-d parse -s $schema $input") { cli =>
cli.expect("(debug)")
@@ -898,7 +896,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_info_variables(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -910,7 +908,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_info_data_text(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -924,7 +922,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_info_data_binary(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -938,7 +936,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_info_diff_01(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables_01.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r c $input") { cli =>
cli.expect("(debug)")
@@ -964,7 +962,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_info_diff_02(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"-d parse -s $schema -r matrix $input") { cli =>
cli.expect("(debug)")
@@ -995,8 +993,8 @@ class TestCLIdebugger {
}
@Test def test_CLI_Debugger_info_diff_03(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
runCLI(args"-d parse -s $schema -r e $input") { cli =>
cli.expect("(debug)")
@@ -1022,7 +1020,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_info_diff_04(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt.xml")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt.xml")
runCLI(args"-d unparse -s $schema -r matrix -o $devNull $input") { cli =>
cli.expect("(debug)")
@@ -1056,8 +1054,8 @@ class TestCLIdebugger {
}
@Test def test_CLI_Debugger_info_diff_05(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt.xml")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt.xml")
runCLI(args"-d unparse -r list -s $schema -o $devNull $input") { cli =>
cli.expect("(debug)")
@@ -1089,7 +1087,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_parse_unparser_not_available(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
runCLI(args"-d parse -s $schema $input") { cli =>
cli.expect("(debug)")
@@ -1107,7 +1105,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_unparse_parser_not_available(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt.xml")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt.xml")
runCLI(args"-d unparse -s $schema $input") { cli =>
cli.expect("(debug)")
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/generating/TestCLIGenerateC.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIGenerateC.scala
similarity index 99%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/generating/TestCLIGenerateC.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIGenerateC.scala
index 358b8038f..08056dd72 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/generating/TestCLIGenerateC.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIGenerateC.scala
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package org.apache.daffodil.generating
+package org.apache.daffodil.cliTest
import java.nio.file.Files.exists
-
import org.junit.Test
import org.junit.Assert.assertTrue
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIParsing.scala
similarity index 90%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIParsing.scala
index ddc665d90..7ecbab7cb 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIParsing.scala
@@ -15,15 +15,12 @@
* limitations under the License.
*/
-package org.apache.daffodil.parsing
+package org.apache.daffodil.cliTest
import java.nio.charset.StandardCharsets.UTF_8
-
import org.apache.commons.io.FileUtils
-
import org.junit.Assert._
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -217,7 +214,7 @@ class TestCLIparsing {
@Test def test_979_CLI_Parsing_SimpleParse_inFile(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"parse -s $schema -r matrix $input") { cli =>
cli.expect("<tns:cell>2</tns:cell>")
@@ -226,7 +223,7 @@ class TestCLIparsing {
@Test def test_980_CLI_Parsing_SimpleParse_stOutDash(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"parse -s $schema -r matrix -o - $input") { cli =>
cli.expect("<tns:cell>2</tns:cell>")
@@ -322,7 +319,7 @@ class TestCLIparsing {
@Test def test_1003_CLI_Parsing_SimpleParse_emptyNamespace(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
runCLI(args"parse -s $schema -r {}address $input") { cli =>
cli.expect("<address>")
@@ -330,8 +327,8 @@ class TestCLIparsing {
}
@Test def test_1004_CLI_Parsing_SimpleParse_namespaceUsed(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
runCLI(args"parse -s $schema -r {target}matrix $input") { cli =>
cli.expect("""<tns:matrix xmlns:tns="target">""")
@@ -340,8 +337,8 @@ class TestCLIparsing {
}
@Test def test_2615_CLI_Parsing_SimpleParse_namespaceUsedLongOpt(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
runCLI(args"parse -s $schema --root {target}matrix $input") { cli =>
cli.expect("""<tns:matrix xmlns:tns="target">""")
@@ -362,7 +359,7 @@ class TestCLIparsing {
@Test def test_1015_CLI_Parsing_SimpleParse_defaultRootMultSchema(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
runCLI(args"parse -s $schema $input") { cli =>
cli.expect("<address>")
@@ -417,7 +414,7 @@ class TestCLIparsing {
}
@Test def test_1319_CLI_Parsing_invalidElementSDE(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd")
runCLI(args"parse -s $schema -r ABC") { cli =>
cli.sendLine("ababababbaacccccb", inputDone = true)
@@ -427,7 +424,7 @@ class TestCLIparsing {
@Test def test_1346_CLI_Parsing_SimpleParse_defaultRootMultSchemaMultiple():
Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
for (x <- 1 to 10) {
runCLI(args"parse -s $schema $input") { cli =>
cli.expect("<address>")
@@ -474,7 +471,7 @@ class TestCLIparsing {
}
@Test def test_CLI_Parsing_BitParse_LSBPartialByte_leftOverData(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd")
runCLI(args"parse -s $schema -r lsbPartialByte") { cli =>
cli.send("stri", inputDone = true)
@@ -486,7 +483,7 @@ class TestCLIparsing {
}
@Test def test_CLI_Parsing_BitParse_MSBPartialByte_leftOverData(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd")
runCLI(args"parse -s $schema -r msbPartialByte") { cli =>
cli.send("stri", inputDone = true)
@@ -498,7 +495,7 @@ class TestCLIparsing {
}
@Test def test_CLI_Parsing_BitParse_MSBFullByte_leftOverData(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/bits_parsing.dfdl.xsd")
runCLI(args"parse -s $schema -r msbFullByte") { cli =>
cli.send("stri", inputDone = true)
@@ -509,8 +506,8 @@ class TestCLIparsing {
}
@Test def test_DFDL_714(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
runCLI(args"parse -s $schema $input") { cli =>
cli.expect("<tns:elem xmlns:tns=\"http://baseSchema.com\";>")
@@ -521,8 +518,8 @@ class TestCLIparsing {
}
@Test def test_DFDL_1203_schema_from_jar(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
runCLI(args"parse -s $schema $input") { cli =>
cli.expect("<tns:elem xmlns:tns=\"http://baseSchema.com\";>")
@@ -546,8 +543,8 @@ class TestCLIparsing {
}
@Test def test_CLI_Parsing_built_in_formats(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
runCLI(args"parse -s $schema -r e $input") { cli =>
cli.expectErr("Schema Definition Warning")
@@ -570,7 +567,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_Stream_01(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
runCLI(args"parse --stream -s $schema") { cli =>
cli.send("123", inputDone = true)
@@ -581,7 +578,7 @@ class TestCLIparsing {
}
@Test def test_XXX_CLI_Parsing_Stream_02(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
runCLI(args"parse --stream -s $schema") { cli =>
cli.send("123ab", inputDone = true)
@@ -594,8 +591,8 @@ class TestCLIparsing {
}
@Test def test_CLI_Parsing_XCatalog_Resolution_Failure(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/xcatalog_import_failure.dfdl.xsd")
- val xcatalog =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/xcatalog_invalid.xml")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/xcatalog_import_failure.dfdl.xsd")
+ val xcatalog =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/xcatalog_invalid.xml")
withSysProp("xml.catalog.files" -> xcatalog.toAbsolutePath.toString) {
runCLI(args"parse -s $schema") { cli =>
@@ -644,13 +641,15 @@ class TestCLIparsing {
@Test def test_XXX_CLI_Parsing_SimpleParse_null(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
+ withTempFile { output =>
+ // should create no output to the file.
+ runCLI(args"parse -I null -s $schema -r e1 -o $output") { cli =>
+ cli.send("Hello", inputDone = true)
+ }(ExitCode.Success)
- // must be a forking test to match eof to make sure no data is output
- runCLI(args"parse -I null -s $schema -r e1", fork = true) { cli =>
- cli.send("Hello", inputDone = true)
- val res = cli.expect(net.sf.expectit.matcher.Matchers.eof)
- assertEquals("", res.getBefore())
- } (ExitCode.Success)
+ val res = FileUtils.readFileToString(output.toFile, UTF_8)
+ assertTrue(res.contains(""))
+ }
}
@Test def test_XXX_CLI_Parsing_SimpleParse_sax(): Unit = {
@@ -687,7 +686,7 @@ class TestCLIparsing {
}
@Test def test_2575_DFDLX_Trace_output(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/trace_input.dfdl.xsd")
runCLI(args"-v parse -r output -s $schema") { cli =>
cli.send("0", inputDone = true)
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIPerformance.scala
similarity index 81%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIPerformance.scala
index ac70caccb..9270bca1e 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIPerformance.scala
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.daffodil.performance
+package org.apache.daffodil.cliTest
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -26,7 +25,7 @@ class TestCLIPerformance {
@Test def test_3393_CLI_Performance_2_Threads_2_Times(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"performance -N 2 -t 2 -s $schema -r matrix $input") { cli =>
cli.expect("total parse time (sec):")
@@ -36,7 +35,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_2_Threads_2_Times_sax(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"performance -I sax -N 2 -t 2 -s $schema -r matrix $input") {
cli =>
cli.expect("total parse time (sec):")
@@ -46,7 +45,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_2_Threads_2_Times_exi(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"performance -I exi -N 2 -t 2 -s $schema -r matrix $input") {
cli =>
cli.expect("total parse time (sec):")
@@ -56,7 +55,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_2_Threads_2_Times_exisa(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"performance -I exisa -N 2 -t 2 -s $schema -r matrix $input") {
cli =>
cli.expect("total parse time (sec):")
@@ -66,7 +65,7 @@ class TestCLIPerformance {
@Test def test_3394_CLI_Performance_3_Threads_20_Times(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
runCLI(args"performance -N 20 -t 3 -s $schema -r matrix $input") { cli =>
cli.expect("total parse time (sec):")
@@ -75,8 +74,8 @@ class TestCLIPerformance {
}
@Test def test_3395_CLI_Performance_5_Threads_50_Times(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
runCLI(args"performance -N 50 -t 5 -s $schema -r Item2 $input") { cli =>
cli.expect("total parse time (sec):")
@@ -86,7 +85,7 @@ class TestCLIPerformance {
@Test def test_3396_CLI_Performance_2_Threads_2_Times_Negative(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
runCLI(args"performance -N 2 -t 2 -s $schema $input") { cli =>
cli.expect("total parse time (sec):")
@@ -97,7 +96,7 @@ class TestCLIPerformance {
@Test def test_3641_CLI_Performance_Unparse_2_Threads_2_Times(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
runCLI(args"performance --unparse -N 2 -t 2 -s $schema -r e3 $input") {
cli =>
cli.expect("total unparse time (sec):")
@@ -107,7 +106,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_Unparse_2_Threads_2_Times_sax(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
runCLI(args"performance --unparse -I sax -N 2 -t 2 -s $schema -r e3
$input") { cli =>
cli.expect("total unparse time (sec):")
@@ -117,7 +116,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_Unparse_2_Threads_2_Times_exi(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exi")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exi")
runCLI(args"performance --unparse -I exi -N 2 -t 2 -s $schema -r e3
$input") { cli =>
cli.expect("total unparse time (sec):")
@@ -127,7 +126,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_Unparse_2_Threads_2_Times_exisa(): Unit =
{
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exisa")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exisa")
runCLI(args"performance --unparse -I exisa -N 2 -t 2 -s $schema -r e3
$input") { cli =>
cli.expect("total unparse time (sec):")
@@ -137,7 +136,7 @@ class TestCLIPerformance {
@Test def test_XXX_CLI_Performance_Unparse_2_Threads_2_Times_null(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
runCLI(args"performance --unparse -I null -N 2 -t 2 -s $schema -r e3
$input") { cli =>
cli.expect("total unparse time (sec):")
@@ -147,7 +146,7 @@ class TestCLIPerformance {
@Test def test_3643_CLI_Performance_Unparse_3_Threads_20_Times(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
runCLI(args"performance --unparse -N 20 -t 3 -s $schema -r e3 $input") {
cli =>
cli.expect("total unparse time (sec):")
@@ -157,7 +156,7 @@ class TestCLIPerformance {
@Test def test_3644_CLI_Performance_Unparse_5_Threads_50_Times(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
runCLI(args"performance --unparse -N 50 -t 5 -s $schema -r e3 $input") {
cli =>
cli.expect("total unparse time (sec):")
@@ -167,7 +166,7 @@ class TestCLIPerformance {
@Test def test_3642_CLI_Performance_Unparse_2_Threads_2_Times_Negative():
Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt")
runCLI(args"performance --unparse -N 2 -t 2 -s $schema $input") { cli =>
cli.expect("total unparse time (sec):")
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLISaveParser.scala
similarity index 91%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLISaveParser.scala
index 5e1a33f3e..d7d57c3c3 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLISaveParser.scala
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.daffodil.saving
+package org.apache.daffodil.cliTest
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -65,8 +64,8 @@ class TestCLISaveParser {
}
@Test def test_3020_CLI_Saving_SaveParser_namespaceUsed(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
withTempFile { parser =>
runCLI(args"save-parser -s $schema -r {target}matrix $parser") { cli =>
@@ -94,7 +93,7 @@ class TestCLISaveParser {
@Test def test_3022_CLI_Saving_SaveParser_MultSchema(): Unit = {
val schema1 =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val schema2 =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val schema2 =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
withTempFile { parser =>
runCLI(args"save-parser -s $schema1 -s $schema2 $parser") { cli =>
@@ -143,8 +142,8 @@ class TestCLISaveParser {
}
@Test def test_DFDL_1205_CLI_FullValidation_SavedParser_Incompatible(): Unit
= {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
withTempFile { parser =>
runCLI(args"save-parser -s $schema -r {target}matrix $parser") { cli =>
@@ -178,7 +177,7 @@ class TestCLISaveParser {
}
@Test def test_3063_CLI_Saving_SaveParser_validate(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
withTempFile { parser =>
runCLI(args"save-parser --validate on -s $schema -r validation_check
$parser") { cli =>
@@ -226,7 +225,7 @@ class TestCLISaveParser {
@Test def test_3572_CLI_Saving_SaveParser_unparse(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt.xml")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt.xml")
withTempFile { parser =>
runCLI(args"-t save-parser -s $schema -r matrix $parser") { cli =>
@@ -240,7 +239,7 @@ class TestCLISaveParser {
@Test def test_3573_CLI_Saving_SaveParser_unparse2(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
withTempFile { parser =>
runCLI(args"save-parser -s $schema -r e1 $parser") { cli =>
@@ -254,7 +253,7 @@ class TestCLISaveParser {
@Test def test_3941_CLI_Saving_SaveParser_tunables(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
withTempFile { parser =>
runCLI(args"save-parser -s $schema -r e1 -T parseUnparsePolicy=parseOnly
$parser") { cli =>
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLITunables.scala
similarity index 79%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLITunables.scala
index 47076d7c3..33a713497 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLITunables.scala
@@ -15,17 +15,16 @@
* limitations under the License.
*/
-package org.apache.daffodil.tunables
+package org.apache.daffodil.cliTest
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
class TestCLITunables {
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_01():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_01
-TunqualifiedPathStepPolicy=noNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -36,7 +35,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_02():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_02
-TunqualifiedPathStepPolicy=noNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -45,7 +44,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_03():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_03
-TunqualifiedPathStepPolicy=noNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -54,7 +53,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_04():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_04
-TunqualifiedPathStepPolicy=noNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -65,7 +64,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_01(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_01
-TunqualifiedPathStepPolicy=defaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -76,7 +75,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_02(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_02
-TunqualifiedPathStepPolicy=defaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -87,7 +86,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_03(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_03
-TunqualifiedPathStepPolicy=defaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -96,7 +95,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_04(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_04
-TunqualifiedPathStepPolicy=defaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -105,7 +104,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_01():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_01
-TunqualifiedPathStepPolicy=preferDefaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -116,7 +115,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_02():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_02
-TunqualifiedPathStepPolicy=preferDefaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -127,7 +126,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_03():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_03
-TunqualifiedPathStepPolicy=preferDefaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -136,7 +135,7 @@ class TestCLITunables {
}
@Test def
test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_04():
Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
runCLI(args"parse -s $schema -r test_04
-TunqualifiedPathStepPolicy=preferDefaultNamespace") { cli =>
cli.send("12", inputDone = true)
@@ -150,7 +149,7 @@ class TestCLITunables {
* Suppresses SDW messages.
*/
@Test def test_CLI_Parsing_SuppressSDEWarnings1(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
runCLI(args"parse -s $schema -TsuppressSchemaDefinitionWarnings=all") {
cli =>
cli.send("a,b", inputDone = true)
@@ -163,7 +162,7 @@ class TestCLITunables {
* Will display SDW warnings. Does not set the tunable that suppresses them.
*/
@Test def test_CLI_Parsing_SuppressSDEWarnings2(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
runCLI(args"parse -s $schema") { cli =>
cli.send("a,b", inputDone = true)
@@ -182,7 +181,7 @@ class TestCLITunables {
* isn't displayed on a reload of a compiled processor
*/
@Test def test_CLI_Parsing_ReloadingDoesNotRepeatWarnings(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
withTempFile { parser =>
runCLI(args"save-parser -s $schema $parser") { cli =>
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIUnparsing.scala
similarity index 84%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIUnparsing.scala
index 0f31e88e2..e2fd7d4e9 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLIUnparsing.scala
@@ -15,15 +15,12 @@
* limitations under the License.
*/
-package org.apache.daffodil.unparsing
+package org.apache.daffodil.cliTest
import java.nio.charset.StandardCharsets.UTF_8
-
import org.apache.commons.io.FileUtils
-
import org.junit.Assert._
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -31,7 +28,7 @@ class TestCLIunparsing {
@Test def test_3525_CLI_Unparsing_SimpleUnparse_inFile(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
runCLI(args"unparse -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -40,7 +37,7 @@ class TestCLIunparsing {
@Test def test_3526_CLI_Unparsing_SimpleUnparse_inFile2(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
runCLI(args"unparse -s $schema --root e3 $input") { cli =>
cli.expect("[1,2]")
@@ -49,7 +46,7 @@ class TestCLIunparsing {
@Test def test_3527_CLI_Unparsing_SimpleUnparse_stdin(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
runCLI(args"unparse -s $schema --root e3") { cli =>
cli.sendFile(input, inputDone = true)
@@ -89,7 +86,7 @@ class TestCLIunparsing {
@Test def test_3574_CLI_Unparsing_SimpleUnparse_extVars(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val config =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt")
runCLI(args"unparse -s $schema -r row -D{http://example.com}var1=99 -c
$config $input") { cli =>
cli.expect("0")
@@ -99,7 +96,7 @@ class TestCLIunparsing {
@Test def test_3575_CLI_Unparsing_SimpleUnparse_extVars2(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val config =
path("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt")
runCLI(args"unparse -s $schema -r row -c $config $input") { cli =>
cli.expect("0")
@@ -108,7 +105,7 @@ class TestCLIunparsing {
@Test def test_3582_CLI_Unparsing_SimpleUnparse_outFile(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
withTempFile { output =>
runCLI(args"unparse -s $schema -r e3 -o $output $input") { cli =>
@@ -121,7 +118,7 @@ class TestCLIunparsing {
@Test def test_3581_CLI_Unparsing_SimpleUnparse_stOutDash(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
runCLI(args"unparse -s $schema -r e3 -o - $input") { cli =>
cli.expect("[1,2]")
@@ -169,7 +166,7 @@ class TestCLIunparsing {
// DAFFODIL-1346
/*@Test*/ def test_3576_CLI_Unparsing_validate(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
runCLI(args"unparse -s $schema -r validation_check --validate on") { cli =>
cli.sendLine("""<ex:validation_check
xmlns:ex="http://example.com";>test</ex:validation_check>""", inputDone = true)
@@ -217,7 +214,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_w3cdom(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse -I w3cdom -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -226,7 +223,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_jdom(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse -I jdom -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -235,7 +232,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_scala_xml(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse -I scala-xml -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -244,7 +241,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_json(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.json")
runCLI(args"unparse -I json -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -253,7 +250,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_w3cdom_stream(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse --stream -I w3cdom -s $schema --root e1 $input") { cli
=>
cli.expect("Hello")
@@ -262,7 +259,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_jdom_stream(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse --stream -I jdom -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -271,7 +268,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_scala_xml_stream(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse --stream -I scala-xml -s $schema --root e1 $input") {
cli =>
cli.expect("Hello")
@@ -280,7 +277,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_json_stream(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.json")
runCLI(args"unparse --stream -I json -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -289,7 +286,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_sax(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse -I sax -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -298,7 +295,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_exi(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exi")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exi")
runCLI(args"unparse -I exi -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -307,7 +304,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_exisa(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exisa")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exisa")
runCLI(args"unparse -I exisa -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -316,7 +313,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_null(): Unit = {
val schema =
path("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
runCLI(args"unparse -I null -s $schema --root e1 $input") { cli =>
cli.expect("Hello")
@@ -324,8 +321,8 @@ class TestCLIunparsing {
}
@Test def test_XXX_CLI_Unparsing_Stream_01(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input19.txt")
runCLI(args"unparse --stream -s $schema $input") { cli =>
cli.expect("123")
@@ -333,8 +330,8 @@ class TestCLIunparsing {
}
@Test def test_XXX_CLI_Unparsing_Stream_sax(): Unit = {
- val schema =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt")
+ val schema =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input19.txt")
runCLI(args"unparse -I sax --stream -s $schema $input") { cli =>
cli.expect("123")
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/tdml/TestCLItdml.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLItdml.scala
similarity index 92%
rename from daffodil-cli/src/it/scala/org/apache/daffodil/tdml/TestCLItdml.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLItdml.scala
index 75a442036..a2c42ea0c 100644
--- a/daffodil-cli/src/it/scala/org/apache/daffodil/tdml/TestCLItdml.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestCLItdml.scala
@@ -15,10 +15,9 @@
* limitations under the License.
*/
-package org.apache.daffodil.tdml
+package org.apache.daffodil.cliTest
import org.junit.Test
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
@@ -95,7 +94,7 @@ class TestCLItdml {
}
@Test def test_CLI_catch_TestNotCompatible(): Unit = {
- val tdml =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml")
+ val tdml =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml")
runCLI(args"test -iii $tdml testNotCompatibleImplementation1") { cli =>
cli.expect("[Skipped] testNotCompatibleImplementation1 (not compatible
with implementation: daffodil)")
@@ -103,7 +102,7 @@ class TestCLItdml {
}
@Test def test_CLI_catch_TestBadArguments(): Unit = {
- val tdml =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml")
+ val tdml =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml")
runCLI(args"test -I notDaffodilC $tdml") { cli =>
cli.expectErr("[error] Bad arguments for option 'implementation'")
@@ -111,7 +110,7 @@ class TestCLItdml {
}
@Test def test_CLI_Tdml_implementation(): Unit = {
- val tdml =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml")
+ val tdml =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/testNonCompatibleImplementation.tdml")
runCLI(args"test -I daffodilC $tdml testDaffodilCImplementation1") { cli =>
cli.expect("[Pass] testDaffodilCImplementation1")
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/exi/TestEXIEncodeDecode.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestEXIEncodeDecode.scala
similarity index 99%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/exi/TestEXIEncodeDecode.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestEXIEncodeDecode.scala
index f60c70e69..e0b0c2147 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/exi/TestEXIEncodeDecode.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestEXIEncodeDecode.scala
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.daffodil.saving
+package org.apache.daffodil.cliTest
import org.junit.Test
+
import scala.xml.XML
import java.nio.file.Paths
-
import org.apache.daffodil.CLI.Util._
import org.apache.daffodil.Main.ExitCode
import org.apache.daffodil.xml.XMLUtils
diff --git
a/daffodil-cli/src/test/scala/org/apache/daffodil/TestValidatorPatterns.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestValidatorPatterns.scala
similarity index 95%
rename from
daffodil-cli/src/test/scala/org/apache/daffodil/TestValidatorPatterns.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestValidatorPatterns.scala
index e4d202f7f..e0318c017 100644
---
a/daffodil-cli/src/test/scala/org/apache/daffodil/TestValidatorPatterns.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/TestValidatorPatterns.scala
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.daffodil
+package org.apache.daffodil.cliTest
+import org.apache.daffodil.ValidatorPatterns
import org.junit.Test
import org.junit.Assert.assertEquals
import org.junit.Assert.fail
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestEmbedded.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestEmbedded.scala
similarity index 99%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestEmbedded.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestEmbedded.scala
index c2bd6ee9b..5ae544002 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestEmbedded.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestEmbedded.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.daffodil.schematron
+package org.apache.daffodil.cliTest.schematron
import java.util.UUID
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestSvrlOutput.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestSvrlOutput.scala
similarity index 93%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestSvrlOutput.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestSvrlOutput.scala
index d68e1bb38..6b25d98e4 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestSvrlOutput.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestSvrlOutput.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.daffodil.schematron
+package org.apache.daffodil.cliTest.schematron
import java.nio.file.Files
import java.nio.file.Path
@@ -42,7 +42,7 @@ class TestSvrlOutput {
@Test def validationSuccess(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
val schematron =
path("daffodil-schematron/src/test/resources/sch/never-fails.sch")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
withTempFile(".conf", { conf =>
withTempFile { svrl =>
@@ -72,7 +72,7 @@ class TestSvrlOutput {
@Test def validationFailure(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
val schematron =
path("daffodil-schematron/src/test/resources/sch/always-fails.sch")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
withTempFile(".conf", { conf =>
withTempFile { svrl =>
@@ -121,7 +121,7 @@ class TestSvrlOutput {
@Test def outputPathFailure(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
val schematron =
path("daffodil-schematron/src/test/resources/sch/never-fails.sch")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
val svrl = path("thisisnotavalidlocation/schematron.svrl")
withTempFile(".conf", { conf =>
@@ -138,7 +138,7 @@ class TestSvrlOutput {
@Test def overwriteExistingFile(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
val schematron =
path("daffodil-schematron/src/test/resources/sch/never-fails.sch")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
withTempFile(".conf", { conf =>
withTempFile { svrl =>
diff --git
a/daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestValidating.scala
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestValidating.scala
similarity index 87%
rename from
daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestValidating.scala
rename to
daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestValidating.scala
index 4119eef0e..4a9657a31 100644
---
a/daffodil-cli/src/it/scala/org/apache/daffodil/schematron/TestValidating.scala
+++
b/daffodil-cli/src/test/scala/org/apache/daffodil/cliTest/schematron/TestValidating.scala
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.daffodil.schematron
+package org.apache.daffodil.cliTest.schematron
import org.junit.Test
@@ -27,7 +27,7 @@ class TestValidating {
// always fails sch, but no validate flag so it should pass
@Test def nonShouldPass(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
runCLI(args"parse -s $schema $input") { cli =>
cli.expect("<never-fails>2f6481e6-542c-11eb-ae93-0242ac130002</never-fails>")
@@ -38,7 +38,7 @@ class TestValidating {
@Test def failShouldFail(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
val schematron =
path("daffodil-schematron/src/test/resources/sch/always-fails.sch")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
runCLI(args"""parse --validate
schematron="${jsonEscape(schematron.toString)}" -s $schema $input""") { cli =>
cli.expect("<never-fails>2f6481e6-542c-11eb-ae93-0242ac130002</never-fails>")
@@ -50,7 +50,7 @@ class TestValidating {
@Test def passShouldPass(): Unit = {
val schema =
path("daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd")
val schematron =
path("daffodil-schematron/src/test/resources/sch/never-fails.sch")
- val input =
path("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt")
+ val input =
path("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt")
runCLI(args"""parse --validate
schematron="${jsonEscape(schematron.toString)}" -s $schema $input""") { cli =>
cli.expect("<never-fails>2f6481e6-542c-11eb-ae93-0242ac130002</never-fails>")
diff --git a/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
b/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
index 720fc7a62..5797659d5 100644
--- a/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:sch="http://purl.oclc.org/dsdl/schematron";
sch:queryBinding="xslt2">
- <!-- modified from
daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd -->
+ <!-- modified from
daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
-->
<xs:include
schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
diff --git a/project/Rat.scala b/project/Rat.scala
index 4d2e05601..b09a63a9b 100644
--- a/project/Rat.scala
+++ b/project/Rat.scala
@@ -39,34 +39,34 @@ object Rat {
file("daffodil-runtime2/src/test/c/examples"),
// test files that cannot include the Apache license without breaking tests
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exi"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.exisa"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.json"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exi"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.exisa"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input19.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/inputBig1M.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/prefix.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt"),
-
file("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/uuid.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input10.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exi"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.exisa"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.json"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exi"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.exisa"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input19.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/inputBig1M.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/prefix.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt"),
+
file("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/uuid.txt"),
file("daffodil-io/src/test/resources/iso8859.doc.dat"),
file("daffodil-japi/src/test/resources/test/japi/01very_simple.txt"),
file("daffodil-japi/src/test/resources/test/japi/myData.dat"),
