Test fixes

Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>

Author: aartiPl

src/integration/kotlin/io/github/kscripting/kscript/integration/EnvironmentTest.kt

@@ -9,14 +9,16 @@ import org.junit.jupiter.api.Test
 class EnvironmentTest : TestBase {
     @Test
     @Tag("posix")
+    @Tag("windows")
     fun `Do not run interactive mode prep without script argument`() {
         verify("kscript -i", 1, "", startsWith("kscript - Enhanced scripting support for Kotlin"))
     }
 
     @Test
     @Tag("posix")
+    @Tag("windows")
     fun `Make sure that KOTLIN_HOME can be guessed from kotlinc correctly`() {
-        verify("unset KOTLIN_HOME; echo 'println(99)' | kscript -", 0, "99\n")
+        verify("echo 'println(99)' | kscript -", 0, "99\n") { env -> env.remove("KOTLIN_HOME") }
     }
 
     //TODO: test what happens if kotlin/kotlinc/java/gradle/idea is not in PATH

src/integration/kotlin/io/github/kscripting/kscript/integration/MiscTest.kt

@@ -3,7 +3,6 @@ package io.github.kscripting.kscript.integration
 import io.github.kscripting.kscript.integration.tools.TestAssertion.any
 import io.github.kscripting.kscript.integration.tools.TestAssertion.contains
 import io.github.kscripting.kscript.integration.tools.TestAssertion.verify
-import io.github.kscripting.kscript.integration.tools.TestContext.osType
 import io.github.kscripting.kscript.integration.tools.TestContext.projectDir
 import io.github.kscripting.kscript.integration.tools.TestContext.resolvePath
 import io.github.kscripting.kscript.integration.tools.TestContext.testDir
@@ -90,18 +89,13 @@ class MiscTest : TestBase {
     fun `Test local jar dir referenced in ENV variable`() {
         val shellPath = resolvePath("$projectDir/test/resources/config/")
 
-
-        val envSetter = if (osType.isWindowsLike()) {
-            "set KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jars")} &&"
-        } else {
-            "KSCRIPT_DIRECTORY_ARTIFACTS=${shellPath.resolve("jars")}"
-        }
-
         verify(
-            "$envSetter kscript ${shellPath.resolve("script_with_local_jars.kts")}",
+            "kscript ${shellPath.resolve("script_with_local_jars.kts")}",
             0,
             "I am living in Test1 class...\nAnd I come from Test2 class...\n",
             ""
-        )
+        ) { env ->
+            env["KSCRIPT_DIRECTORY_ARTIFACTS"] = shellPath.resolve("jars").stringPath()
+        }
     }
 }

src/integration/kotlin/io/github/kscripting/kscript/integration/tools/TestAssertion.kt

@@ -2,6 +2,7 @@ package io.github.kscripting.kscript.integration.tools
 
 import io.github.kscripting.kscript.integration.tools.TestContext.runProcess
 import io.github.kscripting.shell.model.GobbledProcessResult
+import io.github.kscripting.shell.process.EnvAdjuster
 
 object TestAssertion {
     fun <T : Any> geq(value: T) = GenericEquals(value)
@@ -15,20 +16,34 @@ object TestAssertion {
         command: String,
         exitCode: Int = 0,
         stdOut: TestMatcher<String>,
-        stdErr: String = ""
-    ): GobbledProcessResult =
-        verify(command, exitCode, stdOut, eq(stdErr))
+        stdErr: String = "",
+        envAdjuster: EnvAdjuster = {}
+    ): GobbledProcessResult = verify(command, exitCode, stdOut, eq(stdErr), envAdjuster)
 
-    fun verify(command: String, exitCode: Int = 0, stdOut: String, stdErr: TestMatcher<String>): GobbledProcessResult =
-        verify(command, exitCode, eq(stdOut), stdErr)
+    fun verify(
+        command: String,
+        exitCode: Int = 0,
+        stdOut: String,
+        stdErr: TestMatcher<String>,
+        envAdjuster: EnvAdjuster = {}
+    ): GobbledProcessResult = verify(command, exitCode, eq(stdOut), stdErr, envAdjuster)
 
-    fun verify(command: String, exitCode: Int = 0, stdOut: String = "", stdErr: String = ""): GobbledProcessResult =
-        verify(command, exitCode, eq(stdOut), eq(stdErr))
+    fun verify(
+        command: String,
+        exitCode: Int = 0,
+        stdOut: String = "",
+        stdErr: String = "",
+        envAdjuster: EnvAdjuster = {}
+    ): GobbledProcessResult = verify(command, exitCode, eq(stdOut), eq(stdErr), envAdjuster)
 
     fun verify(
-        command: String, exitCode: Int = 0, stdOut: TestMatcher<String>, stdErr: TestMatcher<String>
+        command: String,
+        exitCode: Int = 0,
+        stdOut: TestMatcher<String>,
+        stdErr: TestMatcher<String>,
+        envAdjuster: EnvAdjuster = {}
     ): GobbledProcessResult {
-        val processResult = runProcess(command)
+        val processResult = runProcess(command, envAdjuster)
         val extCde = geq(exitCode)
 
         extCde.checkAssertion("ExitCode", processResult.exitCode)

src/integration/kotlin/io/github/kscripting/kscript/integration/tools/TestContext.kt

@@ -4,9 +4,10 @@ import io.github.kscripting.kscript.util.ShellUtils
 import io.github.kscripting.kscript.util.ShellUtils.which
 import io.github.kscripting.shell.ShellExecutor
 import io.github.kscripting.shell.model.*
+import io.github.kscripting.shell.process.EnvAdjuster
 
 object TestContext {
-    val osType: OsType = OsType.findOrThrow(System.getProperty("osType"))
+    private val osType: OsType = OsType.findOrThrow(System.getProperty("osType"))
     private val nativeType = if (osType.isPosixHostedOnWindows()) OsType.WINDOWS else osType
 
     private val projectPath: OsPath = OsPath.createOrThrow(nativeType, System.getProperty("projectPath"))
@@ -37,15 +38,21 @@ object TestContext {
         return OsPath.createOrThrow(osType, path)
     }
 
-    fun runProcess(command: String): GobbledProcessResult {
+    fun runProcess(command: String, envAdjuster: EnvAdjuster): GobbledProcessResult {
         //In MSYS all quotes should be single quotes, otherwise content is interpreted e.g. backslashes.
         //(MSYS bash interpreter is also replacing double quotes into the single quotes: see: bash -xc 'kscript "println(1+1)"')
         val newCommand = when {
             osType.isPosixHostedOnWindows() -> command.replace('"', '\'')
             else -> command
         }
 
-        val result = ShellExecutor.evalAndGobble(osType, newCommand, null, ::adjustEnv)
+        fun internalEnvAdjuster(map: MutableMap<String, String>) {
+            ShellUtils.environmentAdjuster(map)
+            map[pathEnvName] = envPath
+            envAdjuster(map)
+        }
+
+        val result = ShellExecutor.evalAndGobble(osType, newCommand, null, ::internalEnvAdjuster)
         println(result)
 
         return result

src/main/kotlin/io/github/kscripting/kscript/util/FileUtils.kt

@@ -65,6 +65,6 @@ object FileUtils {
             }
         }
 
-        return artifacts.sortedBy { it.leaf }
+        return artifacts.sortedBy { it.stringPath() }
     }
 }