KTNB-1129: Review fixes

Author: ileasile

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/TestUtil.kt

@@ -468,7 +468,15 @@ fun Any?.shouldBeInstanceOf(kclass: KClass<*>) {
     }
 }
 
-interface TempDirProvider {
+/**
+ * A factory interface for creating temporary files and directories on the filesystem.
+ */
+interface TempFilesFactory {
+    /**
+     * Creates a new empty temporary directory.
+     * Clients shouldn't care about the directory cleanup,
+     * it's the responsibility of the exact implementation.
+     */
     fun newTempDir(): Path
 }
 
@@ -480,13 +488,13 @@ interface TempDirProvider {
 @OptIn(ExperimentalPathApi::class)
 fun withTempDirectories(
     dirPrefix: String,
-    action: TempDirProvider.() -> Unit,
+    action: TempFilesFactory.() -> Unit,
 ) {
     val directories: MutableList<Path> = mutableListOf()
 
     try {
         val provider =
-            object : TempDirProvider {
+            object : TempFilesFactory {
                 override fun newTempDir(): Path =
                     createTempDirectory(dirPrefix).also {
                         it.toFile().deleteOnExit()

src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/repl/ReplTests.kt

@@ -43,7 +43,6 @@ import org.jetbrains.kotlinx.jupyter.test.renderedValue
 import org.jetbrains.kotlinx.jupyter.test.withTempDirectories
 import org.jetbrains.kotlinx.jupyter.util.DelegatingClassLoader
 import org.jetbrains.kotlinx.jupyter.withPath
-import org.junit.jupiter.api.Assumptions.assumeTrue
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.condition.DisabledOnOs
@@ -1080,8 +1079,6 @@ class ReplTests : AbstractSingleReplTest() {
         )
 
         // Doesn't work in K2, see KT-80019
-        assumeTrue(repl.compilerMode == K1)
-
         val res =
             eval(
                 """
@@ -1090,23 +1087,39 @@ class ReplTests : AbstractSingleReplTest() {
                 """.trimIndent(),
             )
 
-        evalSuccess("great()").renderedValue shouldBe "Great result!"
-
-        withTempDirectories("customPackages") {
-            val scriptsDir = newTempDir()
-            val sourcesDir = newTempDir()
+        eval("great()").let { invocationResult ->
+            when (repl.compilerMode) {
+                K1 -> invocationResult.renderedValue shouldBe "Great result!"
+                K2 -> invocationResult.shouldBeInstanceOf<EvalResultEx.Error>()
+            }
+        }
 
-            val classNames =
-                CompiledScriptsSerializer().deserializeAndSave(
-                    res.metadata.compiledData,
-                    scriptsDir,
-                    sourcesDir,
-                )
+        when (repl.compilerMode) {
+            K1 -> {
+                withTempDirectories("customPackages") {
+                    val scriptsDir = newTempDir()
+                    val sourcesDir = newTempDir()
+
+                    val classNames =
+                        CompiledScriptsSerializer().deserializeAndSave(
+                            res.metadata.compiledData,
+                            scriptsDir,
+                            sourcesDir,
+                        )
 
-            scriptsDir.resolve("com/xxx/pack/Line_1_jupyter.class").shouldExist()
-            sourcesDir.shouldContainFile("Line_1.kts")
+                    scriptsDir.resolve("com/xxx/pack/Line_1_jupyter.class").shouldExist()
+                    sourcesDir.shouldContainFile("Line_1.kts")
 
-            classNames shouldBe listOf("com.xxx.pack.Line_1_jupyter")
+                    classNames shouldBe listOf("com.xxx.pack.Line_1_jupyter")
+                }
+            }
+            K2 -> {
+                res.shouldBeInstanceOf<EvalResultEx.Error>()
+                with(res.metadata.compiledData) {
+                    scripts.shouldBeEmpty()
+                    sources.shouldBeEmpty()
+                }
+            }
         }
     }
 }