Inline KotlinLiteFixture

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<M, F> extends KotlinLiteFixture {
+public abstract class KotlinMultiFileTestWithJava<M, F> extends KotlinTestWithEnvironment {
     private File javaFilesDir;
     private File kotlinSourceRoot;
 

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)
     }

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

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<DescriptorRendererOptions, Unit>() {
                 @Override

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) {

compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java

@@ -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 {
-}

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) {

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

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("<test_root>");
     private FunctionDescriptorResolver functionDescriptorResolver;
 

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("<test_root>");
     private FunctionDescriptorResolver functionDescriptorResolver;
 

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;

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<TypeConstructor> 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(

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<Int,Int>, rangeInHost: TextRange? = null) {
+    private fun KtStringTemplateExpression.checkInjection(
+            decoded: String, targetToSourceOffsets: Map<Int, Int>, rangeInHost: TextRange? = null
+    ) {
         assertTrue(isValidHost)
         for (prefix in listOf("", "prefix")) {
             val escaper = createLiteralTextEscaper()