From 25df3aac11e107de299c438593dcd5af4f6edf8d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 1 Oct 2015 20:21:54 +0300 Subject: [PATCH] Replace parent with parentFile, relativePath with relativeTo --- .../org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt | 2 +- .../jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt | 2 +- .../jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt | 2 +- .../resolve/android/test/AbstractAndroidXml2KConversionTest.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt index 8aa53e95d3e..2426edf3b62 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt @@ -27,7 +27,7 @@ public abstract class AbstractBytecodeListingTest : CodegenTestCase() { createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL) loadFileByFullPath(filename) val ktFile = File(filename) - val txtFile = File(ktFile.parent, ktFile.nameWithoutExtension + ".txt") + val txtFile = File(ktFile.parentFile, ktFile.nameWithoutExtension + ".txt") val generatedFiles = CodegenTestUtil.generateFiles(myEnvironment, myFiles) .getClassFiles() .sortedBy { it.relativePath } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 21dc941dda8..3efa080557f 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -141,7 +141,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi val packageScopes = arrayListOf() val classes = arrayListOf() for (classFile in allClassFiles) { - val className = tmpdir.relativePath(classFile).substringBeforeLast(".class").replace('/', '.').replace('\\', '.') + val className = classFile.relativeTo(tmpdir).substringBeforeLast(".class").replace('/', '.').replace('\\', '.') val klass = classLoader.loadClass(className).sure { "Couldn't load class $className" } val header = ReflectKotlinClass.create(klass)?.getClassHeader() diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt index 4fee712d2cb..787265bd7d9 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt @@ -106,7 +106,7 @@ public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(m var file = File(dir, name) while (dir != null && dir.isDirectory() && !file.isFile()) { - dir = dir.parent + dir = dir.parentFile file = File(dir, name) } diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt index fb2383184a3..578840cafee 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt @@ -37,7 +37,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() { val layoutPaths = getResPaths(path) val supportV4 = testDirectory.name.startsWith("support") val parser = CliSyntheticFileGeneratorForConversionTest( - jetCoreEnvironment.project, File(testDirectory.parent, "AndroidManifest.xml").path, layoutPaths, supportV4) + jetCoreEnvironment.project, File(testDirectory.parentFile, "AndroidManifest.xml").path, layoutPaths, supportV4) val actual = parser.gen().toMap { it.name }