Update tests

src/sbt-test/kotlin/basic-tests/build.sbt

@@ -1,3 +1,5 @@
+import kotlin.Keys._
+
 import sbt.complete.Parsers.spaceDelimited
 
 import scala.xml.{NodeSeq, XML}
@@ -13,7 +15,7 @@ checkTestPass := {
   val args: Seq[String] = spaceDelimited("<arg>").parsed
   val testName = args.head
 
-  val xml = XML.load(s"target/test-reports/$testName.xml")
+  val xml = XML.load(s"target/test-reports/TEST-$testName.xml")
   val totalTests = getInt(xml \\ "testsuite" \ "@tests")
   val failures = getInt(xml \\ "testsuite" \ "@failures")
   val errors = getInt(xml \\ "testsuite" \ "@errors")
@@ -24,4 +26,4 @@ checkTestPass := {
   }
 }
 
-def getInt(path: NodeSeq): Int = path.text.toInt
+def getInt(path: NodeSeq): Int = path.text.toInt

src/sbt-test/kotlin/basic-tests/project/plugins.sbt

@@ -1,9 +1,6 @@
-{
-  val ver = System.getProperty("plugin.version")
-  if (ver == null)
-    throw new RuntimeException("""
-                                 |The system property 'plugin.version' is not defined.
-                                 |Specify this property using scriptedLaunchOpts -Dplugin.version."""
-      .stripMargin)
-  else addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % ver)
-}
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
+}

src/sbt-test/kotlin/basic-tests/src/main/kotlin/simple.kt

@@ -3,4 +3,3 @@ package demo
 fun main(args: Array<String>) {
   println("Hello, world!")
 }
-

src/sbt-test/kotlin/basic-tests/src/test/kotlin/SimpleTest.kt

@@ -8,4 +8,4 @@ class SimpleTest {
     assertEquals(4, 2 + 2)
   }
 
-}
+}

src/sbt-test/kotlin/basic-tests/test

@@ -1,3 +1,3 @@
 > compile
 > test
-> "checkTestPass SimpleTest"
+> checkTestPass "SimpleTest"

src/sbt-test/kotlin/basic/build.sbt

@@ -1,8 +1,10 @@
+import kotlin.Keys._
+
 kotlinLib("stdlib")
 
 val listClasses = taskKey[Unit]("listClasses")
 
 listClasses := {
-  val classes = (classDirectory in Compile).value.listFiles()
+  val classes = (Compile / classDirectory).value.listFiles()
   streams.value.log.info("classes: " + classes)
 }

src/sbt-test/kotlin/basic/project/plugins.sbt

@@ -1,9 +1,6 @@
-{
-  val ver = System.getProperty("plugin.version")
-  if (ver == null)
-    throw new RuntimeException("""
-      |The system property 'plugin.version' is not defined.
-      |Specify this property using scriptedLaunchOpts -Dplugin.version."""
-      .stripMargin)
-  else addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % ver)
-}
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
+}

src/sbt-test/kotlin/kotlin-1.2-compat/build.sbt

@@ -1,10 +1,12 @@
+import kotlin.Keys._
+
 kotlinLib("stdlib")
 
 kotlinVersion := "1.2.71"
 
 val listClasses = taskKey[Unit]("listClasses")
 
 listClasses := {
-  val classes = (classDirectory in Compile).value.listFiles()
+  val classes = (Compile / classDirectory).value.listFiles()
   streams.value.log.info("classes: " + classes)
 }

src/sbt-test/kotlin/kotlin-1.2-compat/project/plugins.sbt

@@ -1 +1,6 @@
-addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % sys.props("plugin.version"))
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
+}

src/sbt-test/kotlin/kotlin-1.3-compat/build.sbt

@@ -1,10 +1,12 @@
+import kotlin.Keys._
+
 kotlinLib("stdlib")
 
 kotlinVersion := "1.3.41"
 
 val listClasses = taskKey[Unit]("listClasses")
 
 listClasses := {
-  val classes = (classDirectory in Compile).value.listFiles()
+  val classes = (Compile / classDirectory).value.listFiles()
   streams.value.log.info("classes: " + classes)
 }

src/sbt-test/kotlin/kotlin-1.3-compat/project/plugins.sbt

@@ -1 +1,6 @@
-addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % sys.props("plugin.version"))
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
+}

src/sbt-test/kotlin/kotlin-script/build.sbt

@@ -1,10 +1,12 @@
+import kotlin.Keys._
+
 kotlinLib("stdlib")
 
 kotlinVersion := "1.3.21"
 
 val listClasses = taskKey[Unit]("listClasses")
 
 listClasses := {
-  val classes = (classDirectory in Compile).value.listFiles()
+  val classes = (Compile / classDirectory).value.listFiles()
   streams.value.log.info("classes: " + classes)
 }

src/sbt-test/kotlin/kotlin-script/project/plugins.sbt

@@ -1 +1,6 @@
-addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % sys.props("plugin.version"))
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
+}

src/sbt-test/kotlin/mixed-tests/build.sbt

@@ -1,3 +1,5 @@
+import kotlin.Keys._
+
 import sbt.complete.Parsers.spaceDelimited
 
 import scala.xml.{NodeSeq, XML}
@@ -13,7 +15,7 @@ checkTestPass := {
   val args: Seq[String] = spaceDelimited("<arg>").parsed
   val testName = args.head
 
-  val xml = XML.load(s"target/test-reports/$testName.xml")
+  val xml = XML.load(s"target/test-reports/TEST-$testName.xml")
   val totalTests = getInt(xml \\ "testsuite" \ "@tests")
   val failures = getInt(xml \\ "testsuite" \ "@failures")
   val errors = getInt(xml \\ "testsuite" \ "@errors")
@@ -24,4 +26,4 @@ checkTestPass := {
   }
 }
 
-def getInt(path: NodeSeq): Int = path.text.toInt
+def getInt(path: NodeSeq): Int = path.text.toInt

src/sbt-test/kotlin/mixed-tests/project/plugins.sbt

@@ -1,9 +1,6 @@
-{
-  val ver = System.getProperty("plugin.version")
-  if (ver == null)
-    throw new RuntimeException("""
-                                 |The system property 'plugin.version' is not defined.
-                                 |Specify this property using scriptedLaunchOpts -Dplugin.version."""
-      .stripMargin)
-  else addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % ver)
-}
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
+}

src/sbt-test/kotlin/mixed-tests/src/test/kotlin/MixedTest.kt

@@ -11,4 +11,4 @@ class MixedTest {
     assertEquals(4, calculator.sum(2, 2))
   }
 
-}
+}

src/sbt-test/kotlin/mixed-tests/test

@@ -1,3 +1,3 @@
 > compile
 > test
-> "checkTestPass MixedTest"
+> checkTestPass "MixedTest"

src/sbt-test/kotlin/mixed/build.sbt

@@ -1,3 +1,5 @@
+import kotlin.Keys._
+
 kotlinLib("stdlib")
 
 kotlincOptions += "-verbose"

src/sbt-test/kotlin/mixed/project/plugins.sbt

@@ -1,11 +1,6 @@
-{
-  val ver = System.getProperty("plugin.version")
-  if (ver == null)
-    throw new RuntimeException("""
-      |The system property 'plugin.version' is not defined.
-      |Specify this property using scriptedLaunchOpts -Dplugin.version."""
-      .stripMargin)
-  else addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % ver)
+sys.props.get("plugin.version") match {
+  case Some(version) => addSbtPlugin("org.jetbrains.scala" % "sbt-kotlin-plugin" % version)
+  case _ => sys.error(
+    """The system property 'plugin.version' is not defined.
+      |Specify this property using the scriptedLaunchOpts -Dplugin.version.""".stripMargin)
 }
-
-

src/sbt-test/kotlin/mixed/src/main/kotlin/script.kts

@@ -1,2 +1 @@
-
-println("Hello from Kotlin script")
+println("Hello from Kotlin script")

src/sbt-test/kotlin/mixed/tests.sbt

@@ -1,5 +1,5 @@
 TaskKey[Unit]("check-classes") := {
-  val classes = (classDirectory in Compile).value
+  val classes = (Compile / classDirectory).value
   val classList = (classes ** "*.class").get
   if (classList.size != 7) {
     throw new MessageOnlyException(s"Incorrect number of classes: ${classList.size} =>\n${classList.mkString("\n")}")