From b60621c42806d812ec0cc6b43868a32e64a0f124 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 14 Jan 2016 18:45:09 +0100 Subject: [PATCH] tests fixed --- .../smoke/scriptException/script.expected | 2 +- .../checkers/AbstractForeignAnnotationsTest.kt | 2 +- .../AbstractTopLevelMembersInvocationTest.java | 2 +- ...CompileKotlinAgainstCustomBinariesTest.java | 2 +- .../jetbrains/kotlin/test/MockLibraryUtil.java | 18 ++++++++++++++++-- .../JdkAndMockLibraryProjectDescriptor.java | 8 +++++--- ...ractJavaAgainstKotlinBinariesCheckerTest.kt | 2 +- .../resolve/AbstractIdeLightClassTest.kt | 2 +- .../HighlightingWithDependentLibrariesTest.kt | 4 ++-- .../idea/debugger/KotlinDebuggerTestCase.java | 3 ++- .../NavigateFromLibrarySourcesTest.kt | 4 +--- .../stubBuilder/AbstractClsStubBuilderTest.kt | 2 +- .../AbstractDecompiledTextBaseTest.kt | 5 +++-- .../textBuilder/AbstractDecompiledTextTest.kt | 7 ++++--- .../AbstractKotlinExceptionFilterTest.kt | 2 +- .../AbstractReferenceResolveWithLibTest.java | 2 +- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++-- .../general/JKJProject/src/java/JFirst.java | 2 +- .../general/JKJProject/src/kotlin/KFirst.kt | 2 +- .../KJCircularProject/src/java/JFirst.java | 4 ++-- .../KJCircularProject/src/kotlin/KFirst.kt | 2 +- .../general/KJKProject/src/java/JFirst.java | 2 +- .../general/KJKProject/src/kotlin/KFirst.kt | 2 +- .../general/KJKProject/src/kotlin/KSecond.kt | 2 +- 24 files changed, 52 insertions(+), 35 deletions(-) diff --git a/compiler/testData/integration/smoke/scriptException/script.expected b/compiler/testData/integration/smoke/scriptException/script.expected index 81f62029d9a..f2ccb8b1988 100644 --- a/compiler/testData/integration/smoke/scriptException/script.expected +++ b/compiler/testData/integration/smoke/scriptException/script.expected @@ -7,4 +7,4 @@ java.lang.IllegalStateException: my error at Script.a(Unknown Source) at Script.(Unknown Source) -Return code: 0 +Return code: 3 diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt index f693dbe380c..8848eb1c1b2 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsTest.kt @@ -30,7 +30,7 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() { override fun createCompilerConfiguration(javaFilesDir: File?): CompilerConfiguration { val annotationsFile = MockLibraryUtil.compileLibraryToJar( "compiler/testData/foreignAnnotations/annotations", - "foreign-annotations", /* addSources = */false) + "foreign-annotations", /* addSources = */false, /* allowKotlinPackage =*/ false) return KotlinTestUtils.compilerConfigurationForTests( ConfigurationKind.JDK_ONLY, diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java index ad956750261..85e3bf90cc8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java @@ -60,7 +60,7 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte File library = new File(root, LIBRARY); List classPath = library.exists() ? - Collections.singletonList(MockLibraryUtil.compileLibraryToJar(library.getPath(), LIBRARY, false)) : + Collections.singletonList(MockLibraryUtil.compileLibraryToJar(library.getPath(), LIBRARY, false, false)) : Collections.emptyList(); assert !sourceFiles.isEmpty() : getTestName(true) + " should contain at least one .kt file"; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 1531c7ba108..c75894603d0 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -71,7 +71,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { @NotNull private File compileLibrary(@NotNull String sourcePath, @NotNull String... extraClassPath) { return MockLibraryUtil.compileLibraryToJar( - new File(getTestDataDirectory(), sourcePath).getPath(), "customKotlinLib", false, extraClassPath + new File(getTestDataDirectory(), sourcePath).getPath(), "customKotlinLib", false, false, extraClassPath ); } diff --git a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java index f55bfc4789d..42865ebede9 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java @@ -53,13 +53,14 @@ public class MockLibraryUtil { @NotNull String jarName, boolean addSources, boolean isJsLibrary, + boolean allowKotlinPackage, @NotNull String... extraClasspath ) { if (isJsLibrary) { return compileJsLibraryToJar(sourcesPath, jarName, addSources); } else { - return compileLibraryToJar(sourcesPath, jarName, addSources, extraClasspath); + return compileLibraryToJar(sourcesPath, jarName, addSources, allowKotlinPackage, extraClasspath); } } @@ -68,6 +69,7 @@ public class MockLibraryUtil { @NotNull String sourcesPath, @NotNull String jarName, boolean addSources, + boolean allowKotlinPackage, @NotNull String... extraClasspath ) { try { @@ -78,7 +80,7 @@ public class MockLibraryUtil { File srcFile = new File(sourcesPath); List kotlinFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.kt"), srcFile); if (srcFile.isFile() || !kotlinFiles.isEmpty()) { - compileKotlin(sourcesPath, classesDir, extraClasspath); + compileKotlin(sourcesPath, classesDir, allowKotlinPackage, extraClasspath); } List javaFiles = FileUtil.findFilesByMask(Pattern.compile(".*\\.java"), srcFile); @@ -170,6 +172,15 @@ public class MockLibraryUtil { } public static void compileKotlin(@NotNull String sourcesPath, @NotNull File outDir, @NotNull String... extraClasspath) { + compileKotlin(sourcesPath, outDir, false, extraClasspath); + } + + public static void compileKotlin( + @NotNull String sourcesPath, + @NotNull File outDir, + boolean allowKotlinPackage, + @NotNull String... extraClasspath + ) { List classpath = new ArrayList(); if (new File(sourcesPath).isDirectory()) { classpath.add(sourcesPath); @@ -182,6 +193,9 @@ public class MockLibraryUtil { args.add(outDir.getAbsolutePath()); args.add("-classpath"); args.add(StringUtil.join(classpath, File.pathSeparator)); + if (allowKotlinPackage) { + args.add("-Xallow-kotlin-package"); + } runJvmCompiler(args); } diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java index ff9fa1c1a73..79747783728 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/JdkAndMockLibraryProjectDescriptor.java @@ -35,21 +35,23 @@ public class JdkAndMockLibraryProjectDescriptor extends KotlinLightProjectDescri private final boolean withSources; private final boolean withRuntime; private final boolean isJsLibrary; + private final boolean allowKotlinPackage; public JdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources) { - this(sourcesPath, withSources, false, false); + this(sourcesPath, withSources, false, false, false); } - public JdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources, boolean withRuntime, boolean isJsLibrary) { + public JdkAndMockLibraryProjectDescriptor(String sourcesPath, boolean withSources, boolean withRuntime, boolean isJsLibrary, boolean allowKotlinPackage) { this.sourcesPath = sourcesPath; this.withSources = withSources; this.withRuntime = withRuntime; this.isJsLibrary = isJsLibrary; + this.allowKotlinPackage = allowKotlinPackage; } @Override public void configureModule(@NotNull Module module, @NotNull ModifiableRootModel model) { - File libraryJar = MockLibraryUtil.compileLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, isJsLibrary); + File libraryJar = MockLibraryUtil.compileLibraryToJar(sourcesPath, LIBRARY_NAME, withSources, isJsLibrary, allowKotlinPackage); String jarUrl = getJarUrl(libraryJar); Library.ModifiableModel libraryModel = model.getModuleLibraryTable().getModifiableModel().createLibrary(LIBRARY_NAME).getModifiableModel(); diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt index b5684bb5c31..ac6a39b1bc8 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt @@ -32,7 +32,7 @@ abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgains val libraryName = "libFor" + testName val libraryJar = MockLibraryUtil.compileLibraryToJar( PluginTestCaseBase.getTestDataPathBase() + "/kotlinAndJavaChecker/javaAgainstKotlin/" + getTestName(false) + ".kt", - libraryName, false, false + libraryName, false, false, false ) val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/" ModuleRootModificationUtil.addModuleLibrary(module, jarUrl) diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt index 9ad8ecf1b8b..ef99da22c3e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt @@ -51,7 +51,7 @@ abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTestCase( Assert.assertTrue("File doesn't exist $filePath", File(filePath).exists()) - val libraryJar = MockLibraryUtil.compileLibraryToJar(filePath, libName(), false, false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(filePath, libName(), false, false, false) val jarUrl = "jar://" + FileUtilRt.toSystemIndependentName(libraryJar.absolutePath) + "!/" ModuleRootModificationUtil.addModuleLibrary(module, jarUrl) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt index 3834eb9dc29..84953ee11c2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/HighlightingWithDependentLibrariesTest.kt @@ -34,8 +34,8 @@ class HighlightingWithDependentLibrariesTest : KotlinLightCodeInsightFixtureTest override fun getProjectDescriptor() = object : KotlinLightProjectDescriptor() { override fun configureModule(module: Module, model: ModifiableRootModel) { - val compiledJar1 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib1", "lib1", false) - val compiledJar2 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", false, compiledJar1.canonicalPath) + val compiledJar1 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib1", "lib1", false, false) + val compiledJar2 = MockLibraryUtil.compileLibraryToJar("$TEST_DATA_PATH/lib2", "lib2", false, false, compiledJar1.canonicalPath) model.addLibraryEntry(createLibrary(compiledJar1, "baseLibrary")) model.addLibraryEntry(createLibrary(compiledJar2, "dependentLibrary")) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java index ced09511e18..a9e378d4114 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java @@ -118,7 +118,8 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase { if (!IS_TINY_APP_COMPILED) { String modulePath = getTestAppPath(); - CUSTOM_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(CUSTOM_LIBRARY_SOURCES.getPath(), "debuggerCustomLibrary", false); + CUSTOM_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(CUSTOM_LIBRARY_SOURCES.getPath(), "debuggerCustomLibrary", false, + false); String outputDir = getAppOutputPath(); String sourcesDir = modulePath + File.separator + "src"; diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt index 8bf2005d02d..563093438c1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateFromLibrarySourcesTest.kt @@ -31,9 +31,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.utils.sure -import kotlin.test.assertEquals import kotlin.test.assertTrue -import kotlin.test.fail class NavigateFromLibrarySourcesTest: LightCodeInsightFixtureTestCase() { fun testJdkClass() { @@ -73,7 +71,7 @@ class NavigateFromLibrarySourcesTest: LightCodeInsightFixtureTestCase() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/fromLibSource", true, true, false) + return JdkAndMockLibraryProjectDescriptor(PluginTestCaseBase.getTestDataPathBase() + "/decompiler/navigation/fromLibSource", true, true, false, false) } private fun checkNavigationElement(element: PsiElement, expectedFqName: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index 35fb2533de5..2fce1393040 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt @@ -55,7 +55,7 @@ abstract class AbstractClsStubBuilderTest : LightCodeInsightFixtureTestCase() { private fun getClassFileToDecompile(sourcePath: String): VirtualFile { val outDir = KotlinTestUtils.tmpDir("libForStubTest-" + sourcePath) - MockLibraryUtil.compileKotlin(sourcePath, outDir) + MockLibraryUtil.compileKotlin(sourcePath, outDir, true) val root = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(outDir)!! return root.findClassFileByName(lastSegment(sourcePath)) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt index 4bd6829ad10..a9ad85c201d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextBaseTest.kt @@ -32,7 +32,8 @@ import java.io.File abstract class AbstractDecompiledTextBaseTest( baseDirectory: String, - private val isJsLibrary: Boolean = false + private val isJsLibrary: Boolean = false, + private val allowKotlinPackage: Boolean = false ) : KotlinLightCodeInsightFixtureTestCase() { protected val TEST_DATA_PATH: String = PluginTestCaseBase.getTestDataPathBase() + baseDirectory @@ -54,7 +55,7 @@ abstract class AbstractDecompiledTextBaseTest( if (isAllFilesPresentInTest()) { return KotlinLightProjectDescriptor.INSTANCE } - return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(false), false, false, isJsLibrary) + return JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(false), false, false, isJsLibrary, allowKotlinPackage) } private fun checkThatFileWasParsedCorrectly(clsFile: PsiFile) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 791dd6896dd..4c371e2ec06 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -22,7 +22,8 @@ import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile import org.jetbrains.kotlin.idea.decompiler.navigation.NavigateToDecompiledLibraryTest import kotlin.test.assertTrue -abstract class AbstractDecompiledTextTest(baseDirectory: String) : AbstractDecompiledTextBaseTest(baseDirectory) { +abstract class AbstractDecompiledTextTest(baseDirectory: String, allowKotlinPackage: Boolean) + : AbstractDecompiledTextBaseTest(baseDirectory, allowKotlinPackage = allowKotlinPackage) { override fun getFileToDecompile(): VirtualFile = NavigateToDecompiledLibraryTest.getClassFile(TEST_PACKAGE, getTestName(false), myModule!!) @@ -30,6 +31,6 @@ abstract class AbstractDecompiledTextTest(baseDirectory: String) : AbstractDecom assertTrue(psiFile is KtClsFile, "Expecting decompiled kotlin file, was: " + psiFile.javaClass) } -abstract class AbstractCommonDecompiledTextTest : AbstractDecompiledTextTest("/decompiler/decompiledText") +abstract class AbstractCommonDecompiledTextTest : AbstractDecompiledTextTest("/decompiler/decompiledText", true) -abstract class AbstractJvmDecompiledTextTest : AbstractDecompiledTextTest("/decompiler/decompiledTextJvm") +abstract class AbstractJvmDecompiledTextTest : AbstractDecompiledTextTest("/decompiler/decompiledTextJvm", false) diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt b/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt index 9b2a42e27a2..48e7167e2e8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/AbstractKotlinExceptionFilterTest.kt @@ -58,7 +58,7 @@ abstract class AbstractKotlinExceptionFilterTest: KotlinCodeInsightTestCase() { val classLoader: URLClassLoader if (InTextDirectivesUtils.getPrefixedBoolean(fileText, "// WITH_MOCK_LIBRARY: ") ?: false) { if (MOCK_LIBRARY_JAR == null) { - MOCK_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(MOCK_LIBRARY_SOURCES, "mockLibrary", true) + MOCK_LIBRARY_JAR = MockLibraryUtil.compileLibraryToJar(MOCK_LIBRARY_SOURCES, "mockLibrary", true, false) } val mockLibraryJar = MOCK_LIBRARY_JAR ?: throw AssertionError("Mock library JAR is null") diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java index 2d037b1464c..98d62bcaf43 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AbstractReferenceResolveWithLibTest.java @@ -28,6 +28,6 @@ public abstract class AbstractReferenceResolveWithLibTest extends AbstractRefere if (PluginTestCaseBase.isAllFilesPresentTest(getTestName(true))) { return null; } - return new JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(true) + "Src", false, true, false); + return new JdkAndMockLibraryProjectDescriptor(TEST_DATA_PATH + "/" + getTestName(true) + "Src", false, true, false, false); } } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 7d95fafcdb5..ad8ca19e874 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -551,7 +551,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() - val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) @@ -562,7 +562,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testDependencyToOldKotlinLib() { initProject() - val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) diff --git a/jps-plugin/testData/general/JKJProject/src/java/JFirst.java b/jps-plugin/testData/general/JKJProject/src/java/JFirst.java index efaf2188e4d..bcdc7cbd4f7 100644 --- a/jps-plugin/testData/general/JKJProject/src/java/JFirst.java +++ b/jps-plugin/testData/general/JKJProject/src/java/JFirst.java @@ -2,6 +2,6 @@ package java; public class JFirst { public void foo() { - new kotlin.KFirst().foo(); + new myproject.kotlin.KFirst().foo(); } } \ No newline at end of file diff --git a/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt index 110919f715d..d3f96de0f7f 100644 --- a/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt +++ b/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KFirst() { fun foo() { diff --git a/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java b/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java index 686f3641b6c..5f400f48562 100644 --- a/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java +++ b/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java @@ -2,10 +2,10 @@ package java; public class JFirst { public void foo() { - new kotlin.KFirst().foo(); + new myproject.kotlin.KFirst().foo(); } public void bar() { - new kotlin.KFirst().bar(); + new myproject.kotlin.KFirst().bar(); } } \ No newline at end of file diff --git a/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt index 38a327f0713..0641836f93f 100644 --- a/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt +++ b/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KFirst() { fun foo() { diff --git a/jps-plugin/testData/general/KJKProject/src/java/JFirst.java b/jps-plugin/testData/general/KJKProject/src/java/JFirst.java index 5423b46e09b..1f4b4e26910 100644 --- a/jps-plugin/testData/general/KJKProject/src/java/JFirst.java +++ b/jps-plugin/testData/general/KJKProject/src/java/JFirst.java @@ -2,6 +2,6 @@ package java; public class JFirst { public void foo() { - new kotlin.KSecond().foo(); + new myproject.kotlin.KSecond().foo(); } } \ No newline at end of file diff --git a/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt b/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt index 29600c79f20..536328b73dc 100644 --- a/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt +++ b/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KFirst() { fun foo() { diff --git a/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt b/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt index 56d654aed84..af0f67ec98f 100644 --- a/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt +++ b/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KSecond() { fun foo() {