From 4b96a8131b62c85cc8ba291cc5972f4635ad10ab Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 25 Feb 2016 21:00:37 +0300 Subject: [PATCH] Inline KotlinLiteFixture --- .../checkers/KotlinMultiFileTestWithJava.java | 4 +- .../kotlin/psi/KtSimpleNameExpressionTest.kt | 6 ++- .../resolve/ExtensibleResolveTestCase.java | 4 +- ...stractAnnotationDescriptorResolveTest.java | 4 +- .../calls/AbstractResolvedCallsTest.kt | 45 ++++++++++--------- .../kotlin/test/KotlinLiteFixture.java | 20 --------- .../kotlin/types/AbstractTypeBindingTest.kt | 22 ++++----- .../types/DefaultModalityModifiersTest.java | 4 +- .../kotlin/types/KotlinOverloadTest.java | 6 +-- .../kotlin/types/KotlinOverridingTest.java | 5 +-- .../kotlin/types/KotlinTypeCheckerTest.java | 4 +- .../kotlin/types/TypeUnifierTest.java | 5 +-- .../psi/injection/StringInjectionHostTest.kt | 14 +++--- 13 files changed, 63 insertions(+), 80 deletions(-) delete mode 100644 compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java index e5dffdb315a..22ea1cf077a 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.script.StandardScriptDefinition; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.test.TestJdkKind; import java.io.File; @@ -38,7 +38,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public abstract class KotlinMultiFileTestWithJava extends KotlinLiteFixture { +public abstract class KotlinMultiFileTestWithJava extends KotlinTestWithEnvironment { private File javaFilesDir; private File kotlinSourceRoot; diff --git a/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt index 16dc063b301..d000187a2ff 100644 --- a/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt @@ -20,10 +20,10 @@ import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression -import org.jetbrains.kotlin.test.KotlinLiteFixture +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment import org.junit.Assert -class KtSimpleNameExpressionTest : KotlinLiteFixture() { +class KtSimpleNameExpressionTest : KotlinTestWithEnvironment() { fun testGetReceiverExpressionIdentifier() { // Binary Expressions assertReceiver("1 + 2", "1") @@ -31,10 +31,12 @@ class KtSimpleNameExpressionTest : KotlinLiteFixture() { assertReceiver("1 !in array(1)", "array(1)") assertReceiver("1 to 2", "1") } + private fun assertReceiver(exprString: String, expected: String) { val expression = KtPsiFactory(project).createExpression(exprString) as KtBinaryExpression Assert.assertEquals(expected, expression.operationReference.getReceiverExpression()!!.text) } + override fun createEnvironment(): KotlinCoreEnvironment { return KotlinCoreEnvironment.createForTests(testRootDisposable!!, CompilerConfiguration(), EnvironmentConfigFiles.JVM_CONFIG_FILES) } diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java index 7af35f98de2..158d10aef24 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java @@ -21,14 +21,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import java.io.File; import java.util.List; import java.util.Map; -public abstract class ExtensibleResolveTestCase extends KotlinLiteFixture { +public abstract class ExtensibleResolveTestCase extends KotlinTestWithEnvironment { private ExpectedResolveData expectedResolveData; @Override diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 0aff0f8cd85..b9c6486986b 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -43,8 +43,8 @@ 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; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.types.TypeProjection; import java.io.File; @@ -55,7 +55,7 @@ import java.util.List; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isNonCompanionObject; -public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinLiteFixture { +public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTestWithEnvironment { private static final DescriptorRenderer WITH_ANNOTATION_ARGUMENT_TYPES = DescriptorRenderer.Companion.withOptions( new Function1() { @Override diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt index e45e12872f0..c748487b7a9 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt @@ -16,32 +16,35 @@ package org.jetbrains.kotlin.resolve.calls -import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.KotlinLiteFixture -import org.jetbrains.kotlin.test.KotlinTestUtils +import com.intellij.openapi.util.io.FileUtil +import com.intellij.psi.PsiElement import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import java.io.File -import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.psi.KtExpression +import org.jetbrains.kotlin.psi.KtFile +import org.jetbrains.kotlin.psi.KtPsiFactory +import org.jetbrains.kotlin.psi.ValueArgument +import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch -import org.jetbrains.kotlin.renderer.DescriptorRenderer -import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.psi.ValueArgument -import org.jetbrains.kotlin.psi.KtPsiFactory -import org.jetbrains.kotlin.psi.KtExpression +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall -import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall -import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.psi.KtFile -import com.intellij.psi.PsiElement -import org.jetbrains.kotlin.resolve.scopes.receivers.* +import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ImplicitClassReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.Receiver +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import java.io.File -abstract class AbstractResolvedCallsTest : KotlinLiteFixture() { +abstract class AbstractResolvedCallsTest : KotlinTestWithEnvironment() { override fun createEnvironment(): KotlinCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.ALL) fun doTest(filePath: String) { diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java deleted file mode 100644 index 1ddfb650a46..00000000000 --- a/compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * 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. - * 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.test; - -public abstract class KotlinLiteFixture extends KotlinTestWithEnvironment { -} diff --git a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt index 3ec5c1856b3..b6084bc868b 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt @@ -16,20 +16,22 @@ package org.jetbrains.kotlin.types -import org.jetbrains.kotlin.test.KotlinLiteFixture -import org.jetbrains.kotlin.test.ConfigurationKind -import java.io.File -import org.jetbrains.kotlin.resolve.typeBinding.* -import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.psi.KtCallableDeclaration -import org.jetbrains.kotlin.psi.KtDeclaration -import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.KotlinTestUtils.* +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil +import org.jetbrains.kotlin.resolve.typeBinding.TypeArgumentBinding +import org.jetbrains.kotlin.resolve.typeBinding.TypeBinding +import org.jetbrains.kotlin.resolve.typeBinding.createTypeBindingForReturnType +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.KotlinTestUtils.assertEqualsToFile +import org.jetbrains.kotlin.test.KotlinTestUtils.loadJetFile +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import org.jetbrains.kotlin.utils.Printer +import java.io.File -abstract class AbstractTypeBindingTest : KotlinLiteFixture() { +abstract class AbstractTypeBindingTest : KotlinTestWithEnvironment() { override fun createEnvironment() = createEnvironmentWithMockJdk(ConfigurationKind.ALL) protected fun doTest(path: String) { diff --git a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java index 31a19133ba2..7b93e8684c1 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java @@ -35,8 +35,8 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProvid import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.tests.di.ContainerForTests; import org.jetbrains.kotlin.tests.di.InjectionKt; @@ -45,7 +45,7 @@ import java.util.List; import static org.jetbrains.kotlin.frontend.di.InjectionKt.createLazyResolveSession; -public class DefaultModalityModifiersTest extends KotlinLiteFixture { +public class DefaultModalityModifiersTest extends KotlinTestWithEnvironment { private final DefaultModalityModifiersTestCase tc = new DefaultModalityModifiersTestCase(); @Override diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java index f8eed13c1e7..a2513070dfc 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.types; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; @@ -28,12 +27,11 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.tests.di.InjectionKt; -public class KotlinOverloadTest extends KotlinLiteFixture { - +public class KotlinOverloadTest extends KotlinTestWithEnvironment { private final ModuleDescriptor root = KotlinTestUtils.createEmptyModule(""); private FunctionDescriptorResolver functionDescriptorResolver; diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java index e4f039d2d62..afccf375be6 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java @@ -26,12 +26,11 @@ import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.tests.di.InjectionKt; -public class KotlinOverridingTest extends KotlinLiteFixture { - +public class KotlinOverridingTest extends KotlinTestWithEnvironment { private final ModuleDescriptor root = KotlinTestUtils.createEmptyModule(""); private FunctionDescriptorResolver functionDescriptorResolver; diff --git a/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java index 8f6cee98e2a..f4d496dcc31 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java @@ -39,8 +39,8 @@ import org.jetbrains.kotlin.resolve.scopes.LexicalScopeImpl; import org.jetbrains.kotlin.resolve.scopes.LexicalScopeKind; import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.tests.di.ContainerForTests; import org.jetbrains.kotlin.tests.di.InjectionKt; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; @@ -50,7 +50,7 @@ import java.io.File; import java.io.IOException; import java.util.*; -public class KotlinTypeCheckerTest extends KotlinLiteFixture { +public class KotlinTypeCheckerTest extends KotlinTestWithEnvironment { private KotlinBuiltIns builtIns; private LexicalScope scopeWithImports; private TypeResolver typeResolver; diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index 2d2921a5b1f..fe876042985 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -39,14 +39,14 @@ import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinLiteFixture; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; import org.jetbrains.kotlin.tests.di.InjectionKt; import java.util.Map; import java.util.Set; -public class TypeUnifierTest extends KotlinLiteFixture { +public class TypeUnifierTest extends KotlinTestWithEnvironment { private Set variables; private KotlinBuiltIns builtIns; @@ -64,7 +64,6 @@ public class TypeUnifierTest extends KotlinLiteFixture { public void setUp() throws Exception { super.setUp(); - ModuleDescriptorImpl module = KotlinTestUtils.createEmptyModule(); builtIns = module.getBuiltIns(); builtinsImportingScope = ScopeUtilsKt.chainImportingScopes( diff --git a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt index 5fdb19b7b1b..181fc106ef7 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt +++ b/idea/tests/org/jetbrains/kotlin/psi/injection/StringInjectionHostTest.kt @@ -16,15 +16,14 @@ package org.jetbrains.kotlin.psi.injection +import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.psi.KtStringTemplateExpression -import org.junit.Assert.* -import com.intellij.openapi.util.TextRange -import java.util.HashMap -import org.jetbrains.kotlin.test.KotlinLiteFixture import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import java.util.* -class StringInjectionHostTest: KotlinLiteFixture() { +class StringInjectionHostTest : KotlinTestWithEnvironment() { fun testRegular() { with (quoted("")) { checkInjection("", mapOf(0 to 1)) @@ -125,8 +124,9 @@ class StringInjectionHostTest: KotlinLiteFixture() { assertFalse(createLiteralTextEscaper().isOneLine) } - //todo[nik] make private when KT-6382 is fixed - fun KtStringTemplateExpression.checkInjection(decoded: String, targetToSourceOffsets: Map, rangeInHost: TextRange? = null) { + private fun KtStringTemplateExpression.checkInjection( + decoded: String, targetToSourceOffsets: Map, rangeInHost: TextRange? = null + ) { assertTrue(isValidHost) for (prefix in listOf("", "prefix")) { val escaper = createLiteralTextEscaper()