From 3b555857822fb48c15cc8f3e6a32a001ce2751ed Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 4 Apr 2022 15:28:30 +0200 Subject: [PATCH] [tests] Fix file path in testdata --- .../test/framework/services/libraries/TestModuleCompiler.kt | 2 +- .../class-declaration/abstract-classes/p-2/neg/1.9.fir.kt | 2 +- .../class-declaration/abstract-classes/p-2/neg/1.9.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt index 5bcdeaf4da9..6da54ee8756 100644 --- a/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt +++ b/analysis/analysis-test-framework/tests/org/jetbrains/kotlin/analysis/test/framework/services/libraries/TestModuleCompiler.kt @@ -43,7 +43,7 @@ internal object TestModuleCompiler { JarOutputStream(librarySourcesPath.outputStream(), manifest).use { jarOutputStream -> for (testFile in module.files) { val text = testServices.sourceFileProvider.getContentOfSourceFile(testFile) - addFileToJar(testFile.relativePath, text, jarOutputStream) + addFileToJar(testFile.name, text, jarOutputStream) } } return librarySourcesPath diff --git a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.fir.kt index 11d09a05049..a58e4d5e4e2 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.fir.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.fir.kt @@ -20,7 +20,7 @@ public abstract class BaseKotlin1 { } // MODULE: mainModule(libModule) -// FILE: JavaClassWithAbstractKotlinClass.java +// FILE: mainModule/JavaClassWithAbstractKotlinClass.java package mainModule import libModule.* diff --git a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.kt b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.kt index a5834b45ca0..3fca98e7c3c 100644 --- a/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.kt +++ b/compiler/tests-spec/testData/diagnostics/linked/declarations/classifier-declaration/class-declaration/abstract-classes/p-2/neg/1.9.kt @@ -31,7 +31,7 @@ public abstract class BaseKotlin1 { } // MODULE: mainModule(libModule) -// FILE: JavaClassWithAbstractKotlinClass.java +// FILE: mainModule/JavaClassWithAbstractKotlinClass.java package mainModule import libModule.*