diff options
Diffstat (limited to 'integration/test')
-rw-r--r-- | integration/test/resources/caffeine/build.sc | 5 | ||||
-rw-r--r-- | integration/test/src/mill/integration/CaffeineTests.scala | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/integration/test/resources/caffeine/build.sc b/integration/test/resources/caffeine/build.sc index 3c023366..32bf2d1b 100644 --- a/integration/test/resources/caffeine/build.sc +++ b/integration/test/resources/caffeine/build.sc @@ -21,7 +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", + ivy"com.lihaoyi:mill-testng:${sys.props("MILL_VERSION")}", libraries.guava, testLibraries.mockito, testLibraries.hamcrest, @@ -85,6 +85,8 @@ object caffeine extends CaffeineModule { testLibraries.guavaTestLib, ) ++ testLibraries.testng + + def allSourceFiles = super.allSourceFiles().filter(_.path.last != "OSGiTest.java") } } @@ -99,6 +101,7 @@ object guava extends CaffeineModule { testLibraries.easymock, testLibraries.guavaTestLib ) + def allSourceFiles = super.allSourceFiles().filter(_.path.last != "OSGiTest.java") def forkArgs = Seq( "-Dguava.osgi.version=" + versions.guava, "-Dcaffeine.osgi.jar=" + caffeine.jar().path, diff --git a/integration/test/src/mill/integration/CaffeineTests.scala b/integration/test/src/mill/integration/CaffeineTests.scala index a93dc91a..8fcbcaee 100644 --- a/integration/test/src/mill/integration/CaffeineTests.scala +++ b/integration/test/src/mill/integration/CaffeineTests.scala @@ -10,7 +10,7 @@ class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_R // type inference issues during the compile if (mill.client.ClientServer.isJava9OrAbove){ assert(eval("caffeine.test.compile")) - assert(eval("guava.test")) + val suites = Seq( "com.github.benmanes.caffeine.SingleConsumerQueueTest", "com.github.benmanes.caffeine.cache.AsyncTest", @@ -22,8 +22,11 @@ class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_R "-testclass", suites.mkString(",") )) assert(eval("guava.test.compile")) + assert(eval("guava.test")) + assert(eval("jcache.test.compile")) assert(eval("simulator.test.compile")) + } } |