diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 01:29:14 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-09 13:20:45 -0700 |
commit | 11122c48452d40eb32086fa247ce06d5d6f1a789 (patch) | |
tree | 5383042fe2db7d9f24f437e71fd1bc44e70c61cc /integration | |
parent | db8d967d461fb6323fd83c40ef81e26f2d0fa225 (diff) | |
download | mill-11122c48452d40eb32086fa247ce06d5d6f1a789.tar.gz mill-11122c48452d40eb32086fa247ce06d5d6f1a789.tar.bz2 mill-11122c48452d40eb32086fa247ce06d5d6f1a789.zip |
Caffeine junit & testng suites seem to pass
Diffstat (limited to 'integration')
-rw-r--r-- | integration/test/resources/caffeine/build.sc | 2 | ||||
-rw-r--r-- | integration/test/src/mill/integration/CaffeineTests.scala | 20 |
2 files changed, 17 insertions, 5 deletions
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")) } } |