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

Rename jet -> kotlin in compiler-tests (except resolve)

Browse Source 
Move test-related code to org.jetbrains.kotlin.test, also move some tests to
packages with better names
This commit is contained in:
Alexander Udalov
2015-01-12 00:24:12 +03:00
parent 663d31709b
commit 3b81d63334
373 changed files with 1174 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+8 -8
View File
@@ -32,13 +32,13 @@ import org.jetbrains.kotlin.codegen.AbstractTopLevelMembersInvocationTest
import org.jetbrains.kotlin.codegen.AbstractCheckLocalVariablesTableTest
import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest
import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest
import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest
import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest
import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest
import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest
import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest
import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaTest
import org.jetbrains.kotlin.jvm.compiler.AbstractCompileJavaAgainstKotlinTest
import org.jetbrains.kotlin.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest
import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest
import org.jetbrains.kotlin.jvm.compiler.AbstractWriteSignatureTest
import org.jetbrains.kotlin.cli.AbstractKotlincExecutableTest
import org.jetbrains.jet.repl.AbstractReplInterpreterTest
import org.jetbrains.kotlin.repl.AbstractReplInterpreterTest
import org.jetbrains.kotlin.cfg.AbstractControlFlowTest
import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest
import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest
@@ -70,7 +70,7 @@ import org.jetbrains.jet.plugin.highlighter.AbstractDiagnosticMessageTest
import org.jetbrains.jet.plugin.codeInsight.AbstractOutOfBlockModificationTest
import org.jetbrains.jet.completion.AbstractDataFlowValueRenderingTest
import org.jetbrains.jet.resolve.annotation.AbstractAnnotationParameterTest
import org.jetbrains.jet.evaluate.AbstractEvaluateExpressionTest
import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest
import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest
import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest
import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel
@@ -131,7 +131,7 @@ import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest
import org.jetbrains.jet.resolve.AbstractPartialBodyResolveTest
import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib
import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest
import org.jetbrains.jet.types.AbstractJetTypeBindingTest
import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest
import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest
import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest
import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest
generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Processor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.utils.Printer;
import java.io.File;
generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.generators.tests.generator;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.InTextDirectivesUtils;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.kotlin.test.InTextDirectivesUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.utils.Printer;
import java.io.File;
generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.utils.Printer;
import java.io.File;
generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java
+10 -9
View File
@@ -22,10 +22,13 @@ import com.intellij.util.containers.ContainerUtil;
import junit.framework.TestCase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JUnit3RunnerWithInners;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.kotlin.utils.Printer;
import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil;
import org.jetbrains.kotlin.test.InnerTestClasses;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.TestMetadata;
import org.jetbrains.kotlin.utils.Printer;
import org.junit.runner.RunWith;
import java.io.File;
import java.io.IOException;
@@ -42,8 +45,6 @@ public class TestGenerator {
JS
}
public static final String NAVIGATION_METADATA = "navigationMetadata";
private static final Set<String> GENERATED_FILES = ContainerUtil.newHashSet();
private static final Class RUNNER = JUnit3RunnerWithInners.class;
@@ -80,11 +81,11 @@ public class TestGenerator {
p.println("package ", suiteClassPackage, ";");
p.println();
p.println("import com.intellij.testFramework.TestDataPath;");
p.println("import " + InnerTestClasses.class.getCanonicalName() + ";");
p.println("import ", RUNNER.getCanonicalName(), ";");
p.println("import org.jetbrains.jet.JetTestUtils;");
p.println("import org.jetbrains.jet.test.InnerTestClasses;");
p.println("import org.jetbrains.jet.test.TestMetadata;");
p.println("import org.junit.runner.RunWith;");
p.println("import " + JetTestUtils.class.getCanonicalName() + ";");
p.println("import " + TestMetadata.class.getCanonicalName() + ";");
p.println("import " + RunWith.class.getCanonicalName() + ";");
p.println();
p.println("import java.io.File;");
p.println("import java.util.regex.Pattern;");
generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt
+2 -2
View File
@@ -17,10 +17,10 @@
package org.jetbrains.kotlin.generators.test.evaluate
import com.intellij.testFramework.UsefulTestCase
import org.jetbrains.jet.JetTestUtils
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.generators.evaluate
public class GenerateOperationsMapTest() : UsefulTestCase() {
public class GenerateOperationsMapTest : UsefulTestCase() {
public fun testGeneratedDataIsUpToDate(): Unit {
val text = evaluate.generate()
JetTestUtils.assertEqualsToFile(evaluate.DEST_FILE, text)