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

Replace parent with parentFile, relativePath with relativeTo

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-01 20:21:54 +03:00
parent 3106458cc4
commit 25df3aac11
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt
+1 -1
View File
@@ -27,7 +27,7 @@ public abstract class AbstractBytecodeListingTest : CodegenTestCase() {
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL) createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.ALL)
loadFileByFullPath(filename) loadFileByFullPath(filename)
val ktFile = File(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) val generatedFiles = CodegenTestUtil.generateFiles(myEnvironment, myFiles)
.getClassFiles() .getClassFiles()
.sortedBy { it.relativePath } .sortedBy { it.relativePath }
compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt
+1 -1
View File
@@ -141,7 +141,7 @@ public abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdi
val packageScopes = arrayListOf<JetScope>() val packageScopes = arrayListOf<JetScope>()
val classes = arrayListOf<ClassDescriptor>() val classes = arrayListOf<ClassDescriptor>()
for (classFile in allClassFiles) { 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 klass = classLoader.loadClass(className).sure { "Couldn't load class $className" }
val header = ReflectKotlinClass.create(klass)?.getClassHeader() val header = ReflectKotlinClass.create(klass)?.getClassHeader()
js/js.tests/test/org/jetbrains/kotlin/js/test/MultipleModulesTranslationTest.kt
+1 -1
View File
@@ -106,7 +106,7 @@ public abstract class MultipleModulesTranslationTest(main: String) : BasicTest(m
var file = File(dir, name) var file = File(dir, name)
while (dir != null && dir.isDirectory() && !file.isFile()) { while (dir != null && dir.isDirectory() && !file.isFile()) {
dir = dir.parent dir = dir.parentFile
file = File(dir, name) file = File(dir, name)
} }
plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AbstractAndroidXml2KConversionTest.kt
+1 -1
View File
@@ -37,7 +37,7 @@ public abstract class AbstractAndroidXml2KConversionTest : UsefulTestCase() {
val layoutPaths = getResPaths(path) val layoutPaths = getResPaths(path)
val supportV4 = testDirectory.name.startsWith("support") val supportV4 = testDirectory.name.startsWith("support")
val parser = CliSyntheticFileGeneratorForConversionTest( 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 } val actual = parser.gen().toMap { it.name }