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

remove Jet from names of classes in tests: phase 1

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-03 13:37:54 +01:00
parent 86f8845c00
commit c604f98a1c
65 changed files with 296 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsWithFullJdkTest.java → compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithFullJdkTest.java
+4 -4
View File
@@ -19,21 +19,21 @@ package org.jetbrains.kotlin.checkers;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestJdkKind;
import java.io.File;
import java.util.Arrays;
public abstract class AbstractJetDiagnosticsWithFullJdkTest extends AbstractJetDiagnosticsTest {
public abstract class AbstractDiagnosticsWithFullJdkTest extends AbstractDiagnosticsTest {
@Override
protected KotlinCoreEnvironment createEnvironment() {
File javaFilesDir = createJavaFilesDir();
return KotlinCoreEnvironment.createForTests(getTestRootDisposable(),
JetTestUtils.compilerConfigurationForTests(
KotlinTestUtils.compilerConfigurationForTests(
ConfigurationKind.ALL,
TestJdkKind.FULL_JDK,
Arrays.asList(JetTestUtils.getAnnotationsJar()),
Arrays.asList(KotlinTestUtils.getAnnotationsJar()),
Arrays.asList(javaFilesDir)
),
EnvironmentConfigFiles.JVM_CONFIG_FILES);
compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsWithJava8TestGenerated.java → compiler/java8-tests/tests/org/jetbrains/kotlin/checkers/DiagnosticsWithJava8TestGenerated.java
View File
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java → compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java
+6 -6
View File
@@ -53,7 +53,7 @@ import org.jetbrains.kotlin.storage.ExceptionTracker;
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
import org.jetbrains.kotlin.storage.StorageManager;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.DescriptorValidator;
import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
@@ -65,7 +65,7 @@ import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE;
import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL;
public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
public abstract class AbstractDiagnosticsTest extends BaseDiagnosticsTest {
public static final Function1<String, String> HASH_SANITIZER = new Function1<String, String>() {
@Override
@@ -171,7 +171,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
exceptionFromDynamicCallDescriptorsValidation = e;
}
JetTestUtils.assertEqualsToFile(testDataFile, actualText.toString());
KotlinTestUtils.assertEqualsToFile(testDataFile, actualText.toString());
assertTrue("Diagnostics mismatch. See the output above", ok);
@@ -202,7 +202,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
}
if (actualText.length() != 0 || expectedFile.exists()) {
JetTestUtils.assertEqualsToFile(expectedFile, actualText.toString());
KotlinTestUtils.assertEqualsToFile(expectedFile, actualText.toString());
}
}
@@ -216,7 +216,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
try {
File expectedFile = getLazyLogFile(testDataFile);
JetTestUtils.assertEqualsToFile(
KotlinTestUtils.assertEqualsToFile(
expectedFile,
lazyOperationsLog.getText(),
HASH_SANITIZER
@@ -292,7 +292,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
"Please ensure you don't render JRE contents to the .txt file. " +
"Such tests are hard to maintain, take long time to execute and are subject to sudden unreviewed changes anyway.";
JetTestUtils.assertEqualsToFile(expectedFile, rootPackageText.toString());
KotlinTestUtils.assertEqualsToFile(expectedFile, rootPackageText.toString());
}
public RecursiveDescriptorComparator.Configuration createdAffectedPackagesConfiguration(List<TestFile> testFiles) {
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java → compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLib.java
+1 -1
View File
@@ -38,7 +38,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public abstract class AbstractJetDiagnosticsTestWithJsStdLib extends AbstractJetDiagnosticsTest {
public abstract class AbstractDiagnosticsTestWithJsStdLib extends AbstractDiagnosticsTest {
private Config config;
@Override
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLibAndBackendCompilation.kt → compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation.kt
+1 -1
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.js.facade.MainCallParameters
import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.resolve.BindingTrace
public abstract class AbstractJetDiagnosticsTestWithJsStdLibAndBackendCompilation : AbstractJetDiagnosticsTestWithJsStdLib() {
public abstract class AbstractDiagnosticsTestWithJsStdLibAndBackendCompilation : AbstractDiagnosticsTestWithJsStdLib() {
override fun analyzeModuleContents(
moduleContext: ModuleContext,
jetFiles: MutableList<KtFile>,
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java → compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTestWithStdLib.java
+5 -5
View File
@@ -19,23 +19,23 @@ package org.jetbrains.kotlin.checkers;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestJdkKind;
import java.io.File;
import java.util.Arrays;
public abstract class AbstractJetDiagnosticsTestWithStdLib extends AbstractJetDiagnosticsTest {
public abstract class AbstractDiagnosticsTestWithStdLib extends AbstractDiagnosticsTest {
@Override
protected KotlinCoreEnvironment createEnvironment() {
File javaFilesDir = createJavaFilesDir();
return KotlinCoreEnvironment.createForTests(getTestRootDisposable(),
JetTestUtils.compilerConfigurationForTests(
KotlinTestUtils.compilerConfigurationForTests(
ConfigurationKind.ALL,
TestJdkKind.MOCK_JDK,
Arrays.asList(JetTestUtils.getAnnotationsJar()),
Arrays.asList(KotlinTestUtils.getAnnotationsJar()),
Arrays.asList(javaFilesDir)
),
EnvironmentConfigFiles.JVM_CONFIG_FILES);
EnvironmentConfigFiles.JVM_CONFIG_FILES);
}
}
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsWithFullJdkTest.java → compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithFullJdkTest.java
+4 -4
View File
@@ -19,21 +19,21 @@ package org.jetbrains.kotlin.checkers;
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestJdkKind;
import java.io.File;
import java.util.Arrays;
public abstract class AbstractJetDiagnosticsWithFullJdkTest extends AbstractJetDiagnosticsTest {
public abstract class AbstractDiagnosticsWithFullJdkTest extends AbstractDiagnosticsTest {
@Override
protected KotlinCoreEnvironment createEnvironment() {
File javaFilesDir = createJavaFilesDir();
return KotlinCoreEnvironment.createForTests(getTestRootDisposable(),
JetTestUtils.compilerConfigurationForTests(
KotlinTestUtils.compilerConfigurationForTests(
ConfigurationKind.ALL,
TestJdkKind.FULL_JDK,
Arrays.asList(JetTestUtils.getAnnotationsJar()),
Arrays.asList(KotlinTestUtils.getAnnotationsJar()),
Arrays.asList(javaFilesDir)
),
EnvironmentConfigFiles.JVM_CONFIG_FILES);
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java → compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java
View File
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java → compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java
View File
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java → compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithJsStdLibGenerated.java
View File
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java → compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestWithStdLibGenerated.java
View File
compiler/tests/org/jetbrains/kotlin/code/JetCodeConformanceTest.kt → compiler/tests/org/jetbrains/kotlin/code/CodeConformanceTest.kt
+1 -1
View File
@@ -23,7 +23,7 @@ import java.util.ArrayList
import java.util.regex.Pattern
import kotlin.test.fail
public class JetCodeConformanceTest : TestCase() {
public class CodeConformanceTest : TestCase() {
companion object {
private val JAVA_FILE_PATTERN = Pattern.compile(".+\\.java")
private val SOURCES_FILE_PATTERN = Pattern.compile("(.+\\.java|.+\\.kt|.+\\.js)")
compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java → compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java
+4 -4
View File
@@ -30,23 +30,23 @@ import com.intellij.util.PathUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.KtNodeTypes;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
public abstract class AbstractJetParsingTest extends ParsingTestCase {
public abstract class AbstractParsingTest extends ParsingTestCase {
static {
System.setProperty("idea.platform.prefix", "Idea");
}
@Override
protected String getTestDataPath() {
return JetTestUtils.getHomeDirectory();
return KotlinTestUtils.getHomeDirectory();
}
public AbstractJetParsingTest() {
public AbstractParsingTest() {
super(".", "kt", new JetParserDefinition());
}
compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java → compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java
View File
compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java → compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java
+2 -2
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.resolve.ImportPath;
import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.KotlinLiteFixture;
import org.junit.Assert;
import java.io.File;
@@ -33,7 +33,7 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class JetPsiUtilTest extends JetLiteFixture {
public class KtPsiUtilTest extends KotlinLiteFixture {
public void testUnquotedIdentifier() {
Assert.assertEquals("", KtPsiUtil.unquoteIdentifier(""));
Assert.assertEquals("a2", KtPsiUtil.unquoteIdentifier("a2"));
compiler/tests/org/jetbrains/kotlin/psi/JetSimpleNameExpressionTest.kt → compiler/tests/org/jetbrains/kotlin/psi/KtSimpleNameExpressionTest.kt
+4 -4
View File
@@ -16,14 +16,14 @@
package org.jetbrains.kotlin.psi
import org.junit.Assert
import org.jetbrains.kotlin.test.JetLiteFixture
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.cli.jvm.compiler.EnvironmentConfigFiles
import org.jetbrains.kotlin.test.KotlinLiteFixture
import org.junit.Assert
public class JetSimpleNameExpressionTest : JetLiteFixture() {
public class KtSimpleNameExpressionTest : KotlinLiteFixture() {
public fun testGetReceiverExpressionIdentifier() {
// Binary Expressions
assertReceiver("1 + 2", "1")
compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java → compiler/tests/org/jetbrains/kotlin/resolve/ExpectedResolveDataUtil.java
+4 -4
View File
@@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.tests.di.ContainerForTests;
import org.jetbrains.kotlin.tests.di.InjectionKt;
import org.jetbrains.kotlin.types.KotlinType;
@@ -48,8 +48,8 @@ import java.util.Map;
import static org.junit.Assert.assertNotNull;
public class JetExpectedResolveDataUtil {
private JetExpectedResolveDataUtil() {
public class ExpectedResolveDataUtil {
private ExpectedResolveDataUtil() {
}
public static Map<String, DeclarationDescriptor> prepareDefaultNameToDescriptors(Project project, KotlinCoreEnvironment environment) {
@@ -131,7 +131,7 @@ public class JetExpectedResolveDataUtil {
Project project,
KotlinType... parameterTypes
) {
ModuleDescriptorImpl emptyModule = JetTestUtils.createEmptyModule();
ModuleDescriptorImpl emptyModule = KotlinTestUtils.createEmptyModule();
ContainerForTests container = InjectionKt.createContainerForTests(project, emptyModule);
emptyModule.setDependencies(emptyModule);
emptyModule.initialize(PackageFragmentProvider.Empty.INSTANCE$);
compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java → compiler/tests/org/jetbrains/kotlin/test/KotlinLiteFixture.java
+3 -3
View File
@@ -30,16 +30,16 @@ import org.junit.Assert;
import java.io.IOException;
public abstract class JetLiteFixture extends KotlinTestWithEnvironment {
public abstract class KotlinLiteFixture extends KotlinTestWithEnvironment {
@NonNls
protected final String myFullDataPath;
private KtFile myFile;
public JetLiteFixture(@NonNls String dataPath) {
public KotlinLiteFixture(@NonNls String dataPath) {
myFullDataPath = getTestDataPath() + "/" + dataPath;
}
public JetLiteFixture() {
public KotlinLiteFixture() {
myFullDataPath = getTestDataPath();
}
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java → compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+3 -3
View File
@@ -98,7 +98,7 @@ import static org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys.MODULE_NA
import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult;
import static org.jetbrains.kotlin.test.ConfigurationKind.ALL;
public class JetTestUtils {
public class KotlinTestUtils {
public static final String TEST_GENERATOR_NAME = "org.jetbrains.kotlin.generators.tests.TestsPackage";
public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)";
@@ -284,7 +284,7 @@ public class JetTestUtils {
// We suspect sequences of eight consecutive hexadecimal digits to be a package part hash code
private static final Pattern STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{8})");
private JetTestUtils() {
private KotlinTestUtils() {
}
@NotNull
@@ -321,7 +321,7 @@ public class JetTestUtils {
@NotNull
public static String getHomeDirectory() {
File resourceRoot = PathUtil.getResourcePathForClass(JetTestUtils.class);
File resourceRoot = PathUtil.getResourcePathForClass(KotlinTestUtils.class);
return FileUtil.toSystemIndependentName(resourceRoot.getParentFile().getParentFile().getParent());
}
compiler/tests/org/jetbrains/kotlin/types/AbstractJetTypeBindingTest.kt → compiler/tests/org/jetbrains/kotlin/types/AbstractTypeBindingTest.kt
+3 -3
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.types
import org.jetbrains.kotlin.test.JetLiteFixture
import org.jetbrains.kotlin.test.KotlinLiteFixture
import org.jetbrains.kotlin.test.ConfigurationKind
import java.io.File
import org.jetbrains.kotlin.resolve.typeBinding.*
@@ -27,9 +27,9 @@ 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.JetTestUtils.*
import org.jetbrains.kotlin.test.KotlinTestUtils.*
abstract class AbstractJetTypeBindingTest : JetLiteFixture() {
abstract class AbstractTypeBindingTest : KotlinLiteFixture() {
override fun createEnvironment() = createEnvironmentWithMockJdk(ConfigurationKind.ALL)
protected fun doTest(path: String) {
compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java → compiler/tests/org/jetbrains/kotlin/types/DefaultModalityModifiersTest.java
+7 -7
View File
@@ -34,8 +34,8 @@ import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler;
import org.jetbrains.kotlin.resolve.scopes.WritableScope;
import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinLiteFixture;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.tests.di.ContainerForTests;
import org.jetbrains.kotlin.tests.di.InjectionKt;
@@ -44,7 +44,7 @@ import java.util.List;
import static org.jetbrains.kotlin.frontend.di.InjectionKt.createLazyResolveSession;
public class JetDefaultModalityModifiersTest extends JetLiteFixture {
public class DefaultModalityModifiersTest extends KotlinLiteFixture {
private final JetDefaultModalityModifiersTestCase tc = new JetDefaultModalityModifiersTestCase();
@Override
@@ -65,7 +65,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
}
public class JetDefaultModalityModifiersTestCase {
private final ModuleDescriptorImpl root = JetTestUtils.createEmptyModule("<test_root>");
private final ModuleDescriptorImpl root = KotlinTestUtils.createEmptyModule("<test_root>");
private DescriptorResolver descriptorResolver;
private FunctionDescriptorResolver functionDescriptorResolver;
private KtScope scope;
@@ -127,7 +127,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
KtNamedFunction function = (KtNamedFunction) declarations.get(0);
SimpleFunctionDescriptor functionDescriptor =
functionDescriptorResolver.resolveFunctionDescriptor(classDescriptor, TypeTestUtilsKt.asLexicalScope(scope), function,
JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
KotlinTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
assertEquals(expectedFunctionModality, functionDescriptor.getModality());
}
@@ -139,7 +139,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
List<KtDeclaration> declarations = aClass.getDeclarations();
KtProperty property = (KtProperty) declarations.get(0);
PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor(
classDescriptor, TypeTestUtilsKt.asLexicalScope(scope), property, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
classDescriptor, TypeTestUtilsKt.asLexicalScope(scope), property, KotlinTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
assertEquals(expectedPropertyModality, propertyDescriptor.getModality());
}
@@ -152,7 +152,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture {
List<KtDeclaration> declarations = aClass.getDeclarations();
KtProperty property = (KtProperty) declarations.get(0);
PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor(
classDescriptor, TypeTestUtilsKt.asLexicalScope(scope), property, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
classDescriptor, TypeTestUtilsKt.asLexicalScope(scope), property, KotlinTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
PropertyAccessorDescriptor propertyAccessor = isGetter
? propertyDescriptor.getGetter()
: propertyDescriptor.getSetter();
compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java → compiler/tests/org/jetbrains/kotlin/types/KotlinOverloadTest.java
+5 -5
View File
@@ -28,13 +28,13 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
import org.jetbrains.kotlin.resolve.scopes.ImportingScope;
import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinLiteFixture;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.tests.di.InjectionKt;
public class JetOverloadTest extends JetLiteFixture {
public class KotlinOverloadTest extends KotlinLiteFixture {
private final ModuleDescriptor root = JetTestUtils.createEmptyModule("<test_root>");
private final ModuleDescriptor root = KotlinTestUtils.createEmptyModule("<test_root>");
private FunctionDescriptorResolver functionDescriptorResolver;
@Override
@@ -172,6 +172,6 @@ public class JetOverloadTest extends JetLiteFixture {
private FunctionDescriptor makeFunction(String funDecl) {
KtNamedFunction function = KtPsiFactoryKt.KtPsiFactory(getProject()).createFunction(funDecl);
ImportingScope scope = ScopeUtilsKt.memberScopeAsImportingScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope());
return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, KotlinTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
}
}
compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java → compiler/tests/org/jetbrains/kotlin/types/KotlinOverridingTest.java
+5 -5
View File
@@ -26,13 +26,13 @@ import org.jetbrains.kotlin.resolve.OverridingUtil;
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.scopes.LexicalScope;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinLiteFixture;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.tests.di.InjectionKt;
public class JetOverridingTest extends JetLiteFixture {
public class KotlinOverridingTest extends KotlinLiteFixture {
private final ModuleDescriptor root = JetTestUtils.createEmptyModule("<test_root>");
private final ModuleDescriptor root = KotlinTestUtils.createEmptyModule("<test_root>");
private FunctionDescriptorResolver functionDescriptorResolver;
@Override
@@ -168,6 +168,6 @@ public class JetOverridingTest extends JetLiteFixture {
KtNamedFunction function = KtPsiFactoryKt.KtPsiFactory(getProject()).createFunction(funDecl);
LexicalScope scope = TypeTestUtilsKt.asLexicalScope(root.getBuiltIns().getBuiltInsPackageScope());
return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function,
JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
KotlinTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY);
}
}
compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java → compiler/tests/org/jetbrains/kotlin/types/KotlinTypeCheckerTest.java
+9 -10
View File
@@ -40,10 +40,9 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo;
import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.kotlin.resolve.scopes.*;
import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver;
import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt;
import org.jetbrains.kotlin.test.ConfigurationKind;
import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinLiteFixture;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.tests.di.ContainerForTests;
import org.jetbrains.kotlin.tests.di.InjectionKt;
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker;
@@ -53,7 +52,7 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
public class JetTypeCheckerTest extends JetLiteFixture {
public class KotlinTypeCheckerTest extends KotlinLiteFixture {
private KotlinBuiltIns builtIns;
private KtScope scopeWithImports;
@@ -61,7 +60,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
private ExpressionTypingServices expressionTypingServices;
public JetTypeCheckerTest() {
public KotlinTypeCheckerTest() {
super("");
}
@@ -75,7 +74,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
super.setUp();
ModuleDescriptorImpl module = JetTestUtils.createEmptyModule();
ModuleDescriptorImpl module = KotlinTestUtils.createEmptyModule();
builtIns = module.getBuiltIns();
ContainerForTests container = InjectionKt.createContainerForTests(getProject(), module);
module.setDependencies(Collections.singletonList(module));
@@ -547,14 +546,14 @@ public class JetTypeCheckerTest extends JetLiteFixture {
private void assertType(String expression, KotlinType expectedType) {
Project project = getProject();
KtExpression ktExpression = KtPsiFactoryKt.KtPsiFactory(project).createExpression(expression);
KotlinType type = expressionTypingServices.getType(TypeTestUtilsKt.asLexicalScope(scopeWithImports), ktExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, JetTestUtils.DUMMY_TRACE);
KotlinType type = expressionTypingServices.getType(TypeTestUtilsKt.asLexicalScope(scopeWithImports), ktExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, KotlinTestUtils.DUMMY_TRACE);
assertTrue(type + " != " + expectedType, type.equals(expectedType));
}
private void assertErrorType(String expression) {
Project project = getProject();
KtExpression ktExpression = KtPsiFactoryKt.KtPsiFactory(project).createExpression(expression);
KotlinType type = expressionTypingServices.safeGetType(TypeTestUtilsKt.asLexicalScope(scopeWithImports), ktExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, JetTestUtils.DUMMY_TRACE);
KotlinType type = expressionTypingServices.safeGetType(TypeTestUtilsKt.asLexicalScope(scopeWithImports), ktExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, KotlinTestUtils.DUMMY_TRACE);
assertTrue("Error type expected but " + type + " returned", type.isError());
}
@@ -595,7 +594,7 @@ public class JetTypeCheckerTest extends JetLiteFixture {
private KtScope getDeclarationsScope(String path) throws IOException {
ModuleDescriptor moduleDescriptor = LazyResolveTestUtil.resolve(
getProject(),
Collections.singletonList(JetTestUtils.loadJetFile(getProject(), new File(path))),
Collections.singletonList(KotlinTestUtils.loadJetFile(getProject(), new File(path))),
getEnvironment()
);
@@ -635,6 +634,6 @@ public class JetTypeCheckerTest extends JetLiteFixture {
}
private KotlinType makeType(KtScope scope, String typeStr) {
return typeResolver.resolveType(TypeTestUtilsKt.asLexicalScope(scope), KtPsiFactoryKt.KtPsiFactory(getProject()).createType(typeStr), JetTestUtils.DUMMY_TRACE, true);
return typeResolver.resolveType(TypeTestUtilsKt.asLexicalScope(scope), KtPsiFactoryKt.KtPsiFactory(getProject()).createType(typeStr), KotlinTestUtils.DUMMY_TRACE, true);
}
}
compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java → compiler/tests/org/jetbrains/kotlin/types/TypeBindingTestGenerated.java
View File