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

Rename jet -> kotlin in idea tests

Browse Source 
org.jetbrains.jet -> org.jetbrains.kotlin (except 'plugin' subpackage)
This commit is contained in:
Alexander Udalov
2015-01-12 11:55:44 +03:00
parent 0e8b00c1f4
commit 09942d7c09
88 changed files with 227 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/runConfigurations/Smart_Completion_Tests.xml
Generated
+7 -7
View File
@@ -2,14 +2,14 @@
<configuration default="false" name="Smart Completion Tests" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
<pattern>
<option name="PATTERN" value="org.jetbrains.jet.completion.handlers.*" />
<option name="PATTERN" value="org.jetbrains.kotlin.completion.handlers.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<module name="idea" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" value="" />
<option name="PACKAGE_NAME" value="org.jetbrains.jet.completion.handlers" />
<option name="PACKAGE_NAME" value="org.jetbrains.kotlin.completion.handlers" />
<option name="MAIN_CLASS_NAME" value="" />
<option name="METHOD_NAME" value="" />
<option name="TEST_OBJECT" value="pattern" />
@@ -23,11 +23,11 @@
</option>
<envs />
<patterns>
<pattern testClass="org.jetbrains.jet.completion.JvmSmartCompletionTestGenerated" />
<pattern testClass="org.jetbrains.jet.completion.handlers.SmartCompletionHandlerTestGenerated" />
<pattern testClass="org.jetbrains.jet.completion.handlers.SmartCompletionMultifileHandlerTest" />
<pattern testClass="org.jetbrains.jet.completion.weighers.SmartCompletionWeigherTestGenerated" />
<pattern testClass="org.jetbrains.jet.completion.MultiFileSmartCompletionTestGenerated" />
<pattern testClass="org.jetbrains.kotlin.completion.JvmSmartCompletionTestGenerated" />
<pattern testClass="org.jetbrains.kotlin.completion.handlers.SmartCompletionHandlerTestGenerated" />
<pattern testClass="org.jetbrains.kotlin.completion.handlers.SmartCompletionMultifileHandlerTest" />
<pattern testClass="org.jetbrains.kotlin.completion.weighers.SmartCompletionWeigherTestGenerated" />
<pattern testClass="org.jetbrains.kotlin.completion.MultiFileSmartCompletionTestGenerated" />
</patterns>
<RunnerSettings RunnerId="Debug">
<option name="DEBUG_PORT" value="" />
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+23 -23
View File
@@ -43,11 +43,11 @@ import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest
import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest
import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest
import org.jetbrains.jet.completion.AbstractJSBasicCompletionTest
import org.jetbrains.jet.completion.AbstractKeywordCompletionTest
import org.jetbrains.jet.completion.AbstractJvmSmartCompletionTest
import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
import org.jetbrains.jet.completion.AbstractJvmWithLibBasicCompletionTest
import org.jetbrains.kotlin.completion.AbstractJSBasicCompletionTest
import org.jetbrains.kotlin.completion.AbstractKeywordCompletionTest
import org.jetbrains.kotlin.completion.AbstractJvmSmartCompletionTest
import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest
import org.jetbrains.kotlin.completion.AbstractJvmWithLibBasicCompletionTest
import org.jetbrains.jet.plugin.navigation.AbstractGotoSuperTest
import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixMultiFileTest
import org.jetbrains.jet.plugin.highlighter.AbstractHighlightingTest
@@ -59,16 +59,16 @@ import org.jetbrains.jet.plugin.hierarchy.AbstractHierarchyTest
import org.jetbrains.jet.plugin.codeInsight.moveUpDown.AbstractCodeMoverTest
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.kotlin.plugin.editor.quickDoc.AbstractJetQuickDocProviderTest
import org.jetbrains.kotlin.safeDelete.AbstractJetSafeDeleteTest
import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveTest
import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveWithLibTest
import org.jetbrains.jet.findUsages.AbstractJetFindUsagesTest
import org.jetbrains.kotlin.findUsages.AbstractJetFindUsagesTest
import org.jetbrains.jet.plugin.configuration.AbstractConfigureProjectByChangingFileTest
import org.jetbrains.jet.formatter.AbstractJetFormatterTest
import org.jetbrains.kotlin.formatter.AbstractJetFormatterTest
import org.jetbrains.jet.plugin.highlighter.AbstractDiagnosticMessageTest
import org.jetbrains.jet.plugin.codeInsight.AbstractOutOfBlockModificationTest
import org.jetbrains.jet.completion.AbstractDataFlowValueRenderingTest
import org.jetbrains.kotlin.completion.AbstractDataFlowValueRenderingTest
import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationParameterTest
import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest
import org.jetbrains.kotlin.resolve.calls.AbstractResolvedCallsTest
@@ -76,14 +76,14 @@ import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel
import org.jetbrains.kotlin.generators.tests.generator.TestClassModel
import org.jetbrains.jet.plugin.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
import org.jetbrains.jet.shortenRefs.AbstractShortenRefsTest
import org.jetbrains.jet.completion.handlers.AbstractSmartCompletionHandlerTest
import org.jetbrains.kotlin.shortenRefs.AbstractShortenRefsTest
import org.jetbrains.kotlin.completion.handlers.AbstractSmartCompletionHandlerTest
import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil
import org.jetbrains.kotlin.plugin.resolve.AbstractAdditionalResolveDescriptorRendererTest
import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInLibrarySourcesTest
import org.jetbrains.kotlin.resolve.constraintSystem.AbstractConstraintSystemTest
import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest
import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest
import org.jetbrains.kotlin.completion.AbstractCompiledKotlinInJavaCompletionTest
import org.jetbrains.kotlin.completion.AbstractKotlinSourceInJavaCompletionTest
import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib
import org.jetbrains.jet.plugin.codeInsight.AbstractInsertImportOnPasteTest
import org.jetbrains.jet.plugin.codeInsight.AbstractLineMarkersTest
@@ -98,9 +98,9 @@ import org.jetbrains.jet.plugin.stubs.AbstractStubBuilderTest
import org.jetbrains.jet.plugin.codeInsight.AbstractJetInspectionTest
import org.jetbrains.jet.plugin.debugger.AbstractKotlinSteppingTest
import org.jetbrains.jet.plugin.debugger.AbstractJetPositionManagerTest
import org.jetbrains.jet.completion.AbstractMultiFileJvmBasicCompletionTest
import org.jetbrains.kotlin.completion.AbstractMultiFileJvmBasicCompletionTest
import org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable.AbstractJetExtractionTest
import org.jetbrains.jet.formatter.AbstractJetTypingIndentationTestBase
import org.jetbrains.kotlin.formatter.AbstractJetTypingIndentationTestBase
import org.jetbrains.jet.plugin.debugger.evaluate.AbstractKotlinEvaluateExpressionTest
import org.jetbrains.jet.plugin.debugger.evaluate.AbstractSelectExpressionForDebuggerTest
import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionTest
@@ -116,9 +116,9 @@ 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
import org.jetbrains.jet.psi.patternMatching.AbstractJetPsiUnifierTest
import org.jetbrains.jet.completion.weighers.AbstractBasicCompletionWeigherTest
import org.jetbrains.jet.completion.weighers.AbstractSmartCompletionWeigherTest
import org.jetbrains.kotlin.psi.patternMatching.AbstractJetPsiUnifierTest
import org.jetbrains.kotlin.completion.weighers.AbstractBasicCompletionWeigherTest
import org.jetbrains.kotlin.completion.weighers.AbstractSmartCompletionWeigherTest
import org.jetbrains.kotlin.generators.tests.reservedWords.generateTestDataForReservedWords
import org.jetbrains.kotlin.js.test.semantics.AbstractReservedWordTest
import org.jetbrains.kotlin.plugin.resolve.AbstractReferenceResolveInJavaTest
@@ -126,8 +126,8 @@ 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.kotlin.completion.AbstractMultiFileSmartCompletionTest
import org.jetbrains.kotlin.completion.handlers.AbstractCompletionCharFilterTest
import org.jetbrains.kotlin.plugin.resolve.AbstractPartialBodyResolveTest
import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib
import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest
@@ -136,10 +136,10 @@ import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletion
import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest
import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest
import org.jetbrains.kotlin.js.test.semantics.AbstractMultiModuleTest
import org.jetbrains.jet.completion.handlers.AbstractBasicCompletionHandlerTest
import org.jetbrains.kotlin.completion.handlers.AbstractBasicCompletionHandlerTest
import org.jetbrains.jet.plugin.decompiler.stubBuilder.AbstractClsStubBuilderTest
import org.jetbrains.kotlin.codegen.AbstractLineNumberTest
import org.jetbrains.jet.completion.handlers.AbstractKeywordCompletionHandlerTest
import org.jetbrains.kotlin.completion.handlers.AbstractKeywordCompletionHandlerTest
fun main(args: Array<String>) {
System.setProperty("java.awt.headless", "true")
idea/tests/org/jetbrains/jet/plugin/JetJdkAndLibraryProjectDescriptor.java
+1 -1
View File
@@ -29,7 +29,7 @@ import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import java.io.File;
idea/tests/org/jetbrains/jet/plugin/JetStdJSProjectDescriptor.java
+2 -2
View File
@@ -27,7 +27,7 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEdito
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.framework.JSLibraryStdDescription;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
public class JetStdJSProjectDescriptor implements LightProjectDescriptor {
public static final JetStdJSProjectDescriptor INSTANCE = new JetStdJSProjectDescriptor();
@@ -53,4 +53,4 @@ public class JetStdJSProjectDescriptor implements LightProjectDescriptor {
ConfigLibraryUtil.addLibrary(editor, model);
}
}
}
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt
+1 -1
View File
@@ -30,7 +30,7 @@ import com.intellij.testFramework.InspectionTestUtil
import com.intellij.codeInspection.InspectionManager
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import org.jetbrains.kotlin.test.JetTestCaseBuilder
import org.jetbrains.jet.testing.ConfigLibraryUtil
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import com.intellij.testFramework.IdeaTestUtil
import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.projectRoots.Sdk
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java
+4 -4
View File
@@ -29,14 +29,14 @@ import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.ExpectedHighlightingData;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.highlighter.markers.SuperDeclarationMarkerNavigationHandler;
import org.jetbrains.jet.plugin.navigation.NavigationTestUtils;
import org.jetbrains.jet.testing.ReferenceUtils;
import org.jetbrains.jet.testing.TagsTestDataUtil;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.ReferenceUtils;
import org.jetbrains.kotlin.test.TagsTestDataUtil;
import org.junit.Assert;
import java.io.File;
idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java
+5 -5
View File
@@ -31,16 +31,16 @@ import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.resolve.OverrideResolver;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.jet.testing.TagsTestDataUtil;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TagsTestDataUtil;
import org.jetbrains.kotlin.utils.UtilsPackage;
import org.junit.Assert;
idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java
+9 -9
View File
@@ -33,18 +33,18 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage;
import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.MockLibraryUtil;
import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.jetbrains.kotlin.asJava.FakeLightClassForFileOfPackage;
import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage;
import java.io.File;
import java.util.ArrayList;
idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt
+3 -4
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.debugger.evaluate
import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest
import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import com.intellij.psi.PsiElement
import com.intellij.openapi.util.io.FileUtil
@@ -33,11 +33,10 @@ import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
import org.jetbrains.kotlin.psi.JetTypeReference
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.jet.completion.ExpectedCompletionUtils
import org.jetbrains.kotlin.completion.ExpectedCompletionUtils
import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.jet.completion.handlers.AbstractCompletionHandlerTest
import org.jetbrains.kotlin.completion.handlers.AbstractCompletionHandlerTest
import com.intellij.codeInsight.completion.CompletionType
import org.jetbrains.kotlin.test.JetTestUtils
public abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest() {
override fun doTest(filePath: String) {
idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt
+2 -2
View File
@@ -16,13 +16,13 @@
package org.jetbrains.jet.plugin.debugger.evaluate
import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest
import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetFunction
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.jet.completion.util.testCompletion
import org.jetbrains.kotlin.completion.util.testCompletion
import org.jetbrains.jet.plugin.project.TargetPlatform
import com.intellij.codeInsight.completion.CompletionType
import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor
idea/tests/org/jetbrains/jet/plugin/folding/AbstractKotlinFoldingTest.java
+1 -1
View File
@@ -28,7 +28,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.jet.testing.SettingsConfigurator;
import org.jetbrains.kotlin.test.SettingsConfigurator;
import org.junit.Assert;
import javax.annotation.Nullable;
idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java
+3 -3
View File
@@ -22,10 +22,10 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.jet.testing.TagsTestDataUtil;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.TagsTestDataUtil;
import java.io.File;
import java.util.List;
@@ -63,4 +63,4 @@ public abstract class AbstractHighlightingTest extends JetLightCodeInsightFixtur
protected String getTestDataPath() {
return "";
}
}
}
idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java
+3 -3
View File
@@ -24,11 +24,11 @@ import com.intellij.openapi.util.io.FileUtil;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.util.PathUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.DirectiveBasedActionUtils;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.junit.Assert;
import java.io.File;
idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java
+2 -2
View File
@@ -30,10 +30,10 @@ import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.ReferenceUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.jetbrains.jet.testing.ReferenceUtils;
import org.junit.Assert;
import java.util.ArrayList;
idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java
+1 -1
View File
@@ -35,7 +35,7 @@ import junit.framework.TestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.testing.ReferenceUtils;
import org.jetbrains.kotlin.test.ReferenceUtils;
import org.junit.Assert;
import java.util.*;
idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java
+4 -4
View File
@@ -31,13 +31,13 @@ import junit.framework.ComparisonFailure;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.DirectiveBasedActionUtils;
import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import java.io.File;
import java.io.FilenameFilter;
idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java
+3 -3
View File
@@ -29,13 +29,13 @@ import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement;
import org.apache.commons.lang.SystemUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.jet.plugin.DirectiveBasedActionUtils;
import org.jetbrains.jet.plugin.KotlinLightQuickFixTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.jetbrains.jet.testing.ConfigLibraryUtil;
import org.junit.Assert;
import java.io.File;
idea/tests/org/jetbrains/jet/plugin/quickfix/AddOpenToClassDeclarationTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.testFramework.PsiTestUtil;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.testing.LocalFileSystemUtils;
import org.jetbrains.kotlin.test.LocalFileSystemUtils;
public class AddOpenToClassDeclarationTest extends AbstractQuickFixMultiFileTest {
@Override
idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt
+1 -1
View File
@@ -36,7 +36,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper
import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions
import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractableCodeDescriptor
import org.jetbrains.jet.testing.ConfigLibraryUtil
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData
import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions
idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
+1 -1
View File
@@ -53,7 +53,7 @@ import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKo
import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.jet.plugin.search.allScope
import org.jetbrains.jet.testing.ConfigLibraryUtil
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.jet.plugin.util.application.runWriteAction
public abstract class AbstractJetMoveTest : MultiFileTestCase() {
idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt
+1 -8
View File
@@ -40,19 +40,12 @@ import com.intellij.openapi.roots.ModuleRootModificationUtil
import org.jetbrains.jet.plugin.search.allScope
import org.jetbrains.jet.plugin.util.application.runWriteAction
import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex
import org.jetbrains.kotlin.psi.JetNamedFunction
import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
import org.jetbrains.kotlin.psi.JetNamedDeclaration
import java.util.ArrayList
import com.intellij.psi.PsiComment
import org.jetbrains.kotlin.psi.psiUtil.siblings
import org.jetbrains.kotlin.psi.JetClass
import org.jetbrains.kotlin.psi.JetObjectDeclaration
import org.jetbrains.kotlin.psi.JetClassOrObject
import com.intellij.psi.PsiManager
import org.jetbrains.jet.testing.ConfigLibraryUtil
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
private val RUN_PREFIX = "// RUN: "
idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java
+1 -1
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.
idea/tests/org/jetbrains/jet/completion/AbstractCompiledKotlinInJavaCompletionTest.java → idea/tests/org/jetbrains/kotlin/completion/AbstractCompiledKotlinInJavaCompletionTest.java
+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.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
idea/tests/org/jetbrains/jet/completion/AbstractJSBasicCompletionTest.java → idea/tests/org/jetbrains/kotlin/completion/AbstractJSBasicCompletionTest.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.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
idea/tests/org/jetbrains/jet/completion/AbstractJvmBasicCompletionTest.java → idea/tests/org/jetbrains/kotlin/completion/AbstractJvmBasicCompletionTest.java
+3 -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,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
@@ -39,4 +39,4 @@ public abstract class AbstractJvmBasicCompletionTest extends JetFixtureCompletio
protected LookupElement[] complete(int invocationCount) {
return myFixture.complete(CompletionType.BASIC, invocationCount);
}
}
}
idea/tests/org/jetbrains/jet/completion/AbstractJvmSmartCompletionTest.java → idea/tests/org/jetbrains/kotlin/completion/AbstractJvmSmartCompletionTest.java
+3 -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,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
@@ -39,4 +39,4 @@ public abstract class AbstractJvmSmartCompletionTest extends JetFixtureCompletio
protected LookupElement[] complete(int invocationCount) {
return myFixture.complete(CompletionType.SMART, invocationCount);
}
}
}
idea/tests/org/jetbrains/jet/completion/AbstractJvmWithLibBasicCompletionTest.java → idea/tests/org/jetbrains/kotlin/completion/AbstractJvmWithLibBasicCompletionTest.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.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
idea/tests/org/jetbrains/jet/completion/AbstractKeywordCompletionTest.kt → idea/tests/org/jetbrains/kotlin/completion/AbstractKeywordCompletionTest.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.completion
package org.jetbrains.kotlin.completion
import com.intellij.codeInsight.completion.CompletionType
import com.intellij.codeInsight.lookup.LookupElement
idea/tests/org/jetbrains/jet/completion/AbstractKotlinSourceInJavaCompletionTest.java → idea/tests/org/jetbrains/kotlin/completion/AbstractKotlinSourceInJavaCompletionTest.java
+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.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.lookup.LookupElement;
idea/tests/org/jetbrains/jet/completion/AbstractMultiFileJvmBasicCompletionTest.kt → idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileJvmBasicCompletionTest.kt
+3 -7
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,13 +14,9 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion
package org.jetbrains.kotlin.completion
import com.intellij.codeInsight.lookup.LookupElement
import kotlin.Function0
import kotlin.Function1
import kotlin.Unit
import org.jetbrains.jet.completion.util.*
import org.jetbrains.kotlin.completion.util.*
import org.jetbrains.jet.plugin.KotlinCompletionTestCase
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.jet.plugin.project.TargetPlatform
idea/tests/org/jetbrains/jet/completion/AbstractMultiFileSmartCompletionTest.kt → idea/tests/org/jetbrains/kotlin/completion/AbstractMultiFileSmartCompletionTest.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,9 +14,9 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion
package org.jetbrains.kotlin.completion
import org.jetbrains.jet.completion.util.*
import org.jetbrains.kotlin.completion.util.*
import org.jetbrains.jet.plugin.KotlinCompletionTestCase
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.jet.plugin.project.TargetPlatform
idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/CompletionTestUtil.kt → idea/tests/org/jetbrains/kotlin/completion/CompletionTestUtil.kt
+4 -4
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,12 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.util
package org.jetbrains.kotlin.completion.util
import com.intellij.codeInsight.lookup.LookupElement
import org.jetbrains.jet.plugin.project.TargetPlatform
import org.junit.Assert
import org.jetbrains.jet.completion.ExpectedCompletionUtils
import org.jetbrains.kotlin.completion.ExpectedCompletionUtils
import com.intellij.codeInsight.CodeInsightSettings
fun testCompletion(fileText: String, platform: TargetPlatform?, complete: (Int) -> Array<LookupElement>?, defaultInvocationCount: Int = 0) {
@@ -59,4 +59,4 @@ private fun testWithAutoCompleteSetting(fileText: String, doTest: () -> Unit) {
settings.AUTOCOMPLETE_ON_CODE_COMPLETION = oldValue1
settings.AUTOCOMPLETE_ON_SMART_TYPE_COMPLETION = oldValue2
}
}
}
idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt → idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTest.kt
+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.completion
package org.jetbrains.kotlin.completion
import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.jetbrains.kotlin.psi.JetFile
idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java → idea/tests/org/jetbrains/kotlin/completion/ExpectedCompletionUtils.java
+3 -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,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
@@ -31,9 +31,9 @@ import com.intellij.ui.JBColor;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.project.TargetPlatform;
import org.jetbrains.jet.plugin.stubs.AstAccessControl;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.junit.Assert;
import java.awt.*;
idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/JetFixtureCompletionBaseTestCase.java → idea/tests/org/jetbrains/kotlin/completion/JetFixtureCompletionBaseTestCase.java
+3 -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,17 +14,17 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.openapi.util.io.FileUtil;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.completion.util.UtilPackage;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.caches.resolve.LibraryModificationTracker;
import org.jetbrains.jet.plugin.project.TargetPlatform;
import org.jetbrains.kotlin.completion.util.UtilPackage;
import java.io.File;
idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion;
package org.jetbrains.kotlin.completion;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java → idea/tests/org/jetbrains/kotlin/completion/confidence/JetConfidenceTest.java
+3 -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,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.confidence;
package org.jetbrains.kotlin.completion.confidence;
import com.intellij.codeInsight.CodeInsightSettings;
import com.intellij.codeInsight.completion.CodeCompletionHandlerBase;
@@ -101,4 +101,4 @@ public class JetConfidenceTest extends LightCompletionTestCase {
new CodeCompletionHandlerBase(CompletionType.BASIC, false, true, true).invokeCompletion(
getProject(), getEditor(), 0, false, false);
}
}
}
idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt → idea/tests/org/jetbrains/kotlin/completion/handlers/AbstractCompletionHandlerTests.kt
+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.completion.handlers
package org.jetbrains.kotlin.completion.handlers
import com.intellij.codeInsight.completion.CompletionType
import org.jetbrains.kotlin.test.InTextDirectivesUtils
idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTest.kt → idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTest.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.completion.handlers
package org.jetbrains.kotlin.completion.handlers
import com.intellij.codeInsight.completion.CompletionType
import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings
@@ -170,4 +170,4 @@ public class BasicCompletionHandlerTest : CompletionHandlerTestBase(){
fun testImportedEnumMember() { doTest(1, "AAA", null, null, '\n') }
fun testInnerClass() { doTest(1, "Inner", null, null, '\n') }
}
}
idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/handlers/CompletionHandlerTestBase.kt → idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionHandlerTestBase.kt
+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.completion.handlers
package org.jetbrains.kotlin.completion.handlers
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
import com.intellij.codeInsight.completion.CompletionType
idea/tests/org/jetbrains/jet/completion/handlers/CompletionMultifileHandlerTest.java → idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionMultifileHandlerTest.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.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import org.jetbrains.jet.plugin.KotlinCompletionTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
idea/tests/org/jetbrains/jet/completion/handlers/JavaCompletionHandlerTest.java → idea/tests/org/jetbrains/kotlin/completion/handlers/JavaCompletionHandlerTest.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.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import org.jetbrains.jet.plugin.KotlinCompletionTestCase;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionMultifileHandlerTest.java → idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionMultifileHandlerTest.java
+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.completion.handlers;
package org.jetbrains.kotlin.completion.handlers;
import com.intellij.codeInsight.completion.CompletionType;
import org.jetbrains.jet.plugin.KotlinCompletionTestCase;
idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt → idea/tests/org/jetbrains/kotlin/completion/weighers/AbstractCompletionWeigherTest.kt
+2 -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.completion.weighers
package org.jetbrains.kotlin.completion.weighers
import com.intellij.codeInsight.completion.CompletionType
import org.jetbrains.kotlin.test.InTextDirectivesUtils
@@ -23,7 +23,6 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase
import org.testng.Assert
import org.jetbrains.kotlin.test.util.configureWithExtraFile
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
public abstract class AbstractCompletionWeigherTest(val completionType: CompletionType, val relativeTestDataPath: String) : JetLightCodeInsightFixtureTestCase() {
idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.weighers;
package org.jetbrains.kotlin.completion.weighers;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java → idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.completion.weighers;
package org.jetbrains.kotlin.completion.weighers;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java → idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java
+5 -5
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.findUsages;
package org.jetbrains.kotlin.findUsages;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
@@ -48,15 +48,15 @@ import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.plugin.findUsages.KotlinClassFindUsagesOptions;
import org.jetbrains.jet.plugin.findUsages.KotlinFunctionFindUsagesOptions;
import org.jetbrains.jet.plugin.findUsages.KotlinPropertyFindUsagesOptions;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File;
import java.io.FilenameFilter;
idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java → idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.findUsages;
package org.jetbrains.kotlin.findUsages;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java → idea/tests/org/jetbrains/kotlin/formatter/AbstractJetFormatterTest.java
+5 -5
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.formatter;
package org.jetbrains.kotlin.formatter;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
@@ -32,11 +32,11 @@ import com.intellij.testFramework.LightIdeaTestCase;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.jet.testing.SettingsConfigurator;
import org.jetbrains.kotlin.test.SettingsConfigurator;
import java.io.File;
import java.util.EnumMap;
idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java → idea/tests/org/jetbrains/kotlin/formatter/AbstractJetTypingIndentationTestBase.java
+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.formatter;
package org.jetbrains.kotlin.formatter;
import com.intellij.openapi.editor.CaretModel;
import com.intellij.openapi.util.io.FileUtil;
@@ -24,7 +24,7 @@ import com.intellij.testFramework.EditorTestUtil;
import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.jet.testing.SettingsConfigurator;
import org.jetbrains.kotlin.test.SettingsConfigurator;
import java.io.File;
idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java → idea/tests/org/jetbrains/kotlin/formatter/JetFormatSettingsUtil.java
+4 -4
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,14 +14,14 @@
* limitations under the License.
*/
package org.jetbrains.jet.formatter;
package org.jetbrains.kotlin.formatter;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
import com.intellij.testFramework.LightPlatformTestCase;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings;
import org.jetbrains.jet.testing.SettingsConfigurator;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.test.SettingsConfigurator;
public class JetFormatSettingsUtil {
private JetFormatSettingsUtil() {
idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java → idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.formatter;
package org.jetbrains.kotlin.formatter;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java → idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.formatter;
package org.jetbrains.kotlin.formatter;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/editor/JetCommenterTest.java → idea/tests/org/jetbrains/kotlin/plugin/editor/JetCommenterTest.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.editor;
package org.jetbrains.kotlin.plugin.editor;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.testFramework.EditorTestUtil;
idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.kt → idea/tests/org/jetbrains/kotlin/plugin/editor/TypedHandlerTest.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.editor
package org.jetbrains.kotlin.plugin.editor
import com.intellij.testFramework.EditorTestUtil
import com.intellij.testFramework.LightCodeInsightTestCase
idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java → idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/AbstractJetQuickDocProviderTest.java
+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.editor.quickDoc;
package org.jetbrains.kotlin.plugin.editor.quickDoc;
import com.intellij.codeInsight.documentation.DocumentationManager;
import com.intellij.codeInsight.navigation.CtrlMouseHandler;
@@ -24,9 +24,9 @@ import com.intellij.psi.PsiElement;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.util.UtilPackage;
import org.junit.Assert;
idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java → idea/tests/org/jetbrains/kotlin/plugin/editor/quickDoc/JetQuickDocProviderTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.editor.quickDoc;
package org.jetbrains.kotlin.plugin.editor.quickDoc;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/kotlin/plugin/resolve/AbstractReferenceResolveTest.java
+4 -4
View File
@@ -28,13 +28,13 @@ 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;
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestCaseBuilder;
import org.jetbrains.kotlin.test.ReferenceUtils;
import org.jetbrains.kotlin.test.util.UtilPackage;
import org.jetbrains.jet.testing.ReferenceUtils;
import org.junit.Assert;
import java.util.List;
idea/tests/org/jetbrains/jet/psi/StringTemplateExpressionManipulatorTest.kt → idea/tests/org/jetbrains/kotlin/psi/StringTemplateExpressionManipulatorTest.kt
+3 -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,17 +14,15 @@
* limitations under the License.
*/
package org.jetbrains.jet.psi
package org.jetbrains.kotlin.psi
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
import org.jetbrains.jet.plugin.JetLightProjectDescriptor
import org.jetbrains.kotlin.psi.JetStringTemplateExpression
import org.jetbrains.kotlin.psi.JetPsiFactory
import com.intellij.psi.ElementManipulators
import org.junit.Assert.*
import com.intellij.openapi.util.TextRange
public class StringTemplateExpressionManipulatorTest: JetLightCodeInsightFixtureTestCase() {
public class StringTemplateExpressionManipulatorTest : JetLightCodeInsightFixtureTestCase() {
public fun testSingleQuoted() {
doTestContentChange("\"a\"", "b", "\"b\"")
doTestContentChange("\"\"", "b", "\"b\"")
idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt → idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.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.psi.injection
package org.jetbrains.kotlin.psi.injection
import org.jetbrains.kotlin.psi.JetPsiFactory
import org.jetbrains.kotlin.psi.JetStringTemplateExpression
idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt → idea/tests/org/jetbrains/kotlin/psi/patternMatching/AbstractJetPsiUnifierTest.kt
+2 -7
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,17 +14,15 @@
* limitations under the License.
*/
package org.jetbrains.jet.psi.patternMatching
package org.jetbrains.kotlin.psi.patternMatching
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.jet.plugin.JetLightProjectDescriptor
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.psiUtil.parents
import com.intellij.openapi.util.TextRange
import org.jetbrains.kotlin.psi.JetElement
import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier
import org.jetbrains.jet.plugin.caches.resolve.analyzeFully
import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange
import java.io.File
import org.jetbrains.kotlin.test.JetTestUtils
@@ -32,9 +30,6 @@ import org.jetbrains.kotlin.psi.JetExpression
import org.jetbrains.kotlin.psi.JetTypeReference
import org.jetbrains.kotlin.psi.JetWhenCondition
import org.jetbrains.jet.plugin.DirectiveBasedActionUtils
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.jet.testing.ConfigLibraryUtil
import org.jetbrains.jet.plugin.PluginTestCaseBase
public abstract class AbstractJetPsiUnifierTest: JetLightCodeInsightFixtureTestCase() {
public fun doTest(filePath: String) {
idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java → idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.psi.patternMatching;
package org.jetbrains.kotlin.psi.patternMatching;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/safeDelete/AbstractJetSafeDeleteTest.java → idea/tests/org/jetbrains/kotlin/safeDelete/AbstractJetSafeDeleteTest.java
+3 -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,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.safeDelete;
package org.jetbrains.kotlin.safeDelete;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.editor.Editor;
@@ -26,10 +26,10 @@ import com.intellij.refactoring.BaseRefactoringProcessor;
import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase;
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.psi.*;
import java.io.File;
import java.util.ArrayList;
idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java → idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.safeDelete;
package org.jetbrains.kotlin.safeDelete;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java → idea/tests/org/jetbrains/kotlin/search/AbstractSearcherTest.java
+4 -4
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.search;
package org.jetbrains.kotlin.search;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.JavaPsiFacade;
@@ -24,8 +24,8 @@ import com.intellij.testFramework.LightProjectDescriptor;
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
import com.intellij.util.Query;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.JetLightProjectDescriptor;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.io.File;
import java.io.IOException;
@@ -73,4 +73,4 @@ public abstract class AbstractSearcherTest extends LightCodeInsightFixtureTestCa
protected LightProjectDescriptor getProjectDescriptor() {
return JetLightProjectDescriptor.INSTANCE;
}
}
}
idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java → idea/tests/org/jetbrains/kotlin/search/AnnotatedMembersSearchTest.java
+3 -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,13 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.search;
package org.jetbrains.kotlin.search;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.search.searches.AnnotatedMembersSearch;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.io.File;
import java.io.IOException;
idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java → idea/tests/org/jetbrains/kotlin/search/ClassInheritorsSearchTest.java
+3 -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,13 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.jet.search;
package org.jetbrains.kotlin.search;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.io.File;
import java.io.IOException;
idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java → idea/tests/org/jetbrains/kotlin/search/JUnitMembersSearcherTest.java
+3 -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,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.search;
package org.jetbrains.kotlin.search;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.io.FileUtil;
@@ -23,9 +23,9 @@ import com.intellij.psi.search.searches.AnnotatedMembersSearch;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.testFramework.LightProjectDescriptor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.io.File;
import java.io.IOException;
idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt → idea/tests/org/jetbrains/kotlin/shortenRefs/AbstractShortenRefsTest.kt
+2 -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,9 +14,8 @@
* limitations under the License.
*/
package org.jetbrains.jet.shortenRefs
package org.jetbrains.kotlin.shortenRefs
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor
import com.intellij.openapi.application.ApplicationManager
idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java → idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.shortenRefs;
package org.jetbrains.kotlin.shortenRefs;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.InnerTestClasses;
idea/tests/org/jetbrains/jet/testing/ConfigLibraryUtil.java → idea/tests/org/jetbrains/kotlin/test/ConfigLibraryUtil.java
+10 -12
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.testing;
package org.jetbrains.kotlin.test;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
@@ -58,19 +58,17 @@ public class ConfigLibraryUtil {
addLibrary(libraryEditor, module);
}
public static void unConfigureLibrary(final Module module, final Sdk sdk, String libraryName) {
public static void unConfigureLibrary(Module module, Sdk sdk, String libraryName) {
configureSdk(module, sdk);
removeLibrary(module, libraryName);
}
public static void configureSdk(
@NotNull final Module module,
@NotNull final Sdk sdk) {
public static void configureSdk(@NotNull final Module module, @NotNull final Sdk sdk) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
final ModifiableRootModel rootModel = rootManager.getModifiableModel();
ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
ModifiableRootModel rootModel = rootManager.getModifiableModel();
rootModel.setSdk(sdk);
rootModel.commit();
@@ -82,7 +80,7 @@ public class ConfigLibraryUtil {
return ApplicationManager.getApplication().runWriteAction(new Computable<Library>() {
@Override
public Library compute() {
final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
ModifiableRootModel model = rootManager.getModifiableModel();
Library library = addLibrary(editor, model);
@@ -97,7 +95,7 @@ public class ConfigLibraryUtil {
public static Library addLibrary(NewLibraryEditor editor, ModifiableRootModel model) {
Library library = model.getModuleLibraryTable().createLibrary(editor.getName());
final Library.ModifiableModel libModel = library.getModifiableModel();
Library.ModifiableModel libModel = library.getModifiableModel();
editor.applyTo((LibraryEx.ModifiableModelEx) libModel);
libModel.commit();
@@ -110,8 +108,8 @@ public class ConfigLibraryUtil {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
final ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
final ModifiableRootModel model = rootManager.getModifiableModel();
ModuleRootManager rootManager = ModuleRootManager.getInstance(module);
ModifiableRootModel model = rootManager.getModifiableModel();
for (OrderEntry orderEntry : model.getOrderEntries()) {
if (orderEntry instanceof LibraryOrderEntry) {
idea/tests/org/jetbrains/jet/testing/LocalFileSystemUtils.java → idea/tests/org/jetbrains/kotlin/test/LocalFileSystemUtils.java
+3 -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,14 +14,14 @@
* limitations under the License.
*/
package org.jetbrains.jet.testing;
package org.jetbrains.kotlin.test;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import org.jetbrains.annotations.NotNull;
public class LocalFileSystemUtils {
private LocalFileSystemUtils(){
private LocalFileSystemUtils() {
}
public static void refreshPath(@NotNull String path) {
idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java → idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java
+3 -4
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.testing;
package org.jetbrains.kotlin.test;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
@@ -25,10 +25,9 @@ import com.intellij.util.PathUtil;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.jetbrains.kotlin.psi.JetClass;
import org.jetbrains.kotlin.psi.JetObjectDeclaration;
import org.jetbrains.jet.plugin.PluginTestCaseBase;
import org.junit.Assert;
import java.util.List;
idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java → idea/tests/org/jetbrains/kotlin/test/SettingsConfigurator.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,12 +14,11 @@
* limitations under the License.
*/
package org.jetbrains.jet.testing;
package org.jetbrains.kotlin.test;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Pair;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
idea/tests/org/jetbrains/jet/testing/TagsTestDataUtil.java → idea/tests/org/jetbrains/kotlin/test/TagsTestDataUtil.java
+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.testing;
package org.jetbrains.kotlin.test;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;