Fixup

Kotlin · Jun 20, 2022 · 1a43667 · 1a43667
1 parent be5de2b
commit 1a43667
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/TestUtilTest.kt b/src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/TestUtilTest.kt
@@ -1,12 +1,18 @@
 package org.jetbrains.kotlinx.jupyter.test
 
-import jupyter.kotlin.DependsOn
+import io.kotest.matchers.shouldBe
 import org.junit.jupiter.api.Test
+import kotlin.script.experimental.jvm.util.classpathFromClassloader
 import kotlin.script.experimental.jvm.util.scriptCompilationClasspathFromContext
 
 class TestUtilTest {
     @Test
     fun classpath() {
+        val classLoader = TestUtilTest::class.java.classLoader
+
+        val cp0 = classpathFromClassloader(classLoader)
+        println(cp0)
+
         val cp1 = scriptCompilationClasspathFromContext(
             "lib",
             "api",
@@ -17,11 +23,13 @@ class TestUtilTest {
             "kotlinx-serialization-json",
             "kotlinx-serialization-json-jvm",
             "kotlinx-serialization-core-jvm",
-            classLoader = DependsOn::class.java.classLoader
+            classLoader = classLoader
         )
         println(cp1)
 
         val cp2 = classpath
         println(cp2)
+
+        cp1 shouldBe cp2
     }
 }
diff --git a/src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/testUtil.kt b/src/test/kotlin/org/jetbrains/kotlinx/jupyter/test/testUtil.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.kotlinx.jupyter.test
 
 import io.kotest.assertions.fail
-import jupyter.kotlin.DependsOn
 import jupyter.kotlin.JavaRuntime
 import org.jetbrains.kotlinx.jupyter.MutableCodeCell
 import org.jetbrains.kotlinx.jupyter.ReplRuntimeProperties
@@ -60,7 +59,7 @@ val classpath = scriptCompilationClasspathFromContext(
     "kotlinx-serialization-json",
     "kotlinx-serialization-json-jvm",
     "kotlinx-serialization-core-jvm",
-    classLoader = DependsOn::class.java.classLoader
+    classLoader = TestDisplayHandler::class.java.classLoader
 )
 
 val testLibraryResolver: LibraryResolver