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 2

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-11-03 14:05:20 +01:00
parent c604f98a1c
commit 19af88738b
382 changed files with 21630 additions and 21661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt
+2 -2
View File
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment
import org.jetbrains.kotlin.resolve.lazy.ResolveSession
import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import java.io.File
import java.util.ArrayList
@@ -147,7 +147,7 @@ public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment
val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n")
val document = DocumentImpl(psiFile.getText())
UsefulTestCase.assertSameLines(JetTestUtils.getLastCommentedLines(document), renderedDescriptors.toString())
UsefulTestCase.assertSameLines(KotlinTestUtils.getLastCommentedLines(document), renderedDescriptors.toString())
}
override fun createEnvironment(): KotlinCoreEnvironment {
compiler/tests/org/jetbrains/kotlin/renderer/AbstractFunctionDescriptorInExpressionRendererTest.kt
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.addIfNotNull
import java.io.File
@@ -61,7 +61,7 @@ abstract public class AbstractFunctionDescriptorInExpressionRendererTest : Kotli
val renderedDescriptors = descriptors.map { renderer.render(it) }.joinToString(separator = "\n")
val document = DocumentImpl(file.getText())
UsefulTestCase.assertSameLines(JetTestUtils.getLastCommentedLines(document), renderedDescriptors.toString())
UsefulTestCase.assertSameLines(KotlinTestUtils.getLastCommentedLines(document), renderedDescriptors.toString())
}
override fun createEnvironment(): KotlinCoreEnvironment {
compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java
+15 -15
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.renderer;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
@@ -32,84 +32,84 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class)
public class DescriptorRendererTestGenerated extends AbstractDescriptorRendererTest {
public void testAllFilesPresentInRenderer() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("Classes.kt")
public void testClasses() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Classes.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/Classes.kt");
doTest(fileName);
}
@TestMetadata("Enum.kt")
public void testEnum() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/Enum.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/Enum.kt");
doTest(fileName);
}
@TestMetadata("ErrorType.kt")
public void testErrorType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/ErrorType.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/ErrorType.kt");
doTest(fileName);
}
@TestMetadata("FunctionTypes.kt")
public void testFunctionTypes() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypes.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypes.kt");
doTest(fileName);
}
@TestMetadata("FunctionTypesInSignature.kt")
public void testFunctionTypesInSignature() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypesInSignature.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/FunctionTypesInSignature.kt");
doTest(fileName);
}
@TestMetadata("GlobalFunctions.kt")
public void testGlobalFunctions() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalFunctions.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/GlobalFunctions.kt");
doTest(fileName);
}
@TestMetadata("GlobalProperties.kt")
public void testGlobalProperties() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/GlobalProperties.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/GlobalProperties.kt");
doTest(fileName);
}
@TestMetadata("InheritedMembersVisibility.kt")
public void testInheritedMembersVisibility() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/InheritedMembersVisibility.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/InheritedMembersVisibility.kt");
doTest(fileName);
}
@TestMetadata("KeywordsInNames.kt")
public void testKeywordsInNames() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/KeywordsInNames.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/KeywordsInNames.kt");
doTest(fileName);
}
@TestMetadata("ObjectWithConstructor.kt")
public void testObjectWithConstructor() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/ObjectWithConstructor.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/ObjectWithConstructor.kt");
doTest(fileName);
}
@TestMetadata("StarProjection.kt")
public void testStarProjection() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/StarProjection.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/StarProjection.kt");
doTest(fileName);
}
@TestMetadata("TraitWithConstructor.kt")
public void testTraitWithConstructor() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/TraitWithConstructor.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/TraitWithConstructor.kt");
doTest(fileName);
}
@TestMetadata("UnitType.kt")
public void testUnitType() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderer/UnitType.kt");
doTest(fileName);
}
}
compiler/tests/org/jetbrains/kotlin/renderer/FunctionDescriptorInExpressionRendererTestGenerated.java
+8 -8
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.renderer;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.junit.runner.RunWith;
@@ -32,42 +32,42 @@ import java.util.regex.Pattern;
@RunWith(JUnit3RunnerWithInners.class)
public class FunctionDescriptorInExpressionRendererTestGenerated extends AbstractFunctionDescriptorInExpressionRendererTest {
public void testAllFilesPresentInRenderFunctionDescriptorInExpression() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderFunctionDescriptorInExpression"), Pattern.compile("^(.+)\\.kt$"), true);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderFunctionDescriptorInExpression"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("basicFunExpr.kt")
public void testBasicFunExpr() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExpr.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExpr.kt");
doTest(fileName);
}
@TestMetadata("basicFunExprArgs.kt")
public void testBasicFunExprArgs() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExprArgs.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicFunExprArgs.kt");
doTest(fileName);
}
@TestMetadata("basicLambda.kt")
public void testBasicLambda() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicLambda.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/basicLambda.kt");
doTest(fileName);
}
@TestMetadata("labeledLambda.kt")
public void testLabeledLambda() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/labeledLambda.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/labeledLambda.kt");
doTest(fileName);
}
@TestMetadata("parenthesizedFunExpr.kt")
public void testParenthesizedFunExpr() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedFunExpr.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedFunExpr.kt");
doTest(fileName);
}
@TestMetadata("parenthesizedLambda.kt")
public void testParenthesizedLambda() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedLambda.kt");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/renderFunctionDescriptorInExpression/parenthesizedLambda.kt");
doTest(fileName);
}
}