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

Cleanup warnings in scripting code

Browse Source
This commit is contained in:
Ilya Chernikov
2020-04-06 13:12:56 +02:00
parent d863dc04e6
commit 195a90d333
20 changed files with 134 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/CachingTest.kt
+12 -12
View File
@@ -52,7 +52,7 @@ class CachingTest : TestCase() {
fun testFileCache() {
withTempDir("scriptingTestCache") { cacheDir ->
val cache = FileBasedScriptCache(cacheDir)
Assert.assertTrue(cache.baseDir.listFiles().isEmpty())
Assert.assertEquals(true, cache.baseDir.listFiles()?.isEmpty())
checkWithCache(cache, simpleScript, simpleScriptExpectedOutput)
}
@@ -62,7 +62,7 @@ class CachingTest : TestCase() {
fun testSimpleImportWithFileCache() {
withTempDir("scriptingTestCache") { cacheDir ->
val cache = FileBasedScriptCache(cacheDir)
Assert.assertTrue(cache.baseDir.listFiles().isEmpty())
Assert.assertEquals(true, cache.baseDir.listFiles()?.isEmpty())
checkWithCache(
cache, scriptWithImport, scriptWithImportExpectedOutput,
@@ -190,9 +190,7 @@ class CachingTest : TestCase() {
}
}
object Implicit {
val ix = 0
}
object Implicit
private interface ScriptingCacheWithCounters : CompiledJvmScriptsCache {
@@ -230,7 +228,7 @@ private class FileBasedScriptCache(val baseDir: File) : ScriptingCacheWithCounte
override fun get(script: SourceCode, scriptCompilationConfiguration: ScriptCompilationConfiguration): CompiledScript? {
val file = File(baseDir, uniqueScriptHash(script, scriptCompilationConfiguration))
return if (!file.exists()) null else file.readCompiledScript(scriptCompilationConfiguration)?.also { retrievedScripts++ }
return if (!file.exists()) null else file.readCompiledScript().also { retrievedScripts++ }
}
override fun store(
@@ -254,11 +252,13 @@ private class FileBasedScriptCache(val baseDir: File) : ScriptingCacheWithCounte
private set
}
class TestCompiledScriptJarsCache(val baseDir: File) : CompiledScriptJarsCache(
{ script, scriptCompilationConfiguration ->
File(baseDir, uniqueScriptHash(script, scriptCompilationConfiguration) + ".jar")
}), ScriptingCacheWithCounters
{
class TestCompiledScriptJarsCache(val baseDir: File) :
CompiledScriptJarsCache(
{ script, scriptCompilationConfiguration ->
File(baseDir, uniqueScriptHash(script, scriptCompilationConfiguration) + ".jar")
}
), ScriptingCacheWithCounters {
override fun get(script: SourceCode, scriptCompilationConfiguration: ScriptCompilationConfiguration): CompiledScript? =
super.get(script, scriptCompilationConfiguration)?.also { retrievedScripts++ }
@@ -289,7 +289,7 @@ internal fun uniqueScriptHash(script: SourceCode, scriptCompilationConfiguration
return digestWrapper.digest().toHexString()
}
private fun File.readCompiledScript(scriptCompilationConfiguration: ScriptCompilationConfiguration): CompiledScript {
private fun File.readCompiledScript(): CompiledScript {
return inputStream().use { fs ->
ObjectInputStream(fs).use {
it.readObject() as KJvmCompiledScript
libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ScriptingHostTest.kt
+3 -3
View File
@@ -379,7 +379,7 @@ class ScriptingHostTest : TestCase() {
val res = compiler(script.toScriptSource(), scriptCompilationConfiguration).throwOnFailure()
(res as ResultWithDiagnostics.Success<CompiledScript>).value
}
val compiledScriptClass = runBlocking { compiledScript.getClass(null).throwOnFailure().valueOrNull()!! as KClass<*> }
val compiledScriptClass = runBlocking { compiledScript.getClass(null).throwOnFailure().valueOrNull()!! }
val classLoader = compiledScriptClass.java.classLoader
Assert.assertTrue(classLoader is CompiledScriptClassLoader)
@@ -394,8 +394,8 @@ class ScriptingHostTest : TestCase() {
Assert.assertNotNull(classAsResourceUrl)
Assert.assertNotNull(classAssResourceStream)
val classAsResourceData = classAsResourceUrl.openConnection().getInputStream().readBytes()
val classAsResourceStreamData = classAssResourceStream.readBytes()
val classAsResourceData = classAsResourceUrl!!.openConnection().getInputStream().readBytes()
val classAsResourceStreamData = classAssResourceStream!!.readBytes()
Assert.assertArrayEquals(classAsResourceData, classAsResourceStreamData)