External DirSuite Mk3

cli/build.sbt

@@ -1,5 +1,6 @@
 import Dependencies._
 
 libraryDependencies += scalatest % "test"
+libraryDependencies += dirSuite % "test"
 
 fork in Test := true

cli/src/test/scala/co/uproot/abandon/CliTest.scala

@@ -1,15 +1,21 @@
 package co.uproot.abandon
 
+import java.nio.file.Paths
+
+import fi.sn127.utils.fs.Glob
+
 /**
   * Test valid and invalid input with full CLI App
   * and verify return value of main app.
   */
-class CliAppTests extends DirSuite {
+class CliAppTests extends DefaultArgsDirSuite {
+  val basedir = Paths.get("../tests").toAbsolutePath.normalize
+
 
   /**
     * OK Cases (should succeed)
     */
-  testDirSuite("../tests", ".*/sclT[0-9]+(-.*)$") { args: Array[String] =>
+  runDirSuiteTestCases(basedir, Glob("sclT*/**.exec")) { args: Array[String] =>
     assertResult(CLIApp.SUCCEEDED) {
       CLIApp.mainStatus(args)
     }
@@ -19,7 +25,7 @@ class CliAppTests extends DirSuite {
     * Error cases (should fail)
     * Pending bugs are kept inside bugs* so don't match that
     */
-  testDirSuite("../tests/errors", ".*/[A-Z]([a-zA-Z])+$") { args: Array[String] =>
+  runDirSuiteTestCases(basedir, Glob("errors/[A-Z]*/**.exec")) { args: Array[String] =>
     assertResult(CLIApp.FAILED) {
       CLIApp.mainStatus(args)
     }
@@ -30,22 +36,21 @@ class CliAppTests extends DirSuite {
   * Test invalid input and options with CliApp
   * and verify that specific exception is thrown.
   */
-class CliAppErrors extends DirSuite {
-
-  val errorRoot = "../tests/errors"
+class CliAppErrors extends DefaultArgsDirSuite {
+  val errorRoot = Paths.get("../tests/errors").toAbsolutePath.normalize
 
   /**
     * these should fail, but they are not failing
     */
-  ignoreDirSuite(errorRoot, ".*/bugsInputError$") { args: Array[String] =>
+  ignoreDirSuiteTestCases(errorRoot, Glob("bugsInputError/**.exec")) { args: Array[String] =>
     assertThrows[SettingsError] {
       CLIApp.run(args)
     }
   }
   /**
     * These errors should be specialized, but at least they error out at the moment
     */
-  testDirSuite(errorRoot, ".*/AssertionError$") { args: Array[String] =>
+  runDirSuiteTestCases(errorRoot, Glob("AssertionError/**.exec")) { args: Array[String] =>
     assertThrows[AssertionError] {
       CLIApp.run(args)
     }
@@ -55,25 +60,25 @@ class CliAppErrors extends DirSuite {
    * OK errors follows
    */
 
-  testDirSuite(errorRoot, ".*/InputFileNotFoundError$") { args: Array[String] =>
+  runDirSuiteTestCases(errorRoot, Glob("InputFileNotFoundError/**.exec")) { args: Array[String] =>
     assertThrows[InputFileNotFoundError] {
       CLIApp.run(args)
     }
   }
 
-  testDirSuite(errorRoot, ".*/InputError$") { args: Array[String] =>
+  runDirSuiteTestCases(errorRoot, Glob("InputError/**.exec")) { args: Array[String] =>
     assertThrows[InputError] {
       CLIApp.run(args)
     }
   }
 
-  testDirSuite(errorRoot, ".*/SettingsError$") { args: Array[String] =>
+  runDirSuiteTestCases(errorRoot, Glob("SettingsError/**.exec")) { args: Array[String] =>
     assertThrows[SettingsError] {
       CLIApp.run(args)
     }
   }
 
-  testDirSuite(errorRoot, ".*/ConstraintError$") { args: Array[String] =>
+  runDirSuiteTestCases(errorRoot, Glob("ConstraintError/**.exec")) { args: Array[String] =>
     assertThrows[ConstraintError] {
       CLIApp.run(args)
     }

cli/src/test/scala/co/uproot/abandon/DefaultArgsDirSuite.scala

@@ -0,0 +1,31 @@
+package co.uproot.abandon
+
+import java.nio.file.Path
+
+import fi.sn127.utils.testing.DirSuiteLike
+
+/**
+ * Abandon specific default arguments for test cases.
+ */
+class DefaultArgsDirSuite extends DirSuiteLike  {
+
+  /**
+   * Get configuration path based on name of current
+   * test case.
+   *
+   * Add conf-file and few other extra arguments to all
+   * test executions calls.
+   */
+  override
+  protected def mapArgs(testname: Path, args: Array[String]): Array[String] = {
+    val fu = fi.sn127.utils.fs.FileUtils(testname.getFileSystem)
+    val testDir = fu.getParentDirPath(testname)
+
+    val basename = fu.getBasename(testname) match { case (base, ext) => base }
+    val conf = basename.toString + ".conf"
+
+    val fullPathConf = fu.getPath(testDir.toString, conf.toString).toString
+
+    Array("-c", fullPathConf) ++ Array("-X", "-q") ++ args
+  }
+}

project/Dependencies.scala

@@ -10,6 +10,7 @@ object Dependencies {
   val scalaXMLVersion = "1.0.6"
   val scalaParserCombinatorsVersion = "1.0.5"
   val scalaFXVersion = "8.0.102-R11"
+  val dirSuiteVersion = "0.6.0"
 
   // Libraries
   val scalatest = "org.scalatest" %% "scalatest" % scalatestVersion
@@ -19,4 +20,5 @@ object Dependencies {
   val scalaXML = "org.scala-lang.modules" %% "scala-xml" % scalaXMLVersion
   val scalaParserCombinators = "org.scala-lang.modules" %% "scala-parser-combinators" % scalaParserCombinatorsVersion
   val scalaFX = "org.scalafx" %% "scalafx" % scalaFXVersion
+  val dirSuite =  "fi.sn127" %% "utils-testing" % dirSuiteVersion
 }

tests/errors/AssertionError/ae01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/ConstraintError/c01-pos.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/ConstraintError/c02-neg.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/InputError/ie-scope-01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/InputError/ie-scope-02.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/InputError/ie02.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/InputFileNotFoundError/ifnf01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/errors/SettingsError/filters/f01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:--filter;asdf=2016-02-01;

tests/errors/SettingsError/filters/f02.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:--filter;before=2017-02-29;

tests/errors/bugsInputError/pe01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0001-balance/bal01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0001-balance/bal02.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0001-balance/bal03.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0001-balance/bal04.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0002-ledger/all02.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0002-ledger/reports01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0003-stdout/stdout.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0004-glob/glob01.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0005-def/acrossFiles/def.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0005-def/boolean/def.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec:

tests/sclT0005-def/function/function.exec

@@ -0,0 +1,2 @@
+# format: exec
+exec: