Use new kotlin.io.path API in tests

This commit is contained in:
Ilya Gorbunov
2020-11-16 08:30:04 +03:00
parent d38e145529
commit b2b2629e79
27 changed files with 173 additions and 116 deletions
@@ -65,8 +65,10 @@ import org.junit.Before
import org.junit.Ignore
import org.junit.Test
import java.io.File
import kotlin.io.path.*
import org.jetbrains.kotlin.konan.file.File as KonanFile
@OptIn(ExperimentalPathApi::class)
@Ignore
class GenerateIrRuntime {
private val lookupTracker: LookupTracker = LookupTracker.DO_NOTHING
@@ -251,7 +253,7 @@ class GenerateIrRuntime {
val irVersion = KlibIrVersion.INSTANCE.toString()
val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion, irVersion)
val file = createTempFile(directory = workingDir)
val file = createTempFile(directory = workingDir.toPath()).toFile()
val writer = KotlinLibraryOnlyIrWriter(file.absolutePath, "", versions, BuiltInsPlatform.JS, emptyList(), false)
val files = fullRuntimeSourceSet
val analysisResult = doFrontEnd(files)
@@ -273,7 +275,7 @@ class GenerateIrRuntime {
val irVersion = KlibIrVersion.INSTANCE.toString()
val versions = KotlinLibraryVersioning(libraryVersion, compilerVersion, abiVersion, metadataVersion, irVersion)
val file = createTempFile(directory = workingDir)
val file = createTempFile(directory = workingDir.toPath()).toFile()
val writer = KotlinLibraryOnlyIrWriter(file.absolutePath, "", versions, BuiltInsPlatform.JS, emptyList(), true)
val files = fullRuntimeSourceSet
val analysisResult = doFrontEnd(files)
@@ -473,15 +475,16 @@ class GenerateIrRuntime {
return psi2IrTranslator.generateModuleFragment(psi2IrContext, files, irProviders, emptyList(), null)
}
@OptIn(ExperimentalPathApi::class)
private fun doSerializeModule(moduleFragment: IrModuleFragment, bindingContext: BindingContext, files: List<KtFile>, perFile: Boolean = false): String {
val tmpKlibDir = createTempDir().also { it.deleteOnExit() }
val tmpKlibDir = createTempDirectory().also { it.toFile().deleteOnExit() }.toString()
serializeModuleIntoKlib(
moduleName,
project,
configuration,
bindingContext,
files,
tmpKlibDir.path,
tmpKlibDir,
emptyList(),
moduleFragment,
mutableMapOf(),
@@ -490,7 +493,7 @@ class GenerateIrRuntime {
perFile
)
return tmpKlibDir.path
return tmpKlibDir
}
private fun doDeserializeModuleMetadata(moduleRef: KotlinLibrary): ModuleDescriptorImpl {