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

Refactoring: do plain roots read in klib in FilePathsInKlibTest

Browse Source
This commit is contained in:
Nikolay Krasko
2022-01-19 18:05:59 +03:00
committed by TeamCityServer
parent d951432fe3
commit 14936cbad2
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/klib/FilePathsInKlibTest.kt
+5 -9
View File
@@ -69,7 +69,7 @@ class FilePathsInKlibTest : CodegenTestCase() {
private fun File.md5(): Long = readBytes().md5() private fun File.md5(): Long = readBytes().md5()
private fun File.loadKlibFilePaths(denormalize: Boolean): List<String> { private fun File.loadKlibFilePaths(): List<String> {
val libs = jsResolveLibraries(listOf(runtimeKlibPath, canonicalPath), emptyList(), DummyLogger).getFullList() val libs = jsResolveLibraries(listOf(runtimeKlibPath, canonicalPath), emptyList(), DummyLogger).getFullList()
val lib = libs.last() val lib = libs.last()
val fileSize = lib.fileCount() val fileSize = lib.fileCount()
@@ -82,11 +82,7 @@ class FilePathsInKlibTest : CodegenTestCase() {
val fileProto = IrFile.parseFrom(fileStream, extReg) val fileProto = IrFile.parseFrom(fileStream, extReg)
val fileName = fileProto.fileEntry.name val fileName = fileProto.fileEntry.name
if (denormalize) { result.add(fileName)
result.add(fileName.replace("/", File.separator))
} else {
result.add(fileName)
}
} }
return result return result
@@ -149,7 +145,7 @@ class FilePathsInKlibTest : CodegenTestCase() {
configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(workingDirFile.canonicalPath)) configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(workingDirFile.canonicalPath))
val artifact = compileKlibs(testFiles, configuration, workingDirFile) val artifact = compileKlibs(testFiles, configuration, workingDirFile)
val moduleAPaths = artifact.loadKlibFilePaths(denormalize = true) val moduleAPaths = artifact.loadKlibFilePaths().map { it.replace("/", File.separator) }
val dirAPaths = workingDirFile.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.relativeTo(workingDirFile).path } val dirAPaths = workingDirFile.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.relativeTo(workingDirFile).path }
assertSameElements(dirAPaths, moduleAPaths) assertSameElements(dirAPaths, moduleAPaths)
@@ -168,7 +164,7 @@ class FilePathsInKlibTest : CodegenTestCase() {
configuration.put(CommonConfigurationKeys.KLIB_NORMALIZE_ABSOLUTE_PATH, true) configuration.put(CommonConfigurationKeys.KLIB_NORMALIZE_ABSOLUTE_PATH, true)
val artifact = compileKlibs(testFiles, configuration, workingDirFile) val artifact = compileKlibs(testFiles, configuration, workingDirFile)
val modulePaths = artifact.loadKlibFilePaths(denormalize = true) val modulePaths = artifact.loadKlibFilePaths().map { it.replace("/", File.separator) }
val dirCanonicalPaths = workingDirFile.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.canonicalPath } val dirCanonicalPaths = workingDirFile.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.canonicalPath }
assertSameElements(modulePaths, dirCanonicalPaths) assertSameElements(modulePaths, dirCanonicalPaths)
@@ -192,7 +188,7 @@ class FilePathsInKlibTest : CodegenTestCase() {
configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(dummyFile.canonicalPath)) configuration.put(CommonConfigurationKeys.KLIB_RELATIVE_PATH_BASES, listOf(dummyFile.canonicalPath))
val artifact = compileKlibs(testFiles, configuration, workingDirFile) val artifact = compileKlibs(testFiles, configuration, workingDirFile)
val modulePaths = artifact.loadKlibFilePaths(denormalize = false) val modulePaths = artifact.loadKlibFilePaths()
val dirCanonicalPaths = workingDirFile.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.canonicalPath } val dirCanonicalPaths = workingDirFile.listFiles { _, name -> name.endsWith(".kt") }!!.map { it.canonicalPath }
assertSameElements(modulePaths.map { it.normalizePath() }, dirCanonicalPaths.map { it.normalizePath() }) assertSameElements(modulePaths.map { it.normalizePath() }, dirCanonicalPaths.map { it.normalizePath() })