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

Refactoring: extract test dummy traces

Browse Source
This commit is contained in:
Nikolay Krasko
2019-10-17 16:33:12 +03:00
parent fda2022214
commit 2c0ce40f75
10 changed files with 222 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java
+4 -3
View File
@@ -40,6 +40,7 @@ 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.DummyTraces;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import org.jetbrains.kotlin.tests.di.ContainerForTests;
@@ -143,7 +144,7 @@ public class DefaultModalityModifiersTest extends KotlinTestWithEnvironment {
KtNamedFunction function = (KtNamedFunction) declarations.get(0);
SimpleFunctionDescriptor functionDescriptor =
functionDescriptorResolver.resolveFunctionDescriptor(classDescriptor, scope, function,
KotlinTestUtils.DUMMY_TRACE, DataFlowInfoFactory.EMPTY);
DummyTraces.DUMMY_TRACE, DataFlowInfoFactory.EMPTY);
assertEquals(expectedFunctionModality, functionDescriptor.getModality());
}
@@ -156,7 +157,7 @@ public class DefaultModalityModifiersTest extends KotlinTestWithEnvironment {
KtProperty property = (KtProperty) declarations.get(0);
PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor(
classDescriptor, scope, scope, property,
KotlinTestUtils.DUMMY_TRACE, DataFlowInfoFactory.EMPTY,
DummyTraces.DUMMY_TRACE, DataFlowInfoFactory.EMPTY,
InferenceSession.Companion.getDefault()
);
@@ -172,7 +173,7 @@ public class DefaultModalityModifiersTest extends KotlinTestWithEnvironment {
KtProperty property = (KtProperty) declarations.get(0);
PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor(
classDescriptor, scope, scope, property,
KotlinTestUtils.DUMMY_TRACE, DataFlowInfoFactory.EMPTY,
DummyTraces.DUMMY_TRACE, DataFlowInfoFactory.EMPTY,
InferenceSession.Companion.getDefault()
);
PropertyAccessorDescriptor propertyAccessor = isGetter
compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory;
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.DummyTraces;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
public class KotlinOverloadTest extends KotlinTestWithEnvironment {
@@ -171,7 +171,7 @@ public class KotlinOverloadTest extends KotlinTestWithEnvironment {
KtNamedFunction function = KtPsiFactoryKt.KtPsiFactory(getProject()).createFunction(funDecl);
LexicalScope scope = TypeTestUtilsKt.builtInPackageAsLexicalScope(module);
return functionDescriptorResolver.resolveFunctionDescriptor(
module, scope, function, KotlinTestUtils.DUMMY_TRACE, DataFlowInfoFactory.EMPTY
module, scope, function, DummyTraces.DUMMY_TRACE, DataFlowInfoFactory.EMPTY
);
}
}
compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java
+2 -2
View File
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfoFactory;
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.DummyTraces;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
public class KotlinOverridingTest extends KotlinTestWithEnvironment {
@@ -172,7 +172,7 @@ public class KotlinOverridingTest extends KotlinTestWithEnvironment {
KtNamedFunction function = KtPsiFactoryKt.KtPsiFactory(getProject()).createFunction(funDecl);
LexicalScope scope = TypeTestUtilsKt.builtInPackageAsLexicalScope(module);
return functionDescriptorResolver.resolveFunctionDescriptor(
module, scope, function, KotlinTestUtils.DUMMY_TRACE, DataFlowInfoFactory.EMPTY
module, scope, function, DummyTraces.DUMMY_TRACE, DataFlowInfoFactory.EMPTY
);
}
}
compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java
+3 -2
View File
@@ -39,6 +39,7 @@ 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.DummyTraces;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import org.jetbrains.kotlin.tests.di.ContainerForTests;
@@ -534,7 +535,7 @@ public class KotlinTypeCheckerTest extends KotlinTestWithEnvironment {
KotlinType type = expressionTypingServices.getType(
scopeWithImports, ktExpression, TypeUtils.NO_EXPECTED_TYPE,
DataFlowInfoFactory.EMPTY, InferenceSession.Companion.getDefault(),
KotlinTestUtils.DUMMY_TRACE
DummyTraces.DUMMY_TRACE
);
assertNotNull(type);
assertEquals(type + " != " + expectedType, expectedType, type);
@@ -583,6 +584,6 @@ public class KotlinTypeCheckerTest extends KotlinTestWithEnvironment {
}
private KotlinType makeType(LexicalScope scope, String typeStr) {
return typeResolver.resolveType(scope, KtPsiFactoryKt.KtPsiFactory(getProject()).createType(typeStr), KotlinTestUtils.DUMMY_TRACE, true);
return typeResolver.resolveType(scope, KtPsiFactoryKt.KtPsiFactory(getProject()).createType(typeStr), DummyTraces.DUMMY_TRACE, true);
}
}
compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java
+2 -2
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil;
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.KotlinTestUtils;
import org.jetbrains.kotlin.test.DummyTraces;
import org.jetbrains.kotlin.test.KotlinTestWithEnvironment;
import java.util.HashMap;
@@ -208,7 +208,7 @@ public class TypeUnifierTest extends KotlinTestWithEnvironment {
KtTypeReference typeReference = projection.getTypeReference();
assert typeReference != null;
KotlinType type = typeResolver.resolveType(withX, typeReference, KotlinTestUtils.DUMMY_TRACE, true);
KotlinType type = typeResolver.resolveType(withX, typeReference, DummyTraces.DUMMY_TRACE, true);
return new TypeProjectionImpl(getProjectionKind(typeStr, projection), type);
}