summaryrefslogtreecommitdiff
path: root/integration
diff options
context:
space:
mode:
authorNikolay Tatarinov <5min4eq.unity@gmail.com>2018-02-22 11:18:45 +0300
committerGitHub <noreply@github.com>2018-02-22 11:18:45 +0300
commit2cbc8d403715bc909325c9323ef58ffb47b22e1f (patch)
tree3cebde274f4f31a643e6d9c9d728b01d83649130 /integration
parent107ba88754673e08b030b9ba1c8f4e6f1eefd13d (diff)
downloadmill-2cbc8d403715bc909325c9323ef58ffb47b22e1f.tar.gz
mill-2cbc8d403715bc909325c9323ef58ffb47b22e1f.tar.bz2
mill-2cbc8d403715bc909325c9323ef58ffb47b22e1f.zip
support multiple test frameworks (#148)
support multiple test frameworks
Diffstat (limited to 'integration')
-rw-r--r--integration/test/resources/acyclic/build.sc4
-rw-r--r--integration/test/resources/ammonite/build.sc6
-rw-r--r--integration/test/resources/better-files/build.sc2
-rw-r--r--integration/test/resources/jawn/build.sc4
-rw-r--r--integration/test/resources/upickle/build.sc2
5 files changed, 9 insertions, 9 deletions
diff --git a/integration/test/resources/acyclic/build.sc b/integration/test/resources/acyclic/build.sc
index 5328db24..373be20a 100644
--- a/integration/test/resources/acyclic/build.sc
+++ b/integration/test/resources/acyclic/build.sc
@@ -32,6 +32,6 @@ class AcyclicModule(val crossScalaVersion: String) extends CrossSbtModule with P
def ivyDeps = Agg(
ivy"com.lihaoyi::utest:0.6.0"
)
- def testFramework = "utest.runner.Framework"
+ def testFrameworks = Seq("utest.runner.Framework")
}
-} \ No newline at end of file
+}
diff --git a/integration/test/resources/ammonite/build.sc b/integration/test/resources/ammonite/build.sc
index 4594cd9f..39134e3d 100644
--- a/integration/test/resources/ammonite/build.sc
+++ b/integration/test/resources/ammonite/build.sc
@@ -5,13 +5,13 @@ val fullCrossScalaVersions = Seq(
"2.12.0", "2.12.1", "2.12.2", "2.12.3", "2.12.4"
)
trait AmmModule extends mill.scalalib.CrossSbtModule{
- def testFramework = "utest.runner.Framework"
+ def testFrameworks = Seq("utest.runner.Framework")
def scalacOptions = Seq("-P:acyclic:force", "-target:jvm-1.7")
def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
trait Tests extends super.Tests{
def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.6.0")
- def testFramework = "utest.runner.Framework"
+ def testFrameworks = Seq("utest.runner.Framework")
}
def allIvyDeps = T{transitiveIvyDeps() ++ scalaLibraryIvyDeps()}
def externalSources = T{
@@ -181,4 +181,4 @@ class SshdModule(val crossScalaVersion: String) extends AmmModule{
ivy"org.scalacheck::scalacheck:1.12.6"
)
}
-} \ No newline at end of file
+}
diff --git a/integration/test/resources/better-files/build.sc b/integration/test/resources/better-files/build.sc
index f9747343..6196fa65 100644
--- a/integration/test/resources/better-files/build.sc
+++ b/integration/test/resources/better-files/build.sc
@@ -55,7 +55,7 @@ trait BetterFilesModule extends SbtModule{
if (this == core.test) super.moduleDeps
else super.moduleDeps ++ Seq(core.test)
def ivyDeps = Agg(ivy"org.scalatest::scalatest:3.0.4")
- def testFramework = "org.scalatest.tools.Framework"
+ def testFrameworks = Seq("org.scalatest.tools.Framework")
}
}
diff --git a/integration/test/resources/jawn/build.sc b/integration/test/resources/jawn/build.sc
index b83eac17..deb9731a 100644
--- a/integration/test/resources/jawn/build.sc
+++ b/integration/test/resources/jawn/build.sc
@@ -20,7 +20,7 @@ class JawnModule(crossVersion: String) extends mill.Module{
ivy"org.scalatest::scalatest:3.0.3",
ivy"org.scalacheck::scalacheck:1.13.5"
)
- def testFramework = "org.scalatest.tools.Framework"
+ def testFrameworks = Seq("org.scalatest.tools.Framework")
}
}
object parser extends JawnModule
@@ -57,4 +57,4 @@ class JawnModule(crossVersion: String) extends mill.Module{
}
object spray extends Support(ivy"io.spray::spray-json:1.3.3")
}
-} \ No newline at end of file
+}
diff --git a/integration/test/resources/upickle/build.sc b/integration/test/resources/upickle/build.sc
index 39742562..007ab9a2 100644
--- a/integration/test/resources/upickle/build.sc
+++ b/integration/test/resources/upickle/build.sc
@@ -107,7 +107,7 @@ trait UpickleTestModule extends TestModule{
millSourcePath / platformSegment / "src" / "test",
millSourcePath / "shared" / "src" / "test"
)
- def testFramework = "utest.runner.Framework"
+ def testFrameworks = Seq("utest.runner.Framework")
}
object upickleJvm extends Cross[UpickleJvmModule]("2.11.11", "2.12.4")