From 11122c48452d40eb32086fa247ce06d5d6f1a789 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Mon, 9 Apr 2018 01:29:14 -0700
Subject: Caffeine junit & testng suites seem to pass

---
 integration/test/resources/caffeine/build.sc         |  2 ++
 .../test/src/mill/integration/CaffeineTests.scala    | 20 +++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

(limited to 'integration')

diff --git a/integration/test/resources/caffeine/build.sc b/integration/test/resources/caffeine/build.sc
index aa27eff9..3c023366 100644
--- a/integration/test/resources/caffeine/build.sc
+++ b/integration/test/resources/caffeine/build.sc
@@ -21,6 +21,7 @@ trait CaffeineModule extends MavenModule{
     def testFrameworks = Seq("com.novocode.junit.JUnitFramework")
     def ivyDeps = Agg(
       ivy"com.novocode:junit-interface:0.11",
+      ivy"com.lihaoyi:mill-testng:0.1.7-79-91f790",
       libraries.guava,
       testLibraries.mockito,
       testLibraries.hamcrest,
@@ -73,6 +74,7 @@ object caffeine extends CaffeineModule {
   }
 
   object test extends Tests{
+    def testFrameworks = Seq("mill.testng.TestNGFramework")
     def ivyDeps = super.ivyDeps() ++ Agg(
       libraries.ycsb,
       libraries.fastutil,
diff --git a/integration/test/src/mill/integration/CaffeineTests.scala b/integration/test/src/mill/integration/CaffeineTests.scala
index 121a8701..a93dc91a 100644
--- a/integration/test/src/mill/integration/CaffeineTests.scala
+++ b/integration/test/src/mill/integration/CaffeineTests.scala
@@ -9,11 +9,21 @@ class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_R
       // Caffeine only can build using Java 9 or up. Java 8 results in weird
       // type inference issues during the compile
       if (mill.client.ClientServer.isJava9OrAbove){
-        assert(eval(s"caffeine.test.compile"))
-        assert(eval(s"caffeine.test"))
-        assert(eval(s"guava.test.compile"))
-        assert(eval(s"jcache.test.compile"))
-        assert(eval(s"simulator.test.compile"))
+        assert(eval("caffeine.test.compile"))
+        assert(eval("guava.test"))
+        val suites = Seq(
+          "com.github.benmanes.caffeine.SingleConsumerQueueTest",
+          "com.github.benmanes.caffeine.cache.AsyncTest",
+          "com.github.benmanes.caffeine.cache.CaffeineTest",
+          "com.github.benmanes.caffeine.cache.TimerWheelTest"
+        )
+        assert(eval(
+          "caffeine.test",
+          "-testclass", suites.mkString(",")
+        ))
+        assert(eval("guava.test.compile"))
+        assert(eval("jcache.test.compile"))
+        assert(eval("simulator.test.compile"))
       }
     }
 
-- 
cgit v1.2.3