diff --git a/.idea/modules.xml b/.idea/modules.xml index 62525eb42de..17f006235b0 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -63,6 +63,7 @@ + @@ -74,6 +75,7 @@ + diff --git a/.idea/runConfigurations/All_Non_Compiler_Tests.xml b/.idea/runConfigurations/All_Non_Compiler_Tests.xml new file mode 100644 index 00000000000..653a90753a5 --- /dev/null +++ b/.idea/runConfigurations/All_Non_Compiler_Tests.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/All_Tests.xml b/.idea/runConfigurations/All_Tests.xml index f35c8fd0037..8c37e579165 100644 --- a/.idea/runConfigurations/All_Tests.xml +++ b/.idea/runConfigurations/All_Tests.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/build-common/build-common.iml b/build-common/build-common.iml index bfd5c022d4a..ccbb7b1aa3e 100644 --- a/build-common/build-common.iml +++ b/build-common/build-common.iml @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/compiler/android-tests/android-tests.iml b/compiler/android-tests/android-tests.iml index fe0070a1f31..70534e29e6c 100644 --- a/compiler/android-tests/android-tests.iml +++ b/compiler/android-tests/android-tests.iml @@ -9,7 +9,7 @@ - + diff --git a/compiler/tests/com/intellij/testFramework/TestDataFile.java b/compiler/tests-common/com/intellij/testFramework/TestDataFile.java similarity index 100% rename from compiler/tests/com/intellij/testFramework/TestDataFile.java rename to compiler/tests-common/com/intellij/testFramework/TestDataFile.java diff --git a/compiler/tests/com/intellij/testFramework/TestDataPath.java b/compiler/tests-common/com/intellij/testFramework/TestDataPath.java similarity index 100% rename from compiler/tests/com/intellij/testFramework/TestDataPath.java rename to compiler/tests-common/com/intellij/testFramework/TestDataPath.java diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests-common/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt rename to compiler/tests-common/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/TestCheckerUtil.java b/compiler/tests-common/org/jetbrains/kotlin/checkers/TestCheckerUtil.java new file mode 100644 index 00000000000..f5510651301 --- /dev/null +++ b/compiler/tests-common/org/jetbrains/kotlin/checkers/TestCheckerUtil.java @@ -0,0 +1,52 @@ +/* + * Copyright 2010-2016 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.checkers; + +import com.intellij.openapi.fileEditor.impl.LoadTextUtil; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiElementVisitor; +import com.intellij.psi.PsiFile; +import com.intellij.testFramework.LightVirtualFile; +import junit.framework.TestCase; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.psi.KtFile; +import org.jetbrains.kotlin.test.KotlinTestUtils; + + +public class TestCheckerUtil { + @NotNull + public static KtFile createCheckAndReturnPsiFile(@NotNull String fileName, @NotNull String text, @NotNull Project project) { + KtFile myFile = KotlinTestUtils.createFile(fileName, text, project); + ensureParsed(myFile); + TestCase.assertEquals("light virtual file text mismatch", text, ((LightVirtualFile) myFile.getVirtualFile()).getContent().toString()); + TestCase.assertEquals("virtual file text mismatch", text, LoadTextUtil.loadText(myFile.getVirtualFile())); + //noinspection ConstantConditions + TestCase.assertEquals("doc text mismatch", text, myFile.getViewProvider().getDocument().getText()); + TestCase.assertEquals("psi text mismatch", text, myFile.getText()); + return myFile; + } + + private static void ensureParsed(PsiFile file) { + file.accept(new PsiElementVisitor() { + @Override + public void visitElement(@NotNull PsiElement element) { + element.acceptChildren(this); + } + }); + } +} diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeListingTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstInlineKotlinTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java similarity index 98% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java index d40ecd2335d..3f62ae4386f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.text.StringUtil; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,7 +32,6 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt similarity index 97% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt index 9d996214b30..0330278b473 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractDumpDeclarationsTest.kt @@ -19,14 +19,12 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.codegen.* import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind -import org.jetbrains.kotlin.utils.* import java.io.File abstract class AbstractDumpDeclarationsTest : CodegenTestCase() { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 70323fdee39..0599361bddf 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -20,8 +20,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; -import kotlin.collections.CollectionsKt; import kotlin.Pair; +import kotlin.collections.CollectionsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/DxChecker.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/DxChecker.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/GenerationUtils.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.kt rename to compiler/tests-common/org/jetbrains/kotlin/codegen/InlineTestUtil.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt b/compiler/tests-common/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt rename to compiler/tests-common/org/jetbrains/kotlin/codegen/SMAPTestUtil.kt diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java rename to compiler/tests-common/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt b/compiler/tests-common/org/jetbrains/kotlin/daemon/LogCheckUtil.kt similarity index 98% rename from compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt rename to compiler/tests-common/org/jetbrains/kotlin/daemon/LogCheckUtil.kt index 86a4220915b..cd2a3bb53ad 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/LogCheckUtil.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/daemon/LogCheckUtil.kt @@ -16,9 +16,6 @@ package org.jetbrains.kotlin.daemon -import kotlin.text.MatchResult -import kotlin.text.Regex - /** * holder of a [regex] and optional [matchCheck] for additional checks on match result */ diff --git a/compiler/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java b/compiler/tests-common/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java similarity index 87% rename from compiler/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java rename to compiler/tests-common/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java index 6fb682f81e8..9cd7235591a 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/integration/AbstractAntTaskTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -29,7 +29,7 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase { testDataDir, "build.log", "-jar", getAntHome() + File.separator + "lib" + File.separator + "ant-launcher.jar", - "-Dkotlin.lib=" + getCompilerLib(), + "-Dkotlin.lib=" + KotlinIntegrationTestBase.getCompilerLib(), "-Dkotlin.runtime.jar=" + ForTestCompileRuntime.runtimeJarForTests().getAbsolutePath(), "-Dkotlin.reflect.jar=" + ForTestCompileRuntime.reflectJarForTests().getAbsolutePath(), "-Dtest.data=" + testDataDir, @@ -47,6 +47,6 @@ public abstract class AbstractAntTaskTest extends KotlinIntegrationTestBase { @NotNull private static String getAntHome() { - return getKotlinProjectHome().getAbsolutePath() + File.separator + "dependencies" + File.separator + "ant-1.8"; + return KotlinIntegrationTestBase.getKotlinProjectHome().getAbsolutePath() + File.separator + "dependencies" + File.separator + "ant-1.8"; } } diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java rename to compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java rename to compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt rename to compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/AbstractResolveTest.java similarity index 89% rename from compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/AbstractResolveTest.java index fca1bdfc602..1dd50b0f7ca 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/AbstractResolveTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/AbstractResolveTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve; import com.intellij.openapi.project.Project; -import org.jetbrains.kotlin.checkers.CheckerTestUtilTest; +import org.jetbrains.kotlin.checkers.TestCheckerUtil; import org.jetbrains.kotlin.psi.KtFile; public abstract class AbstractResolveTest extends ExtensibleResolveTestCase { @@ -31,7 +31,7 @@ public abstract class AbstractResolveTest extends ExtensibleResolveTestCase { ) { @Override protected KtFile createKtFile(String fileName, String text) { - return CheckerTestUtilTest.createCheckAndReturnPsiFile(fileName, text, project); + return TestCheckerUtil.createCheckAndReturnPsiFile(fileName, text, project); } }; } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveData.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveData.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveData.java diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 870a50f3575..1c9e41b1245 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -36,10 +36,10 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.KtAnnotationEntry; import org.jetbrains.kotlin.psi.KtAnnotationUseSiteTarget; import org.jetbrains.kotlin.psi.KtFile; +import org.jetbrains.kotlin.renderer.ClassifierNamePolicy; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererModifier; import org.jetbrains.kotlin.renderer.DescriptorRendererOptions; -import org.jetbrains.kotlin.renderer.ClassifierNamePolicy; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.MemberScope; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt index 76ef6c7bc25..92ab023ecfa 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationParameterTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.resolve.annotation import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.test.InTextDirectivesUtils -import java.io.File import org.jetbrains.kotlin.test.KotlinTestUtils +import java.io.File abstract class AbstractAnnotationParameterTest : AbstractAnnotationDescriptorResolveTest() { fun doTest(path: String) { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt similarity index 96% rename from compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt index 7a8b1a81da1..edb34362cba 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/calls/AbstractResolvedConstructorDelegationCallsTests.kt @@ -16,15 +16,14 @@ package org.jetbrains.kotlin.resolve.calls -import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.psi.KtFile import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtSecondaryConstructor -import org.jetbrains.kotlin.psi.debugText.getDebugText +import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall abstract class AbstractResolvedConstructorDelegationCallsTests : AbstractResolvedCallsTest() { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractCompileTimeConstantEvaluatorTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index a260b68ba1e..80a5cb1924e 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.TypeResolver import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns -import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope +import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.types.KotlinType import org.jetbrains.kotlin.types.KotlinTypeImpl diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt b/compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt rename to compiler/tests-common/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtils.kt diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/TestScriptDefinition.kt b/compiler/tests-common/org/jetbrains/kotlin/scripts/TestScriptDefinition.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/scripts/TestScriptDefinition.kt rename to compiler/tests-common/org/jetbrains/kotlin/scripts/TestScriptDefinition.kt diff --git a/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt b/compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.kt rename to compiler/tests-common/org/jetbrains/kotlin/test/ConfigurationKind.kt diff --git a/compiler/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/InTextDirectivesUtils.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java rename to compiler/tests-common/org/jetbrains/kotlin/test/InTextDirectivesUtils.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java b/compiler/tests-common/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java rename to compiler/tests-common/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java rename to compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java rename to compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironment.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java rename to compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java b/compiler/tests-common/org/jetbrains/kotlin/test/MockLibraryUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/test/MockLibraryUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java b/compiler/tests-common/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java rename to compiler/tests-common/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/TestJdkKind.java b/compiler/tests-common/org/jetbrains/kotlin/test/TestJdkKind.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/TestJdkKind.java rename to compiler/tests-common/org/jetbrains/kotlin/test/TestJdkKind.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/TestMetadata.java b/compiler/tests-common/org/jetbrains/kotlin/test/TestMetadata.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/TestMetadata.java rename to compiler/tests-common/org/jetbrains/kotlin/test/TestMetadata.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt similarity index 97% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt index 7e43d3a86d1..1ccf51aa3dc 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/EdtTestUtil.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.test.testFramework -import com.intellij.util.ThrowableRunnable import org.jetbrains.annotations.TestOnly import java.lang.reflect.InvocationTargetException import javax.swing.SwingUtilities diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtParsingTestCase.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformLiteFixture.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtPlatformTestUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/KtUsefulTestCase.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/MockProjects.kt b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/MockProjects.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/MockProjects.kt rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/MockProjects.kt diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/TestRunnerUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/VfsTestUtil.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockFileTypeManager.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/KtMockLanguageFileType.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorEventMulticaster.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockEditorFactory.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiDocumentManager.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockPsiManager.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/mock/MockSchemesManagerFactory.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/testFramework/util.kt b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/util.kt similarity index 85% rename from compiler/tests/org/jetbrains/kotlin/test/testFramework/util.kt rename to compiler/tests-common/org/jetbrains/kotlin/test/testFramework/util.kt index fdd1ef66c62..398c86dc95e 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/testFramework/util.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/test/testFramework/util.kt @@ -17,9 +17,6 @@ package org.jetbrains.kotlin.test.testFramework import com.intellij.openapi.application.ApplicationManager -import com.intellij.openapi.components.ComponentManager -import com.intellij.openapi.vfs.VirtualFile -import org.picocontainer.MutablePicoContainer fun runWriteAction(action: () -> T): T { return ApplicationManager.getApplication().runWriteAction(action) diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java b/compiler/tests-common/org/jetbrains/kotlin/test/util/DescriptorValidator.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java rename to compiler/tests-common/org/jetbrains/kotlin/test/util/DescriptorValidator.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java rename to compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java rename to compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt b/compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt rename to compiler/tests-common/org/jetbrains/kotlin/test/util/jetTestUtils.kt diff --git a/compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt b/compiler/tests-common/org/jetbrains/kotlin/tests/di/injection.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/tests/di/injection.kt rename to compiler/tests-common/org/jetbrains/kotlin/tests/di/injection.kt diff --git a/compiler/tests-common/tests-common.iml b/compiler/tests-common/tests-common.iml new file mode 100644 index 00000000000..005d4f94777 --- /dev/null +++ b/compiler/tests-common/tests-common.iml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/compiler/tests-java8/compiler-tests-java8.iml b/compiler/tests-java8/compiler-tests-java8.iml index db6bbc53af7..5b2c0810252 100644 --- a/compiler/tests-java8/compiler-tests-java8.iml +++ b/compiler/tests-java8/compiler-tests-java8.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8Test.java b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8Test.java similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8Test.java rename to compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava8Test.java diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvm8RuntimeDescriptorLoaderTest.kt b/compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvm8RuntimeDescriptorLoaderTest.kt similarity index 100% rename from compiler/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvm8RuntimeDescriptorLoaderTest.kt rename to compiler/tests-java8/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvm8RuntimeDescriptorLoaderTest.kt diff --git a/compiler/tests/compiler-tests.iml b/compiler/tests/compiler-tests.iml index 005d4f94777..b6326e543be 100644 --- a/compiler/tests/compiler-tests.iml +++ b/compiler/tests/compiler-tests.iml @@ -7,6 +7,7 @@ + diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java index 60e3ad0bb4d..70f8d56e024 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/JavaElementFinderTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; +import junit.framework.TestCase; import java.io.File; import java.util.Collections; @@ -53,12 +54,12 @@ public class JavaElementFinderTest extends KotlinAsJavaTestBase { private void assertClass(String qualifiedName) { PsiClass psiClass = finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject())); - assertNotNull(String.format("Class with fqn='%s' wasn't found.", qualifiedName), psiClass); - assertTrue(String.format("Class with fqn='%s' is not valid.", qualifiedName), psiClass.isValid()); + TestCase.assertNotNull(String.format("Class with fqn='%s' wasn't found.", qualifiedName), psiClass); + TestCase.assertTrue(String.format("Class with fqn='%s' is not valid.", qualifiedName), psiClass.isValid()); } private void assertNoClass(String qualifiedName) { - assertNull(String.format("Class with fqn='%s' isn't expected to be found.", qualifiedName), - finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject()))); + TestCase.assertNull(String.format("Class with fqn='%s' isn't expected to be found.", qualifiedName), + finder.findClass(qualifiedName, GlobalSearchScope.allScope(getProject()))); } } diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java index 51050cb79eb..483b5baa413 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt index 1db5e2dd00d..8c6263323cd 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.cfg -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java index 1ce796c07a8..c9345e1c194 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java @@ -271,7 +271,7 @@ public abstract class BaseDiagnosticsTest this.expectedText = textWithMarkers; String textWithExtras = addExtras(expectedText); this.clearText = CheckerTestUtil.parseDiagnosedRanges(textWithExtras, diagnosedRanges); - this.jetFile = CheckerTestUtilTest.createCheckAndReturnPsiFile(fileName, clearText, getProject()); + this.jetFile = TestCheckerUtil.createCheckAndReturnPsiFile(fileName, clearText, getProject()); for (CheckerTestUtil.DiagnosedRange diagnosedRange : diagnosedRanges) { diagnosedRange.setFile(jetFile); } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java index 44924f8912c..6acf00bc2d9 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java @@ -17,13 +17,8 @@ package org.jetbrains.kotlin.checkers; import com.google.common.collect.Lists; -import com.intellij.openapi.fileEditor.impl.LoadTextUtil; -import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; import com.intellij.psi.PsiFile; -import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.checkers.CheckerTestUtil.DiagnosedRange; @@ -53,28 +48,7 @@ public class CheckerTestUtilTest extends KotlinTestWithEnvironment { protected void doTest(TheTest theTest) throws Exception { String text = KotlinTestUtils.doLoadFile(getTestDataPath(), "test.kt"); - theTest.test(createCheckAndReturnPsiFile("test.kt", text, getProject())); - } - - @NotNull - public static KtFile createCheckAndReturnPsiFile(@NotNull String fileName, @NotNull String text, @NotNull Project project) { - KtFile myFile = KotlinTestUtils.createFile(fileName, text, project); - ensureParsed(myFile); - assertEquals("light virtual file text mismatch", text, ((LightVirtualFile) myFile.getVirtualFile()).getContent().toString()); - assertEquals("virtual file text mismatch", text, LoadTextUtil.loadText(myFile.getVirtualFile())); - //noinspection ConstantConditions - assertEquals("doc text mismatch", text, myFile.getViewProvider().getDocument().getText()); - assertEquals("psi text mismatch", text, myFile.getText()); - return myFile; - } - - private static void ensureParsed(PsiFile file) { - file.accept(new PsiElementVisitor() { - @Override - public void visitElement(@NotNull PsiElement element) { - element.acceptChildren(this); - } - }); + theTest.test(TestCheckerUtil.createCheckAndReturnPsiFile("test.kt", text, getProject())); } public void testEquals() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java index f42faa237ec..add5717040f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt index 764496d6cf7..a380293f359 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BridgeTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.backend.common.bridges.Bridge import org.jetbrains.kotlin.backend.common.bridges.FunctionHandle import org.jetbrains.kotlin.backend.common.bridges.generateBridges import org.jetbrains.kotlin.utils.DFS -import java.util.HashSet +import java.util.* import kotlin.test.assertEquals class BridgeTest : TestCase() { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java index 8179ca5784c..138b41c67c4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt index 0d5e5a401ba..d4121eb72d7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.codegen import junit.framework.TestCase +import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes -import org.jetbrains.kotlin.test.ConfigurationKind import java.util.* class MethodOrderTest: CodegenTestCase() { diff --git a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 7ef88adbd3c..1a16ccad4df 100644 --- a/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java index 9b224a821f9..54330cb5b8b 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt index 8de7bbc0b57..689f0ecd6b8 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -23,10 +23,8 @@ import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAllTo import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.codegen.GenerationUtils -import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir -import org.jetbrains.kotlin.utils.join import org.jetbrains.org.objectweb.asm.* import org.junit.Assert import java.io.File @@ -34,8 +32,6 @@ import java.io.FileInputStream import java.nio.charset.Charset import java.util.* import java.util.regex.MatchResult -import java.util.regex.Pattern -import kotlin.text.Regex abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt index 1925412d78d..7be49245380 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironmentManagement import org.jetbrains.kotlin.test.TestJdkKind import java.io.File -import kotlin.test.assertEquals import kotlin.test.assertNotNull import kotlin.test.assertNull import kotlin.test.assertTrue diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 1287282d9be..c1fbcd2b735 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -38,8 +38,8 @@ import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.jetbrains.kotlin.types.ErrorUtils import org.junit.Assert import java.io.File diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 22ee6c6e0e0..d3e9012ecc3 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java index ddbc96177dc..391c36a7f1a 100644 --- a/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -23,9 +23,9 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageRenderer; -import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser; +import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java b/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java index 61f0ea3dc9f..8007cf8faf6 100644 --- a/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java +++ b/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java index a3238eece26..344bba25bb7 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt index 243e33a2e93..472cdb12b58 100644 --- a/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt b/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt index fab0611ba26..4d33bd35ec1 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/typeTestUtils.kt @@ -17,11 +17,8 @@ package org.jetbrains.kotlin.types import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.resolve.scopes.BaseLexicalScope -import org.jetbrains.kotlin.resolve.scopes.MemberScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.utils.memberScopeAsImportingScope -import org.jetbrains.kotlin.utils.Printer fun KotlinBuiltIns.builtInPackageAsLexicalScope() = LexicalScope.empty(builtInsPackageScope.memberScopeAsImportingScope(), builtInsModule) \ No newline at end of file diff --git a/generators/generators.iml b/generators/generators.iml index 1406adca488..c1adce0e190 100644 --- a/generators/generators.iml +++ b/generators/generators.iml @@ -9,7 +9,9 @@ + + diff --git a/idea/idea-android/idea-android.iml b/idea/idea-android/idea-android.iml index 9ed12072d3a..ae1acfebbc0 100644 --- a/idea/idea-android/idea-android.iml +++ b/idea/idea-android/idea-android.iml @@ -17,6 +17,5 @@ - \ No newline at end of file diff --git a/idea/idea-completion/idea-completion.iml b/idea/idea-completion/idea-completion.iml index 6ddede83091..4de4dd9e166 100644 --- a/idea/idea-completion/idea-completion.iml +++ b/idea/idea-completion/idea-completion.iml @@ -17,7 +17,7 @@ - + diff --git a/idea/idea-live-templates/idea-live-templates.iml b/idea/idea-live-templates/idea-live-templates.iml index 9e6e3a3df42..f275ba71200 100644 --- a/idea/idea-live-templates/idea-live-templates.iml +++ b/idea/idea-live-templates/idea-live-templates.iml @@ -17,7 +17,7 @@ - + \ No newline at end of file diff --git a/idea/idea-test-framework/idea-test-framework.iml b/idea/idea-test-framework/idea-test-framework.iml index f95530a9277..b5c20c17dfc 100644 --- a/idea/idea-test-framework/idea-test-framework.iml +++ b/idea/idea-test-framework/idea-test-framework.iml @@ -7,7 +7,7 @@ - + diff --git a/idea/idea.iml b/idea/idea.iml index 18139bfa6ca..c1649af1b31 100644 --- a/idea/idea.iml +++ b/idea/idea.iml @@ -49,7 +49,6 @@ - diff --git a/j2k/j2k.iml b/j2k/j2k.iml index 96e3e3690c5..83cbe8e1a52 100644 --- a/j2k/j2k.iml +++ b/j2k/j2k.iml @@ -13,7 +13,6 @@ - diff --git a/jps-plugin/jps-tests/jps-tests.iml b/jps-plugin/jps-tests/jps-tests.iml index 688da04d865..2f6d94239e8 100644 --- a/jps-plugin/jps-tests/jps-tests.iml +++ b/jps-plugin/jps-tests/jps-tests.iml @@ -13,7 +13,7 @@ - + diff --git a/js/js.tests/js.tests.iml b/js/js.tests/js.tests.iml index c7caaf83ba3..5a346486074 100644 --- a/js/js.tests/js.tests.iml +++ b/js/js.tests/js.tests.iml @@ -9,7 +9,7 @@ - + diff --git a/non-compiler-tests/non-compiler-tests.iml b/non-compiler-tests/non-compiler-tests.iml new file mode 100644 index 00000000000..357accb989e --- /dev/null +++ b/non-compiler-tests/non-compiler-tests.iml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml index 9ec87b51110..ae6a9ef5061 100644 --- a/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml +++ b/plugins/android-extensions/android-extensions-idea/android-extensions-idea.iml @@ -15,7 +15,7 @@ - + diff --git a/plugins/plugins-tests/plugins-tests.iml b/plugins/plugins-tests/plugins-tests.iml index 364db075c9e..a8854bd30a0 100644 --- a/plugins/plugins-tests/plugins-tests.iml +++ b/plugins/plugins-tests/plugins-tests.iml @@ -10,7 +10,7 @@ - +