From 0866d0517f92c34eeccf9f9c230338ad9a48fca2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 11:25:03 +0300 Subject: [PATCH] Rename jet -> kotlin in idea resolve tests org.jetbrains.jet.resolve -> org.jetbrains.kotlin.plugin.resolve --- .../kotlin/generators/tests/GenerateTests.kt | 16 ++++++++-------- .../java}/AbstractJavaTypeSubstitutorTest.java | 2 +- .../java}/JavaTypeSubstitutorTestGenerated.java | 2 +- ...tAdditionalResolveDescriptorRendererTest.java | 4 ++-- .../resolve/AbstractPartialBodyResolveTest.kt | 6 +++--- .../AbstractReferenceResolveInJavaTest.kt | 9 ++++----- ...stractReferenceResolveInLibrarySourcesTest.kt | 4 ++-- .../resolve/AbstractReferenceResolveTest.java | 7 ++++--- .../AbstractReferenceResolveWithLibTest.java | 5 ++--- ...eferenceToJavaWithWrongFileStructureTest.java | 8 +++++--- ...alResolveDescriptorRendererTestGenerated.java | 2 +- .../resolve/PartialBodyResolveTestGenerated.java | 2 +- .../ReferenceResolveInJavaTestGenerated.java | 2 +- ...enceResolveInLibrarySourcesTestGenerated.java | 2 +- .../resolve/ReferenceResolveTestGenerated.java | 2 +- .../ReferenceResolveWithLibTestGenerated.java | 2 +- ...oJavaWithWrongFileStructureTestGenerated.java | 2 +- 17 files changed, 39 insertions(+), 38 deletions(-) rename idea/tests/org/jetbrains/kotlin/{resolve/jvm => load/java}/AbstractJavaTypeSubstitutorTest.java (99%) rename idea/tests/org/jetbrains/kotlin/{resolve/jvm => load/java}/JavaTypeSubstitutorTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractAdditionalResolveDescriptorRendererTest.java (95%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractPartialBodyResolveTest.kt (98%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractReferenceResolveInJavaTest.kt (84%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt (97%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractReferenceResolveTest.java (98%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractReferenceResolveWithLibTest.java (91%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java (83%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/AdditionalResolveDescriptorRendererTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/PartialBodyResolveTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/ReferenceResolveInJavaTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java (98%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/ReferenceResolveTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/ReferenceResolveWithLibTestGenerated.java (99%) rename idea/tests/org/jetbrains/{jet => kotlin/plugin}/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java (97%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 6ad32391a28..6d159f1e4bc 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -61,8 +61,8 @@ import org.jetbrains.jet.plugin.refactoring.inline.AbstractInlineTest import org.jetbrains.jet.plugin.codeInsight.unwrap.AbstractUnwrapRemoveTest import org.jetbrains.jet.editor.quickDoc.AbstractJetQuickDocProviderTest import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest -import org.jetbrains.jet.resolve.AbstractReferenceResolveTest -import org.jetbrains.jet.resolve.AbstractReferenceResolveWithLibTest +import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveTest +import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveWithLibTest import org.jetbrains.jet.findUsages.AbstractJetFindUsagesTest import org.jetbrains.jet.plugin.configuration.AbstractConfigureProjectByChangingFileTest import org.jetbrains.jet.formatter.AbstractJetFormatterTest @@ -79,15 +79,15 @@ import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteCon import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil -import org.jetbrains.jet.resolve.AbstractAdditionalResolveDescriptorRendererTest -import org.jetbrains.jet.resolve.AbstractReferenceResolveInLibrarySourcesTest +import org.jetbrains.kotlin.plugin.resolve.AbstractAdditionalResolveDescriptorRendererTest +import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInLibrarySourcesTest import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib import org.jetbrains.jet.plugin.codeInsight.AbstractInsertImportOnPasteTest import org.jetbrains.jet.plugin.codeInsight.AbstractLineMarkersTest -import org.jetbrains.jet.resolve.AbstractReferenceToJavaWithWrongFileStructureTest +import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceToJavaWithWrongFileStructureTest import org.jetbrains.jet.plugin.navigation.AbstractKotlinGotoTest import org.jetbrains.jet.plugin.AbstractExpressionSelectionTest import org.jetbrains.jet.plugin.refactoring.move.AbstractJetMoveTest @@ -112,7 +112,7 @@ import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest -import org.jetbrains.kotlin.resolve.jvm.AbstractJavaTypeSubstitutorTest +import org.jetbrains.kotlin.load.java.AbstractJavaTypeSubstitutorTest import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest @@ -121,14 +121,14 @@ import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords import org.jetbrains.kotlin.js.test.semantics.AbstractReservedWordTest -import org.jetbrains.jet.resolve.AbstractReferenceResolveInJavaTest +import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInJavaTest import org.jetbrains.kotlin.js.test.semantics.AbstractBridgeTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterMultiFileTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterForWebDemoTest import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTest import org.jetbrains.jet.completion.AbstractMultiFileSmartCompletionTest import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest -import org.jetbrains.jet.resolve.AbstractPartialBodyResolveTest +import org.jetbrains.kotlin.plugin.resolve.AbstractPartialBodyResolveTest import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest diff --git a/idea/tests/org/jetbrains/kotlin/resolve/jvm/AbstractJavaTypeSubstitutorTest.java b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java similarity index 99% rename from idea/tests/org/jetbrains/kotlin/resolve/jvm/AbstractJavaTypeSubstitutorTest.java rename to idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java index 4832a3d92a1..d64f9b45041 100644 --- a/idea/tests/org/jetbrains/kotlin/resolve/jvm/AbstractJavaTypeSubstitutorTest.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.resolve.jvm; +package org.jetbrains.kotlin.load.java; import com.intellij.openapi.project.Project; import com.intellij.psi.*; diff --git a/idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java b/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java index 0da9afe6043..b2215c3899d 100644 --- a/idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.resolve.jvm; +package org.jetbrains.kotlin.load.java; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractAdditionalResolveDescriptorRendererTest.java similarity index 95% rename from idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractAdditionalResolveDescriptorRendererTest.java index 714a6c1267d..22ed4d143bf 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractAdditionalResolveDescriptorRendererTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractPartialBodyResolveTest.kt similarity index 98% rename from idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractPartialBodyResolveTest.kt index cadc66244cb..693d0f873bb 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractPartialBodyResolveTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve +package org.jetbrains.kotlin.plugin.resolve import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile @@ -199,4 +199,4 @@ public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtur } return builder.toString() } -} +} \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInJavaTest.kt b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInJavaTest.kt similarity index 84% rename from idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInJavaTest.kt rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInJavaTest.kt index b9c0f23ff82..c86498d7f29 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInJavaTest.kt +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInJavaTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve +package org.jetbrains.kotlin.plugin.resolve import org.jetbrains.jet.plugin.PluginTestCaseBase private val FILE_WITH_KOTLIN_CODE = PluginTestCaseBase.getTestDataPathBase() + "/resolve/referenceInJava/dependencies.kt" public abstract class AbstractReferenceResolveInJavaTest : AbstractReferenceResolveTest() { - protected override fun doTest(path: String) { assert(path.endsWith(".java")) { path } - myFixture!!.configureByFile(FILE_WITH_KOTLIN_CODE) - myFixture!!.configureByFile(path) + myFixture.configureByFile(FILE_WITH_KOTLIN_CODE) + myFixture.configureByFile(path) performChecks() } } diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt similarity index 97% rename from idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index f371c3b43c9..7241dedb39a 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve +package org.jetbrains.kotlin.plugin.resolve import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.navigation.NavigationTestUtils diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java similarity index 98% rename from idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java index 0cf18ae34eb..9ad77fe41dc 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.google.common.collect.Lists; import com.google.common.collect.Ordering; @@ -27,6 +27,7 @@ import com.intellij.psi.impl.file.impl.FileManager; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestCaseBuilder; import org.jetbrains.kotlin.psi.JetFile; @@ -179,7 +180,7 @@ public abstract class AbstractReferenceResolveTest extends LightPlatformCodeInsi } } - @NotNull + @Nullable @Override protected LightProjectDescriptor getProjectDescriptor() { return JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveWithLibTest.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveWithLibTest.java similarity index 91% rename from idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveWithLibTest.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveWithLibTest.java index b59cef31e03..a2b07c05f6e 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveWithLibTest.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveWithLibTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.LightProjectDescriptor; -import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java similarity index 83% rename from idea/tests/org/jetbrains/jet/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java index 3da6944b94e..cca1e52c5a4 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; + +import org.jetbrains.annotations.NotNull; public abstract class AbstractReferenceToJavaWithWrongFileStructureTest extends AbstractReferenceResolveTest { @Override - protected void doTest(String path) { + protected void doTest(@NotNull String path) { //this line intentionally creates wrong file structure for java file myFixture.configureByFile(path.replace(".kt", ".java")); myFixture.configureByFile(path); diff --git a/idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AdditionalResolveDescriptorRendererTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/AdditionalResolveDescriptorRendererTestGenerated.java index d455977a3bf..4cd46523202 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/AdditionalResolveDescriptorRendererTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/PartialBodyResolveTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/PartialBodyResolveTestGenerated.java index b4bda52c733..87025c146f8 100644 --- a/idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/PartialBodyResolveTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInJavaTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInJavaTestGenerated.java index c26663da1d1..e39415d287d 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInJavaTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java index e6b5faa6f03..88e353ce584 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveTestGenerated.java index a61637b0d5b..6b1a3142178 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveWithLibTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveWithLibTestGenerated.java index efd484f3588..cd5f29dfe43 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveWithLibTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java similarity index 97% rename from idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java index b5e9d1f23fb..33ee3295b72 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.resolve; +package org.jetbrains.kotlin.plugin.resolve; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.InnerTestClasses;