You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2018/03/05 16:18:07 UTC
[incubator-daffodil] branch master updated: Move CLI tests to sbt
integration
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-daffodil.git
The following commit(s) were added to refs/heads/master by this push:
new 4e23af5 Move CLI tests to sbt integration
4e23af5 is described below
commit 4e23af5c2a2033967e2ea3fc662ffd567473a489
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Wed Feb 28 11:28:09 2018 -0500
Move CLI tests to sbt integration
Move CLI tests to src/it/ rather than being part of src/test. This means
that we can reenable aggregation of the daffodil-cli subproject without
fear of 'sbt test' running the CLI tests and extending the test cycle.
With aggregation reenabled, this also means that we no longer need to
run commands explicitly in the daffodil-cli project (i.e. things like
'sbt compile' or 'sbt clean' will compile/clean all subprojects,
including daffodil-cli), simplifying build process and preventing some
bugs in sbt from cropping up.
To run cli tests, use 'sbt it:test'.
To debug cli tests, use 'sbt debugIt:test'.
DAFFODIL-1911
---
.travis.yml | 4 +-
README.md | 4 +-
build.sbt | 43 ++++++------
daffodil-cli/build.sbt | 8 +--
daffodil-cli/src/{test/resources => it/java}/.keep | 0
daffodil-cli/src/{test/java => it/resources}/.keep | 0
.../apache/daffodil/CLI/ABC_IBM_invalid.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
.../org/apache/daffodil/CLI/debugger/1326 | 0
.../org/apache/daffodil/CLI/debugger/1328 | 0
.../org/apache/daffodil/CLI/debugger/1329 | 0
.../org/apache/daffodil/CLI/debugger/1330 | 0
.../org/apache/daffodil/CLI/debugger/1331 | 0
.../org/apache/daffodil/CLI/debugger/1333 | 0
.../org/apache/daffodil/CLI/debugger/1334 | 0
.../org/apache/daffodil/CLI/debugger/1337 | 0
.../org/apache/daffodil/CLI/debugger/1338 | 0
.../org/apache/daffodil/CLI/debugger/1339 | 0
.../org/apache/daffodil/CLI/debugger/1340 | 0
.../org/apache/daffodil/CLI/debugger/1382 | 0
.../org/apache/daffodil/CLI/debugger/1591 | 0
.../org/apache/daffodil/CLI/debugger/1602 | 0
.../org/apache/daffodil/CLI/debugger/1863 | 0
.../resources/org/apache/daffodil/CLI/debugger/982 | 0
.../apache/daffodil/CLI/global_element.dfdl.xsd | 0
.../daffodil/CLI/global_element_import.dfdl.xsd | 0
.../org/apache/daffodil/CLI/infoTest.tdml | 0
.../org/apache/daffodil/CLI/input/hextest.txt | Bin
.../org/apache/daffodil/CLI/input/input1.txt | 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.txt | 0
.../org/apache/daffodil/CLI/input/input15.txt | 0
.../org/apache/daffodil/CLI/input/input16.txt | 0
.../org/apache/daffodil/CLI/input/input18.txt | 0
.../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/inputBig1M.txt | 0
.../apache/daffodil/CLI/input/test_DFDL-714.txt | 0
.../org/apache/daffodil/CLI/output/output1.txt | 0
.../org/apache/daffodil/CLI/output/output10.txt | 0
.../org/apache/daffodil/CLI/output/output11.txt | 0
.../org/apache/daffodil/CLI/output/output12.txt | 0
.../org/apache/daffodil/CLI/output/output13.txt | 0
.../org/apache/daffodil/CLI/output/output14.txt | 0
.../org/apache/daffodil/CLI/output/output15.txt | 0
.../org/apache/daffodil/CLI/output/output16.txt | 0
.../daffodil/CLI/output/output1_nopretty.txt | 0
.../org/apache/daffodil/CLI/output/output2.txt | 0
.../org/apache/daffodil/CLI/output/output3.txt | 0
.../org/apache/daffodil/CLI/output/output4.txt | 0
.../org/apache/daffodil/CLI/output/output5.txt | 0
.../org/apache/daffodil/CLI/output/output6.txt | 0
.../org/apache/daffodil/CLI/output/output8.txt | 0
.../org/apache/daffodil/CLI/output/output9.txt | 0
.../apache/daffodil/CLI/output/output_DFDL-714.txt | 0
.../CLI/output/unqualified_path_step_01.txt | 0
.../CLI/output/unqualified_path_step_02.txt | 0
.../CLI/output/unqualified_path_step_03.txt | 0
.../CLI/output/unqualified_path_step_04.txt | 0
.../apache/daffodil/CLI/suppressWarnTest.dfdl.xsd | 0
.../daffodil/CLI/unqualified_path_step.dfdl.xsd | 0
.../resources/test/cli/fixedLength.dfdl.xsd | 0
.../resources/test/cli/unboundedBinary.dfdl.xsd | 0
.../scala/org/apache/daffodil/CLI/Util.scala | 8 +--
.../apache/daffodil/debugger/TestCLIDebugger.scala | 72 ++++++++++-----------
.../daffodil/executing/TestCLIexecuting.scala | 0
.../apache/daffodil/listing/TestCLIListing.scala | 0
.../apache/daffodil/parsing/TestCLIParsing.scala | 32 ++++-----
.../daffodil/performance/TestCLIPerformance.scala | 18 +++---
.../apache/daffodil/saving/TestCLISaveParser.scala | 26 ++++----
.../apache/daffodil/tunables/TestCLITunables.scala | 24 +++----
.../daffodil/tunables/TestCLITunables2.scala | 4 +-
.../daffodil/unparsing/TestCLIUnparsing.scala | 18 +++---
eclipse-projects/cli-test/.classpath | 2 +
eclipse-projects/cli-test/.project | 5 ++
project/Dependencies.scala | 8 +--
90 files changed, 145 insertions(+), 131 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e840a71..20c86cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,10 +29,10 @@ script:
- sbt -J-Xms4g -J-Xmx4g ++$TRAVIS_SCALA_VERSION
compile
test:compile
+ it:compile
debug:compile
- daffodil-cli/compile
test
- daffodil-cli/test
+ it:test
daffodil-cli/universal:packageBin
daffodil-cli/universal:packageZipTarball
daffodil-cli/rpm:packageBin
diff --git a/README.md b/README.md
index 789fbc7..5469fc0 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ To run all Daffodil tests:
```bash
# run all unit tests
$ sbt test
-# run all command line tests
-$ sbt daffodil-cli/test
+# run all integration tests
+$ sbt it:test
```
To build the Daffodil command line interface:
diff --git a/build.sbt b/build.sbt
index f61db54..a05b3d2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -20,69 +20,70 @@ lazy val genProps = taskKey[Seq[File]]("Generate properties scala source")
lazy val genSchemas = taskKey[Seq[File]]("Generated DFDL schemas")
lazy val TestDebug = config("debug") extend(Test)
+lazy val IntegrationTestDebug = config("debugIt") extend(Test)
-lazy val daffodil = Project("daffodil", file(".")).configs(TestDebug)
- .aggregate(macroLib, propgen, lib, io, runtime1, runtime1Unparser, core, japi, sapi, tdml, test, testIBM1, tutorials, testStdLayout)
+lazy val daffodil = Project("daffodil", file(".")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
+ .aggregate(macroLib, propgen, lib, io, runtime1, runtime1Unparser, core, japi, sapi, tdml, cli, test, testIBM1, tutorials, testStdLayout)
.settings(commonSettings, nopublish)
-lazy val macroLib = Project("daffodil-macro-lib", file("daffodil-macro-lib")).configs(TestDebug)
+lazy val macroLib = Project("daffodil-macro-lib", file("daffodil-macro-lib")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.settings(commonSettings, nopublish)
.settings(libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value)
-lazy val propgen = Project("daffodil-propgen", file("daffodil-propgen")).configs(TestDebug)
+lazy val propgen = Project("daffodil-propgen", file("daffodil-propgen")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.settings(commonSettings, nopublish)
-lazy val lib = Project("daffodil-lib", file("daffodil-lib")).configs(TestDebug)
+lazy val lib = Project("daffodil-lib", file("daffodil-lib")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(macroLib % "compile-internal, test-internal")
.settings(commonSettings, libManagedSettings, usesMacros)
-lazy val io = Project("daffodil-io", file("daffodil-io")).configs(TestDebug)
+lazy val io = Project("daffodil-io", file("daffodil-io")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(lib, macroLib % "compile-internal, test-internal")
.settings(commonSettings, usesMacros)
-lazy val runtime1 = Project("daffodil-runtime1", file("daffodil-runtime1")).configs(TestDebug)
+lazy val runtime1 = Project("daffodil-runtime1", file("daffodil-runtime1")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(io, lib % "test->test")
.settings(commonSettings)
-lazy val runtime1Unparser = Project("daffodil-runtime1-unparser", file("daffodil-runtime1-unparser")).configs(TestDebug)
+lazy val runtime1Unparser = Project("daffodil-runtime1-unparser", file("daffodil-runtime1-unparser")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(runtime1, lib % "test->test", runtime1 % "test->test")
.settings(commonSettings)
-lazy val core = Project("daffodil-core", file("daffodil-core")).configs(TestDebug)
+lazy val core = Project("daffodil-core", file("daffodil-core")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(runtime1Unparser, lib % "test->test", runtime1 % "test->test")
.settings(commonSettings)
-lazy val japi = Project("daffodil-japi", file("daffodil-japi")).configs(TestDebug)
+lazy val japi = Project("daffodil-japi", file("daffodil-japi")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(core)
.settings(commonSettings)
-lazy val sapi = Project("daffodil-sapi", file("daffodil-sapi")).configs(TestDebug)
+lazy val sapi = Project("daffodil-sapi", file("daffodil-sapi")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(core)
.settings(commonSettings)
-lazy val tdml = Project("daffodil-tdml", file("daffodil-tdml")).configs(TestDebug)
+lazy val tdml = Project("daffodil-tdml", file("daffodil-tdml")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(core, core % "test->test")
.settings(commonSettings)
-lazy val cli = Project("daffodil-cli", file("daffodil-cli")).configs(TestDebug)
+lazy val cli = Project("daffodil-cli", file("daffodil-cli")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(tdml, sapi, japi) // causes sapi/japi to be pulled in to the helper zip/tar
.settings(commonSettings, nopublish)
.settings(libraryDependencies ++= Dependencies.cli)
-lazy val test = Project("daffodil-test", file("daffodil-test")).configs(TestDebug)
+lazy val test = Project("daffodil-test", file("daffodil-test")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(tdml, core % "test->test")
.settings(commonSettings, nopublish)
-lazy val testIBM1 = Project("daffodil-test-ibm1", file("daffodil-test-ibm1")).configs(TestDebug)
+lazy val testIBM1 = Project("daffodil-test-ibm1", file("daffodil-test-ibm1")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(tdml)
.settings(commonSettings, nopublish)
-lazy val tutorials = Project("daffodil-tutorials", file("tutorials")).configs(TestDebug)
+lazy val tutorials = Project("daffodil-tutorials", file("tutorials")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(tdml)
.settings(commonSettings, nopublish)
-lazy val testStdLayout = Project("daffodil-test-stdLayout", file("test-stdLayout")).configs(TestDebug)
+lazy val testStdLayout = Project("daffodil-test-stdLayout", file("test-stdLayout")).configs(IntegrationTest, TestDebug, IntegrationTestDebug)
.dependsOn(tdml)
.settings(commonSettings, nopublish)
@@ -138,7 +139,7 @@ lazy val commonSettings = Seq(
sourceManaged := baseDirectory.value / "src_managed",
resourceManaged := baseDirectory.value / "resource_managed",
libraryDependencies ++= Dependencies.common,
-) ++ debugTestSettings
+) ++ Defaults.itSettings ++ debugTestSettings ++ debugIntegrationTestSettings
lazy val debugTestSettings = inConfig(TestDebug)(Defaults.testSettings ++ Seq(
sourceDirectory := baseDirectory.value / "src" / "test",
@@ -146,6 +147,12 @@ lazy val debugTestSettings = inConfig(TestDebug)(Defaults.testSettings ++ Seq(
exportJars := false,
))
+lazy val debugIntegrationTestSettings = inConfig(IntegrationTestDebug)(Defaults.itSettings ++ Seq(
+ sourceDirectory := baseDirectory.value / "src" / "it",
+ scalaSource := sourceDirectory.value / "scala-debug",
+ exportJars := false,
+))
+
lazy val nopublish = Seq(
publish := {},
publishLocal := {},
diff --git a/daffodil-cli/build.sbt b/daffodil-cli/build.sbt
index 0894451..94870b0 100644
--- a/daffodil-cli/build.sbt
+++ b/daffodil-cli/build.sbt
@@ -18,10 +18,10 @@
enablePlugins(JavaAppPackaging)
enablePlugins(RpmPlugin)
-// need 'sbt stage' to build the CLI for cli tests
-(test in Test) := (test in Test).dependsOn(stage in Compile).value
-(testOnly in Test) := (testOnly in Test).dependsOn(stage in Compile).evaluated
-(testQuick in Test) := (testQuick in Test).dependsOn(stage in Compile).evaluated
+// need 'sbt stage' to build the CLI for cli integration tests
+(test in IntegrationTest) := (test in IntegrationTest).dependsOn(stage in Compile).value
+(testOnly in IntegrationTest) := (testOnly in IntegrationTest).dependsOn(stage in Compile).evaluated
+(testQuick in IntegrationTest) := (testQuick in IntegrationTest).dependsOn(stage in Compile).evaluated
executableScriptName := "daffodil"
diff --git a/daffodil-cli/src/test/resources/.keep b/daffodil-cli/src/it/java/.keep
similarity index 100%
rename from daffodil-cli/src/test/resources/.keep
rename to daffodil-cli/src/it/java/.keep
diff --git a/daffodil-cli/src/test/java/.keep b/daffodil-cli/src/it/resources/.keep
similarity index 100%
rename from daffodil-cli/src/test/java/.keep
rename to daffodil-cli/src/it/resources/.keep
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_02.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/complex_types.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1326 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1326
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1326
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1326
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1328 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1328
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1328
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1328
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1329 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1329
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1329
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1329
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1330 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1330
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1330
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1330
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1331 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1331
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1331
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1331
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1333 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1333
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1333
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1333
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1334 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1334
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1334
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1334
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1337 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1337
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1337
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1337
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1338 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1338
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1338
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1338
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1339 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1339
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1339
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1339
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1340 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1340
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1340
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1340
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1382 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1382
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1382
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1382
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1591 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1591
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1591
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1591
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1602 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1602
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1602
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1602
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1863 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1863
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/1863
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/1863
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/982 b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/982
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/debugger/982
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/debugger/982
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element_import.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/infoTest.tdml b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/infoTest.tdml
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/infoTest.tdml
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/infoTest.tdml
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input10.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input10.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input10.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/inputBig1M.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/inputBig1M.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output1.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output1.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output10.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output10.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output10.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output10.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output11.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output11.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output11.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output11.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output12.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output12.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output12.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output12.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output13.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output13.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output13.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output13.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output14.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output14.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output14.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output14.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output15.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output15.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output15.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output15.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output16.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output16.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output16.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output16.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output1_nopretty.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1_nopretty.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output1_nopretty.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1_nopretty.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output2.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output2.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output2.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output2.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output3.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output3.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output3.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output3.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output4.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output4.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output4.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output4.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output5.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output5.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output5.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output5.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output6.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output6.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output6.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output6.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output8.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output8.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output8.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output8.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output9.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output9.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output9.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output9.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output_DFDL-714.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output_DFDL-714.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output_DFDL-714.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output_DFDL-714.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_01.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_01.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_01.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_01.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_02.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_02.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_02.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_02.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_03.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_03.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_03.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_03.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_04.txt b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_04.txt
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/unqualified_path_step_04.txt
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/unqualified_path_step_04.txt
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd b/daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
rename to daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd b/daffodil-cli/src/it/resources/test/cli/fixedLength.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
rename to daffodil-cli/src/it/resources/test/cli/fixedLength.dfdl.xsd
diff --git a/daffodil-cli/src/test/resources/test/cli/unboundedBinary.dfdl.xsd b/daffodil-cli/src/it/resources/test/cli/unboundedBinary.dfdl.xsd
similarity index 100%
rename from daffodil-cli/src/test/resources/test/cli/unboundedBinary.dfdl.xsd
rename to daffodil-cli/src/it/resources/test/cli/unboundedBinary.dfdl.xsd
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/CLI/Util.scala
similarity index 95%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/CLI/Util.scala
index 794520e..6dc397a 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/CLI/Util.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/CLI/Util.scala
@@ -17,7 +17,7 @@
package org.apache.daffodil.CLI
-import org.apache.daffodil.util._
+import org.apache.daffodil.util.Misc
import net.sf.expectit.ExpectBuilder
import net.sf.expectit.Expect
import net.sf.expectit.filter.Filters.replaceInString
@@ -28,7 +28,7 @@ import org.apache.daffodil.xml.XMLUtils
object Util {
- //val testDir = "daffodil-cli/src/test/resources/org/apache/daffodil/CLI/"
+ //val testDir = "daffodil-cli/src/it/resources/org/apache/daffodil/CLI/"
val testDir = "/org/apache/daffodil/CLI/"
val outputDir = testDir + "output/"
@@ -44,8 +44,8 @@ object Util {
def getExpectedString(filename: String, convertToDos: Boolean = false): String = {
val rsrc = Misc.getRequiredResource(outputDir + filename)
- //val source = scala.io.Source.fromFile(outputDir + filename)
- val source = scala.io.Source.fromFile(rsrc)
+ val is = rsrc.toURL.openStream()
+ val source = scala.io.Source.fromInputStream(is)
val lines = source.mkString.trim()
source.close()
fileConvert(lines)
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
similarity index 90%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
index 42874e4..3e82a91 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/debugger/TestCLIDebugger.scala
@@ -34,7 +34,7 @@ class TestCLIdebugger {
@Test def test_3385_CLI_Debugger_invalidExpressions() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -73,7 +73,7 @@ class TestCLIdebugger {
@Test def test_3263_CLI_Debugger_occursBounds() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -98,7 +98,7 @@ class TestCLIdebugger {
@Test def test_3266_CLI_Debugger_occursBounds_shortForm() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -125,7 +125,7 @@ class TestCLIdebugger {
@Test def test_1591_CLI_Debugger_invalidCommandError() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -144,7 +144,7 @@ class TestCLIdebugger {
@Test def test_1336_CLI_Debugger_occursBounds() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -175,7 +175,7 @@ class TestCLIdebugger {
@Test def test_3398_CLI_Debugger_occursBounds_2() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input11.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input11.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -211,7 +211,7 @@ class TestCLIdebugger {
@Test def test_1335_CLI_Debugger_dataAndWrapLength() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -245,7 +245,7 @@ class TestCLIdebugger {
@Test def test_982_CLI_Debugger_simpleDebugger() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -263,7 +263,7 @@ class TestCLIdebugger {
@Test def test_1326_CLI_Debugger_displaysTesting() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -305,8 +305,8 @@ class TestCLIdebugger {
}
@Test def test_1339_CLI_Debugger_removeHidden() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -328,8 +328,8 @@ class TestCLIdebugger {
}
@Test def test_3268_CLI_Debugger_removeHidden2() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -355,7 +355,7 @@ class TestCLIdebugger {
@Test def test_1331_CLI_Debugger_breakpointTesting4() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -411,7 +411,7 @@ class TestCLIdebugger {
@Test def test_1463_CLI_Debugger_breakOnValueOfElement() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -456,8 +456,8 @@ class TestCLIdebugger {
}
@Test def test_1338_CLI_Debugger_discriminatorInfo() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -487,7 +487,7 @@ class TestCLIdebugger {
@Test def test_1328_CLI_Debugger_breakpointTesting() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -528,7 +528,7 @@ class TestCLIdebugger {
@Test def test_1329_CLI_Debugger_breakpointTesting2() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -564,7 +564,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_SDE_message() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -589,7 +589,7 @@ class TestCLIdebugger {
@Test def test_1330_CLI_Debugger_breakpointTesting3() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -631,7 +631,7 @@ class TestCLIdebugger {
@Test def test_1333_CLI_Debugger_settingInfosetLines() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input3.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input3.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -674,7 +674,7 @@ class TestCLIdebugger {
@Test def test_1334_CLI_Debugger_infoBitPosition() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -706,7 +706,7 @@ class TestCLIdebugger {
@Test def test_1337_CLI_Debugger_childIndex() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input4.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input4.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -739,7 +739,7 @@ class TestCLIdebugger {
@Test def test_1340_CLI_Debugger_infoPath() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val output1 = Util.getExpectedString("output1.txt")
@@ -768,7 +768,7 @@ class TestCLIdebugger {
@Test def test_1382_CLI_Debugger_dataAndWrapLength2() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -810,8 +810,8 @@ class TestCLIdebugger {
}
@Test def test_1863_CLI_Debugger_groupIndex01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -843,8 +843,8 @@ class TestCLIdebugger {
}
@Test def test_1029_CLI_Debugger_validation1() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input9.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input9.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -868,7 +868,7 @@ class TestCLIdebugger {
@Test def test_3258_CLI_Debugger_infodata() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -900,7 +900,7 @@ class TestCLIdebugger {
@Test def test_3264_CLI_Debugger_undefined_command() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -925,7 +925,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_delimiterStack() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input2.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input2.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -964,7 +964,7 @@ class TestCLIdebugger {
@Test def test_CLI_Debugger_utf16_encoding() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/hextest.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/hextest.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -985,7 +985,7 @@ class TestCLIdebugger {
@Test def test_1337_CLI_Debugger_info_infoset() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
@@ -1011,7 +1011,7 @@ class TestCLIdebugger {
/* See DFDL-1264
@Test def test_3585_CLI_Debugger_simpleDebugger_unparse() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = if (Util.isWindows) Util.start("", envp = DAFFODIL_JAVA_OPTS) else Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/executing/TestCLIexecuting.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
similarity index 100%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/executing/TestCLIexecuting.scala
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/listing/TestCLIListing.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/listing/TestCLIListing.scala
similarity index 100%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/listing/TestCLIListing.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/listing/TestCLIListing.scala
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
similarity index 95%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
index ad798e0..1b91b78 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/parsing/TestCLIParsing.scala
@@ -342,7 +342,7 @@ class TestCLIparsing {
@Test def test_979_CLI_Parsing_SimpleParse_inFile() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -360,7 +360,7 @@ class TestCLIparsing {
@Test def test_980_CLI_Parsing_SimpleParse_stOutDash() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -552,7 +552,7 @@ class TestCLIparsing {
@Test def test_1003_CLI_Parsing_SimpleParse_emptyNamespace() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -569,8 +569,8 @@ class TestCLIparsing {
}
@Test def test_1004_CLI_Parsing_SimpleParse_namespaceUsed() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -587,8 +587,8 @@ class TestCLIparsing {
}
@Test def test_2615_CLI_Parsing_SimpleParse_namespaceUsedLongOpt() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -629,7 +629,7 @@ class TestCLIparsing {
@Test def test_1015_CLI_Parsing_SimpleParse_defaultRootMultSchema() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -744,7 +744,7 @@ class TestCLIparsing {
*/
@Test def test_1319_CLI_Parsing_invalidElementSDE() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/ABC_IBM_invalid.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -761,7 +761,7 @@ class TestCLIparsing {
@Test def test_1346_CLI_Parsing_SimpleParse_defaultRootMultSchemaMultiple() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input7.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input7.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val cmd = String.format("%s parse -s %s %s", Util.binPath, testSchemaFile, testInputFile)
@@ -845,8 +845,8 @@ class TestCLIparsing {
}
@Test def test_DFDL_714() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -866,8 +866,8 @@ class TestCLIparsing {
}
@Test def test_DFDL_1203_schema_from_jar() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/global_element.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/test_DFDL-714.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("", envp = Map("DAFFODIL_CLASSPATH" -> Util.daffodilPath("daffodil-cli/target/scala-2.10/*")))
@@ -909,8 +909,8 @@ class TestCLIparsing {
}
@Test def test_CLI_Parsing_built_in_formats() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input6.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema_04.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input6.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
similarity index 92%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
index 9d27b26..8a9cef6 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/performance/TestCLIPerformance.scala
@@ -29,7 +29,7 @@ class TestCLIPerformance {
@Test def test_3393_CLI_Performance_2_Threads_2_Times() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -68,7 +68,7 @@ class TestCLIPerformance {
@Test def test_3394_CLI_Performance_3_Threads_20_Times() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -106,8 +106,8 @@ class TestCLIPerformance {
}
@Test def test_3395_CLI_Performance_5_Threads_50_Times() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -147,7 +147,7 @@ class TestCLIPerformance {
@Test def test_3396_CLI_Performance_2_Threads_2_Times_Negative() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input5.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input5.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -179,7 +179,7 @@ class TestCLIPerformance {
@Test def test_3641_CLI_Performance_Unparse_2_Threads_2_Times() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -218,7 +218,7 @@ class TestCLIPerformance {
@Test def test_3643_CLI_Performance_Unparse_3_Threads_20_Times() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -257,7 +257,7 @@ class TestCLIPerformance {
@Test def test_3644_CLI_Performance_Unparse_5_Threads_50_Times() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
@@ -296,7 +296,7 @@ class TestCLIPerformance {
@Test def test_3642_CLI_Performance_Unparse_2_Threads_2_Times_Negative() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.startIncludeErrors("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
similarity index 91%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
index 5fbe3cf..42c0f73 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/saving/TestCLISaveParser.scala
@@ -116,8 +116,8 @@ class TestCLISaveParser {
@Test def test_3020_CLI_Saving_SaveParser_namespaceUsed() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -159,7 +159,7 @@ class TestCLISaveParser {
@Test def test_3022_CLI_Saving_SaveParser_MultSchema() {
val schemaFile1 = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd")
- val schemaFile2 = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val schemaFile2 = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
val (testSchemaFile1, testSchemaFile2) = if (Util.isWindows) (Util.cmdConvert(schemaFile1), Util.cmdConvert(schemaFile2)) else (schemaFile1, schemaFile2)
val shell = Util.start("", true)
@@ -240,8 +240,8 @@ class TestCLISaveParser {
@Test def test_DFDL_1205_CLI_FullValidation_SavedParser_Incompatible() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input8.txt")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/charClassEntities.dfdl.xsd")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input8.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("", true)
@@ -302,7 +302,7 @@ class TestCLISaveParser {
// See DFDL-1147
/*@Test def test_3063_CLI_Saving_SaveParser_validate() {
- val cmd = Util.binPath + " save-parser --validate on -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ val cmd = Util.binPath + " save-parser --validate on -s daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
var cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
@@ -310,7 +310,7 @@ class TestCLISaveParser {
shell.expect(contains("[warning] Validation Error: validation_check: cvc-pattern-valid"))
shell.expect(contains("[warning] Validation Error: validation_check failed"))
- cmd = Util.binPath + " save-parser --validate -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ cmd = Util.binPath + " save-parser --validate -s daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
@@ -318,14 +318,14 @@ class TestCLISaveParser {
shell.expect(contains("[warning] Validation Error: validation_check: cvc-pattern-valid"))
shell.expect(contains("[warning] Validation Error: validation_check failed"))
- cmd = Util.binPath + " save-parser --validate limited -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ cmd = Util.binPath + " save-parser --validate limited -s daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
shell.send(cmd2)
shell.expect(contains("[warning] Validation Error: validation_check failed"))
- cmd = Util.binPath + " save-parser --validate off -s daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
+ cmd = Util.binPath + " save-parser --validate off -s daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd -r validation_check savedParser.xml\n"
shell.send(cmd)
cmd2 = "echo -ne 'test'| " + Util.binPath + " parse --parser savedParser.xml \n"
@@ -342,7 +342,7 @@ class TestCLISaveParser {
val cmd = Util.binPath + " -d save-parser -s daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd -r matrix savedParser.xml\n"
val shell = Util.start(cmd)
- val cmd2 = Util.binPath + " parse --parser savedParser.xml daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input1.txt\n"
+ val cmd2 = Util.binPath + " parse --parser savedParser.xml daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input1.txt\n"
shell.send(cmd2)
shell.expect(contains("(debug)"))
shell.send("continue\n")
@@ -370,7 +370,7 @@ class TestCLISaveParser {
/* // See DFDL-1342
@Test def test_3572_CLI_Saving_SaveParser_unparse() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/output/output1.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/output/output1.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -392,7 +392,7 @@ class TestCLISaveParser {
@Test def test_3573_CLI_Saving_SaveParser_unparse2() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -415,7 +415,7 @@ class TestCLISaveParser {
@Test def test_3941_CLI_Saving_SaveParser_tunables() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("", true)
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables.scala
similarity index 84%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables.scala
index ec5ef9e..ee1cf38 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables.scala
@@ -30,7 +30,7 @@ class TestCLITunables {
val unqualifiedPathStep04 = Util.getExpectedString("unqualified_path_step_04.txt")
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -46,7 +46,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_02() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -63,7 +63,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_03() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -80,7 +80,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_noNamespace_test_04() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -98,7 +98,7 @@ class TestCLITunables {
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -114,7 +114,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_02() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -130,7 +130,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_03() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -147,7 +147,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_defaultNamespace_test_04() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -166,7 +166,7 @@ class TestCLITunables {
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_01() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -182,7 +182,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_02() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -198,7 +198,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_03() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -215,7 +215,7 @@ class TestCLITunables {
}
@Test def test_CLI_Parsing_unqualifiedPathStepPolicy_preferDefaultNamespace_test_04() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/unqualified_path_step.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
similarity index 91%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
index e209dc9..5223307 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/tunables/TestCLITunables2.scala
@@ -28,7 +28,7 @@ class TestCLITunables2 {
* Suppresses SDW messages.
*/
@Test def test_CLI_Parsing_SuppressSDEWarnings1() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
@@ -52,7 +52,7 @@ class TestCLITunables2 {
* Will display SDW warnings. Does not set the tunable that suppresses them.
*/
@Test def test_CLI_Parsing_SuppressSDEWarnings2() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/suppressWarnTest.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("")
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala b/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
similarity index 93%
rename from daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
rename to daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
index a76708c..3c12f9d 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
+++ b/daffodil-cli/src/it/scala/org/apache/daffodil/unparsing/TestCLIUnparsing.scala
@@ -29,7 +29,7 @@ class TestCLIunparsing {
@Test def test_3525_CLI_Unparsing_SimpleUnparse_inFile() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input12.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input12.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -50,7 +50,7 @@ class TestCLIunparsing {
@Test def test_3526_CLI_Unparsing_SimpleUnparse_inFile2() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -71,7 +71,7 @@ class TestCLIunparsing {
@Test def test_3527_CLI_Unparsing_SimpleUnparse_stdin() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input14.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input14.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -155,7 +155,7 @@ class TestCLIunparsing {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input15.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input15.txt")
val (testSchemaFile, testConfigFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile), Util.cmdConvert(inputFile)) else (schemaFile, configFile, inputFile)
val shell = Util.start("")
@@ -177,7 +177,7 @@ class TestCLIunparsing {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd")
val configFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/daffodil_config_cli_test.xml")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input16.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input16.txt")
val (testSchemaFile, testConfigFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(configFile), Util.cmdConvert(inputFile)) else (schemaFile, configFile, inputFile)
val shell = Util.start("")
@@ -199,7 +199,7 @@ class TestCLIunparsing {
val tmp_filename: String = (System.currentTimeMillis / 1000).toString()
val file = new File(tmp_filename)
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -223,7 +223,7 @@ class TestCLIunparsing {
@Test def test_3581_CLI_Unparsing_SimpleUnparse_stOutDash() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input13.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input13.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
@@ -322,7 +322,7 @@ class TestCLIunparsing {
// See DFDL-1346
@Test def test_3576_CLI_Unparsing_validate() {
- val schemaFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
+ val schemaFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/cli_schema.dfdl.xsd")
val testSchemaFile = if (Util.isWindows) Util.cmdConvert(schemaFile) else schemaFile
val shell = Util.start("", true)
@@ -392,7 +392,7 @@ class TestCLIunparsing {
@Test def test_xxxx_CLI_Unparsing_SimpleUnparse_w3cdom() {
val schemaFile = Util.daffodilPath("daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd")
- val inputFile = Util.daffodilPath("daffodil-cli/src/test/resources/org/apache/daffodil/CLI/input/input18.txt")
+ val inputFile = Util.daffodilPath("daffodil-cli/src/it/resources/org/apache/daffodil/CLI/input/input18.txt")
val (testSchemaFile, testInputFile) = if (Util.isWindows) (Util.cmdConvert(schemaFile), Util.cmdConvert(inputFile)) else (schemaFile, inputFile)
val shell = Util.start("")
diff --git a/eclipse-projects/cli-test/.classpath b/eclipse-projects/cli-test/.classpath
index a1043b3..9a08ce9 100644
--- a/eclipse-projects/cli-test/.classpath
+++ b/eclipse-projects/cli-test/.classpath
@@ -2,6 +2,8 @@
<classpath>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="src" path="src/test/scala"/>
+ <classpathentry kind="src" path="src/it/resources"/>
+ <classpathentry kind="src" path="src/it/scala"/>
<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/daffodil-cli"/>
diff --git a/eclipse-projects/cli-test/.project b/eclipse-projects/cli-test/.project
index c656a1d..855da5a 100644
--- a/eclipse-projects/cli-test/.project
+++ b/eclipse-projects/cli-test/.project
@@ -36,5 +36,10 @@
<type>2</type>
<locationURI>DAFFODIL_ROOT/daffodil-cli/src/test</locationURI>
</link>
+ <link>
+ <name>src/it</name>
+ <type>2</type>
+ <locationURI>DAFFODIL_ROOT/daffodil-cli/src/it</locationURI>
+ </link>
</linkedResources>
</projectDescription>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 9c706cc..5e792d8 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -40,12 +40,12 @@ object Dependencies {
lazy val cli = Seq(
"org.fusesource.jansi" % "jansi" % "1.14",
"org.rogach" %% "scallop" % "0.9.5", // new version avail. 2.0.5 requires code changes
- "net.sf.expectit" % "expectit-core" % "0.8.1" % "test"
+ "net.sf.expectit" % "expectit-core" % "0.8.1" % "it,test"
)
lazy val test = Seq(
- "junit" % "junit" % "4.11" % "test",
- "com.novocode" % "junit-interface" % "0.11" % "test",
- "org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
+ "junit" % "junit" % "4.11" % "it,test",
+ "com.novocode" % "junit-interface" % "0.11" % "it,test",
+ "org.scalacheck" %% "scalacheck" % "1.13.4" % "it,test"
)
}
--
To stop receiving notification emails like this one, please contact
slawrence@apache.org.