summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2018-03-25 09:39:26 -0700
committerLi Haoyi <haoyi.sg@gmail.com>2018-03-25 12:12:57 -0700
commitb648ca4d49a77592ac306122d03b7a54e75c2d55 (patch)
tree9105b519cbca7c93dc23289156ec1b4c60352c7e /main
parentbdb82a92c4340898b43525dbad44990a119d2b0f (diff)
downloadmill-b648ca4d49a77592ac306122d03b7a54e75c2d55.tar.gz
mill-b648ca4d49a77592ac306122d03b7a54e75c2d55.tar.bz2
mill-b648ca4d49a77592ac306122d03b7a54e75c2d55.zip
bump upickle, ammonite versions
Diffstat (limited to 'main')
-rw-r--r--main/test/src/mill/main/JavaCompileJarTests.scala78
1 files changed, 40 insertions, 38 deletions
diff --git a/main/test/src/mill/main/JavaCompileJarTests.scala b/main/test/src/mill/main/JavaCompileJarTests.scala
index 635ac3c5..6c45b454 100644
--- a/main/test/src/mill/main/JavaCompileJarTests.scala
+++ b/main/test/src/mill/main/JavaCompileJarTests.scala
@@ -10,56 +10,58 @@ object JavaCompileJarTests extends ScriptTestSuite(fork = false) {
val tests = Tests{
initWorkspace()
'test - {
- // Basic target evaluation works
- assert(eval("classFiles"))
- assert(eval("jar"))
+ if (!ammonite.util.Util.java9OrAbove) {
+ // Basic target evaluation works
+ assert(eval("classFiles"))
+ assert(eval("jar"))
- val classFiles1 = meta("classFiles")
- val jar1 = meta("jar")
+ val classFiles1 = meta("classFiles")
+ val jar1 = meta("jar")
- assert(eval("classFiles"))
- assert(eval("jar"))
+ assert(eval("classFiles"))
+ assert(eval("jar"))
- // Repeated evaluation has the same results
- val classFiles2 = meta("classFiles")
- val jar2 = meta("jar")
+ // Repeated evaluation has the same results
+ val classFiles2 = meta("classFiles")
+ val jar2 = meta("jar")
- assert(
- jar1 == jar2,
- classFiles1 == classFiles2
- )
+ assert(
+ jar1 == jar2,
+ classFiles1 == classFiles2
+ )
- // If we update resources, classFiles are unchanged but jar changes
- for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "txt")){
- write.append(scalaFile, "\n")
- }
+ // If we update resources, classFiles are unchanged but jar changes
+ for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "txt")){
+ write.append(scalaFile, "\n")
+ }
- assert(eval("classFiles"))
- assert(eval("jar"))
+ assert(eval("classFiles"))
+ assert(eval("jar"))
- val classFiles3 = meta("classFiles")
- val jar3 = meta("jar")
+ val classFiles3 = meta("classFiles")
+ val jar3 = meta("jar")
- assert(
- jar2 != jar3,
- classFiles2 == classFiles3
- )
+ assert(
+ jar2 != jar3,
+ classFiles2 == classFiles3
+ )
- // We can intentionally break the code, have the targets break, then
- // fix the code and have them recover.
- for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){
- write.append(scalaFile, "\n}")
- }
+ // We can intentionally break the code, have the targets break, then
+ // fix the code and have them recover.
+ for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){
+ write.append(scalaFile, "\n}")
+ }
- assert(!eval("classFiles"))
- assert(!eval("jar"))
+ assert(!eval("classFiles"))
+ assert(!eval("jar"))
- for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){
- write.over(scalaFile, read(scalaFile).dropRight(2))
- }
+ for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "java")){
+ write.over(scalaFile, read(scalaFile).dropRight(2))
+ }
- assert(eval("classFiles"))
- assert(eval("jar"))
+ assert(eval("classFiles"))
+ assert(eval("jar"))
+ }
}
}
}