From c19b8353d0b91b651a7e2cde42c4f803b42aa0eb Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 1 Oct 2015 15:39:06 +0300 Subject: [PATCH] Minor, tests: remove some static accesses to builtIns --- ...bstractJetDiagnosticsTestWithJsStdLib.java | 2 +- .../AbstractEvaluateExpressionTest.kt | 6 ++--- .../ConstraintSystemTestData.kt | 26 ++++++++++--------- .../js/KotlinJavascriptSerializerTest.kt | 3 +-- .../JetDefaultModalityModifiersTest.java | 4 +-- .../kotlin/types/JetOverridingTest.java | 3 +-- .../kotlin/types/JetTypeCheckerTest.java | 3 +-- .../kotlin/types/TypeSubstitutorTest.java | 4 +-- .../kotlin/types/TypeUnifierTest.java | 8 +++--- ...JavaScriptDecompiledTextConsistencyTest.kt | 6 +---- 10 files changed, 27 insertions(+), 38 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index ce83d59b78d..8ed866fdbe1 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -91,7 +91,7 @@ public abstract class AbstractJetDiagnosticsTestWithJsStdLib extends AbstractJet dependencies.add(moduleDescriptor); } - dependencies.add(JsPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule()); + dependencies.add(getPlatform().getBuiltIns().getBuiltInsModule()); module.setDependencies(dependencies); return module; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt index 3661c9ed004..57ae64d2424 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.constants.evaluate import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.resolve.BindingContext @@ -25,9 +24,8 @@ import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.annotation.AbstractAnnotationDescriptorResolveTest import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant -import org.jetbrains.kotlin.resolve.constants.ConstantValueFactory import org.jetbrains.kotlin.resolve.constants.StringValue -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform +import org.jetbrains.kotlin.resolve.descriptorUtil.builtIns import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.JetTestUtils import java.io.File @@ -67,7 +65,7 @@ public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescrip private fun evaluateInitializer(context: BindingContext, property: VariableDescriptor): CompileTimeConstant<*>? { val propertyDeclaration = DescriptorToSourceUtils.descriptorToDeclaration(property) as JetProperty - val compileTimeConstant = ConstantExpressionEvaluator(JvmPlatform.builtIns).evaluateExpression( + val compileTimeConstant = ConstantExpressionEvaluator(property.builtIns).evaluateExpression( propertyDeclaration.getInitializer()!!, DelegatingBindingTrace(context, "trace for evaluating compile time constant"), property.getType() diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt index dc2939dee45..0f15f95f268 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -16,21 +16,23 @@ package org.jetbrains.kotlin.resolve.constraintSystem -import org.jetbrains.kotlin.test.JetTestUtils +import com.intellij.openapi.project.Project import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.resolve.* -import org.jetbrains.kotlin.resolve.scopes.JetScope -import org.jetbrains.kotlin.types.JetType -import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import java.util.regex.Pattern -import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor -import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform +import org.jetbrains.kotlin.psi.JetFunction +import org.jetbrains.kotlin.psi.JetPsiFactory +import org.jetbrains.kotlin.resolve.BindingContext +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.JetScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.JetTypeImpl +import java.util.regex.Pattern public class ConstraintSystemTestData( context: BindingContext, @@ -63,7 +65,7 @@ public class ConstraintSystemTestData( if (matcher.find()) { val number = matcher.group(1)!! return JetTypeImpl.create( - Annotations.EMPTY, IntegerValueTypeConstructor(number.toLong(), JvmPlatform.builtIns), false, listOf(), + Annotations.EMPTY, IntegerValueTypeConstructor(number.toLong(), functionFoo.builtIns), false, listOf(), JetScope.Empty ) } diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt index 40e93573f69..22f8a2dbd73 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializerTest.kt @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.serialization.builtins import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles @@ -87,7 +86,7 @@ public class KotlinJavascriptSerializerTest : TestCaseWithTmpdir() { .sure { "No package fragment provider was created" } module.initialize(provider) - module.setDependencies(module, JsPlatform.builtIns.builtInsModule) + module.setDependencies(module, module.builtIns.builtInsModule) return module } diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java index 1f1e41ba52d..48145120c7c 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.types; import org.jetbrains.kotlin.analyzer.AnalysisResult; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.context.ContextPackage; import org.jetbrains.kotlin.context.ModuleContext; @@ -27,7 +26,6 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; @@ -78,7 +76,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { ContainerForTests containerForTests = DiPackage.createContainerForTests(getProject(), root); descriptorResolver = containerForTests.getDescriptorResolver(); functionDescriptorResolver = containerForTests.getFunctionDescriptorResolver(); - scope = createScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope()); + scope = createScope(root.getBuiltIns().getBuiltInsPackageScope()); } public void tearDown() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java index 6d9d7aa0c19..7923b684817 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; import org.jetbrains.kotlin.test.ConfigurationKind; @@ -165,7 +164,7 @@ public class JetOverridingTest extends JetLiteFixture { private FunctionDescriptor makeFunction(String funDecl) { JetNamedFunction function = JetPsiFactory(getProject()).createFunction(funDecl); - LexicalScope scope = UtilsPackage.asLexicalScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope()); + LexicalScope scope = UtilsPackage.asLexicalScope(root.getBuiltIns().getBuiltInsPackageScope()); return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); } diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java index 0eed119e5a6..6d3c2393709 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java @@ -36,7 +36,6 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; @@ -76,9 +75,9 @@ public class JetTypeCheckerTest extends JetLiteFixture { public void setUp() throws Exception { super.setUp(); - builtIns = JvmPlatform.INSTANCE$.getBuiltIns(); ModuleDescriptorImpl module = JetTestUtils.createEmptyModule(); + builtIns = module.getBuiltIns(); ContainerForTests container = DiPackage.createContainerForTests(getProject(), module); module.setDependencies(Collections.singletonList(module)); module.initialize(PackageFragmentProvider.Empty.INSTANCE$); diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java index 4991fadd53b..4e283aaf814 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java @@ -23,7 +23,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; @@ -40,7 +39,6 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.BindingTraceContext; -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.*; @@ -101,7 +99,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { topLevelDeclarations, typeParameters, contextClass.getDefaultType().getMemberScope(), - JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope()); + module.getBuiltIns().getBuiltInsPackageScope()); } private void doTest(@Nullable String expectedTypeStr, String initialTypeStr, Pair... substitutionStrs) { diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index 383735c4e93..6ac5b10301f 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -25,12 +25,12 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetTypeProjection; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.resolve.TypeResolver; -import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; import org.jetbrains.kotlin.resolve.scopes.WritableScope; @@ -39,7 +39,6 @@ import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; -import org.jetbrains.kotlin.tests.di.ContainerForTests; import org.jetbrains.kotlin.tests.di.DiPackage; import java.util.Map; @@ -64,9 +63,10 @@ public class TypeUnifierTest extends JetLiteFixture { public void setUp() throws Exception { super.setUp(); - builtIns = JvmPlatform.INSTANCE$.getBuiltIns(); - typeResolver = DiPackage.createContainerForTests(getProject(), JetTestUtils.createEmptyModule()).getTypeResolver(); + ModuleDescriptorImpl module = JetTestUtils.createEmptyModule(); + builtIns = module.getBuiltIns(); + typeResolver = DiPackage.createContainerForTests(getProject(), module).getTypeResolver(); x = createTypeVariable("X"); y = createTypeVariable("Y"); variables = Sets.newHashSet(x.getTypeConstructor(), y.getTypeConstructor()); diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt index 8c9c83dd9cb..bf2e2e79073 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDecompiledTextConsistencyTest.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -26,7 +25,6 @@ import org.jetbrains.kotlin.idea.test.KotlinStdJSProjectDescriptor import org.jetbrains.kotlin.idea.vfilefinder.JsVirtualFileFinder import org.jetbrains.kotlin.js.resolve.JsPlatform import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil @@ -35,8 +33,6 @@ import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.sure -import java.util.* -import kotlin.properties.Delegates public class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBaseTest() { override fun getPackages(): List = listOf( @@ -65,7 +61,7 @@ public class KotlinJavaScriptDecompiledTextConsistencyTest : TextConsistencyBase .sure { "No package fragment provider was created" } module.initialize(provider) - module.setDependencies(module, JsPlatform.builtIns.builtInsModule) + module.setDependencies(module, module.builtIns.builtInsModule) return module }