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

Rename jet -> kotlin in idea resolve tests

Browse Source 
org.jetbrains.jet.resolve -> org.jetbrains.kotlin.plugin.resolve
This commit is contained in:
Alexander Udalov
2015-01-12 11:25:03 +03:00
parent 587a92717c
commit 0866d0517f
17 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+8 -8
View File
@@ -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
idea/tests/org/jetbrains/kotlin/resolve/jvm/AbstractJavaTypeSubstitutorTest.java → idea/tests/org/jetbrains/kotlin/load/java/AbstractJavaTypeSubstitutorTest.java
+1 -1
View File
@@ -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.*;
idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java → idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractAdditionalResolveDescriptorRendererTest.java
+2 -2
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractPartialBodyResolveTest.kt
+3 -3
View File
@@ -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()
}
}
}
idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInJavaTest.kt → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInJavaTest.kt
+4 -5
View File
@@ -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()
}
}
idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt
+2 -2
View File
@@ -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
idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java
+4 -3
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveWithLibTest.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveWithLibTest.java
+2 -3
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceToJavaWithWrongFileStructureTest.java
+5 -3
View File
@@ -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);
idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/AdditionalResolveDescriptorRendererTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/PartialBodyResolveTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInJavaTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceResolveWithLibTestGenerated.java
+1 -1
View File
@@ -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;
idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java
+1 -1
View File
@@ -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;