From 2cbc8d403715bc909325c9323ef58ffb47b22e1f Mon Sep 17 00:00:00 2001
From: Nikolay Tatarinov <5min4eq.unity@gmail.com>
Date: Thu, 22 Feb 2018 11:18:45 +0300
Subject: support multiple test frameworks (#148)

support multiple test frameworks
---
 integration/test/resources/acyclic/build.sc      | 4 ++--
 integration/test/resources/ammonite/build.sc     | 6 +++---
 integration/test/resources/better-files/build.sc | 2 +-
 integration/test/resources/jawn/build.sc         | 4 ++--
 integration/test/resources/upickle/build.sc      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'integration')

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")
-- 
cgit v1.2.3