fixed engine access

s1monw1 · May 8, 2018 · bab5dc3 · bab5dc3
1 parent 0326359
commit bab5dc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/main/kotlin/de/swirtz/ktsobjectloader/KtsObjectLoader.kt b/src/main/kotlin/de/swirtz/ktsobjectloader/KtsObjectLoader.kt
@@ -6,8 +6,11 @@ import javax.script.ScriptEngineManager
 
 class KtsObjectLoader {
 
-    val engine = ScriptEngineManager().getEngineByExtension("kts")
-            as KotlinJsr223JvmLocalScriptEngine
+    companion object {
+        val engine = ScriptEngineManager().getEngineByExtension("kts")
+                as KotlinJsr223JvmLocalScriptEngine
+
+    }
 
     inline fun <reified T> load(script: String): T {
         val loaded: Any = engine.eval(script)

diff --git a/src/test/kotlin/de/swirtz/ktsobjectloader/KtsObjectLoaderTest.kt b/src/test/kotlin/de/swirtz/ktsobjectloader/KtsObjectLoaderTest.kt
@@ -14,7 +14,7 @@ class KtsObjectLoaderTest {
 
     @Test
     fun `general ScriptEngineFactory test`() {
-        KtsObjectLoader().engine.factory.apply {
+        KtsObjectLoader.engine.factory.apply {
             assertEquals("kotlin", languageName)
             assertEquals(KotlinCompilerVersion.VERSION, languageVersion)
             assertEquals("kotlin", engineName)
@@ -33,7 +33,7 @@ class KtsObjectLoaderTest {
 
     @Test
     fun `simple evaluations should work`() {
-        with(KtsObjectLoader().engine) {
+        with(KtsObjectLoader.engine) {
             val res1 = eval("val x = 3")
             assertNull(res1, "No returned value expected")
             val res2 = eval("x + 2")