started junit-test suite to complement to cli integration tests

Author: holgerbrandl

build.gradle

@@ -14,7 +14,7 @@ dependencies {
     compile "com.offbytwo:docopt:0.6.0.20150202"
 
     testCompile group: 'junit', name: 'junit', version: '4.11'
-    testCompile "io.kotlintest:kotlintest:1.1.6"
+    testCompile "io.kotlintest:kotlintest:2.0.0"
 }
 
 repositories {

src/main/kotlin/kscript/app/Kscript.kt

@@ -97,10 +97,7 @@ fun main(args: Array<String>) {
     }
 
     // Find all //DEPS directives and concatenate their values
-    val dependencies = scriptText
-            .filter { it.startsWith("//DEPS ") }
-            .flatMap { it.split("[ ;,]+".toRegex()).drop(1) }
-            .map(String::trim)
+    val dependencies = collectDependencies(scriptText)
 
 
     //  Create temopary dev environment
@@ -113,7 +110,7 @@ fun main(args: Array<String>) {
     val classpath = resolveDependencies(dependencies)
 
     // Extract kotlin arguments
-    val kotlinOpts = extractKotlinOptions(scriptText)
+    val kotlinOpts = collectRuntimeOptions(scriptText)
 
 
     //  Optionally enter interactive mode
@@ -222,13 +219,20 @@ fun main(args: Array<String>) {
     println("kotlin ${kotlinOpts} -classpath ${jarFile}${CP_SEPARATOR_CHAR}${KOTLIN_HOME}${File.separatorChar}lib${File.separatorChar}kotlin-script-runtime.jar${CP_SEPARATOR_CHAR}${classpath} ${execClassName} ${shiftedArgs} ")
 }
 
+fun collectDependencies(scriptText: List<String>): List<String> {
+    return scriptText
+            .filter { it.startsWith("//DEPS ") }
+            .flatMap { it.split("[ ;,]+".toRegex()).drop(1) }
+            .map(String::trim)
+}
+
 
-private fun extractKotlinOptions(scriptText: List<String>): String {
+fun collectRuntimeOptions(scriptText: List<String>): String {
     val koptsPrefix = "//KOTLIN_OPTS "
 
     return scriptText.
             filter { it.startsWith(koptsPrefix) }.
-            map { it.replace(koptsPrefix, "") }.
+            map { it.replace(koptsPrefix, "").trim() }.
             joinToString(" ")
 }
 

src/test/kotlin/Tests.kt

@@ -0,0 +1,46 @@
+import io.kotlintest.matchers.shouldBe
+import kscript.app.collectDependencies
+import kscript.app.collectRuntimeOptions
+import org.junit.Test
+
+/**
+ * @author Holger Brandl
+ */
+
+class Tests {
+
+    // "comma separated dependencies should be parsed correctly"
+    @Test
+    fun dependencyCollect() {
+        val lines = listOf(
+                "//DEPS de.mpicbg.scicomp.joblist:joblist-kotlin:1.1, de.mpicbg.scicomp:kutils:0.7",
+                "//DEPS  log4j:log4j:1.2.14"
+        )
+
+        val expected = listOf(
+                "de.mpicbg.scicomp.joblist:joblist-kotlin:1.1",
+                "de.mpicbg.scicomp:kutils:0.7",
+                "log4j:log4j:1.2.14"
+        )
+
+        collectDependencies(lines) shouldBe expected
+    }
+
+    // combine kotlin opts spread over multiple lines
+    @Test
+    fun optsCollect() {
+        val lines = listOf(
+                "//KOTLIN_OPTS -foo 3 'some file.txt'",
+                "//KOTLIN_OPTS  --bar"
+        )
+
+        collectRuntimeOptions(lines) shouldBe "-foo 3 'some file.txt' --bar"
+    }
+
+
+    @Test
+    fun foo() {
+        1 shouldBe 2
+    }
+
+}