From db8d967d461fb6323fd83c40ef81e26f2d0fa225 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 8 Apr 2018 23:39:40 -0700
Subject: Get first `caffeine.test` suite running in `CaffeineTests`

---
 integration/test/resources/caffeine/build.sc              | 13 +++++++++----
 integration/test/src/mill/integration/CaffeineTests.scala |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'integration/test')

diff --git a/integration/test/resources/caffeine/build.sc b/integration/test/resources/caffeine/build.sc
index fccf2995..aa27eff9 100644
--- a/integration/test/resources/caffeine/build.sc
+++ b/integration/test/resources/caffeine/build.sc
@@ -18,9 +18,9 @@ trait CaffeineModule extends MavenModule{
     MavenRepository("http://repo.spring.io/plugins-release")
   )
   trait Tests extends super.Tests{
-    def testFrameworks = Seq("de.johoop.testnginterface.TestNGFramework")
+    def testFrameworks = Seq("com.novocode.junit.JUnitFramework")
     def ivyDeps = Agg(
-      ivy"de.johoop:sbt-testng-interface_2.12:3.1.1",
+      ivy"com.novocode:junit-interface:0.11",
       libraries.guava,
       testLibraries.mockito,
       testLibraries.hamcrest,
@@ -82,7 +82,7 @@ object caffeine extends CaffeineModule {
       testLibraries.jctools,
       testLibraries.guavaTestLib,
     ) ++
-    testLibraries.testng
+      testLibraries.testng
   }
 }
 
@@ -97,6 +97,11 @@ object guava extends CaffeineModule {
       testLibraries.easymock,
       testLibraries.guavaTestLib
     )
+    def forkArgs = Seq(
+      "-Dguava.osgi.version=" + versions.guava,
+      "-Dcaffeine.osgi.jar=" + caffeine.jar().path,
+      "-Dcaffeine-guava.osgi.jar=" + guava.jar().path
+    )
   }
 }
 
@@ -111,7 +116,7 @@ object jcache extends CaffeineModule {
       testLibraries.jcacheGuice,
       testLibraries.guavaTestLib
     ) ++
-    testLibraries.testng
+      testLibraries.testng
   }
 }
 
diff --git a/integration/test/src/mill/integration/CaffeineTests.scala b/integration/test/src/mill/integration/CaffeineTests.scala
index b206aa97..121a8701 100644
--- a/integration/test/src/mill/integration/CaffeineTests.scala
+++ b/integration/test/src/mill/integration/CaffeineTests.scala
@@ -10,6 +10,7 @@ class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_R
       // 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"))
-- 
cgit v1.2.3