azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor script.util templates

Browse Source
This commit is contained in:
Ilya Chernikov
2016-12-02 14:33:34 +01:00
parent eb3d8a1a4a
commit cfcd3b8186
6 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-script-util/src/test/kotlin/org/jetbrains/kotlin/script/util/ScriptUtilIT.kt
+8 -5
View File
@@ -31,6 +31,9 @@ import org.jetbrains.kotlin.config.JVMConfigurationKeys
import org.jetbrains.kotlin.config.addKotlinSourceRoot
import org.jetbrains.kotlin.script.KotlinScriptDefinition
import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate
import org.jetbrains.kotlin.script.util.templates.ScriptTemplateWithBindings
import org.jetbrains.kotlin.script.util.templates.StandardScriptTemplate
import org.jetbrains.kotlin.script.util.templates.StandardScriptTemplateWithAnnotatedResolving
import org.jetbrains.kotlin.utils.PathUtil
import org.jetbrains.kotlin.utils.PathUtil.getResourcePathForClass
import org.junit.Assert
@@ -60,7 +63,7 @@ done
@Test
fun testArgsHelloWorld() {
val scriptClass = compileScript("args-hello-world.kts", StandardScript::class)
val scriptClass = compileScript("args-hello-world.kts", StandardScriptTemplate::class)
Assert.assertNotNull(scriptClass)
val ctor = scriptClass?.getConstructor(Array<String>::class.java)
Assert.assertNotNull(ctor)
@@ -73,7 +76,7 @@ done
@Test
fun testBndHelloWorld() {
val scriptClass = compileScript("bindings-hello-world.kts", ScriptWithBindings::class)
val scriptClass = compileScript("bindings-hello-world.kts", ScriptTemplateWithBindings::class)
Assert.assertNotNull(scriptClass)
val ctor = scriptClass?.getConstructor(Map::class.java)
Assert.assertNotNull(ctor)
@@ -87,7 +90,7 @@ done
@Test
fun testResolveStdHelloWorld() {
try {
compileScript("args-junit-hello-world.kts", StandardScript::class)
compileScript("args-junit-hello-world.kts", StandardScriptTemplate::class)
Assert.fail("Should throw exception")
}
catch (e: Exception) {
@@ -95,9 +98,9 @@ done
Assert.assertTrue("Expecting message \"$expectedMsg...\"", e.message?.startsWith(expectedMsg) ?: false)
}
val scriptClass = compileScript("args-junit-hello-world.kts", StandardScriptWithAnnotatedResolving::class)
val scriptClass = compileScript("args-junit-hello-world.kts", StandardScriptTemplateWithAnnotatedResolving::class)
if (scriptClass == null) {
val resolver = DefaultKotlinAnnotatedScriptDependenciesResolver()
val resolver = ContextAndAnnotationsBasedResolver()
System.err.println(resolver.baseClassPath)
}
Assert.assertNotNull(scriptClass)