remove Jet from names of classes in tests: phase 2

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
@@ -21,7 +21,7 @@ import com.intellij.execution.util.ExecUtil;
import com.intellij.openapi.util.SystemInfo;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cli.common.ExitCode;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.TestCaseWithTmpdir;
import org.jetbrains.kotlin.utils.PathUtil;
@@ -46,7 +46,7 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir {
File outFile = new File(argsFilePath.replace(".args", ".out"));
try {
JetTestUtils.assertEqualsToFile(outFile, normalizedOutput);
KotlinTestUtils.assertEqualsToFile(outFile, normalizedOutput);
}
catch (Exception e) {
System.err.println("exit code " + exitCode);
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.cli.common.ExitCode;
import org.jetbrains.kotlin.cli.js.K2JSCompiler;
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.Tmpdir;
import org.jetbrains.kotlin.utils.ExceptionUtilsKt;
import org.junit.Rule;
@@ -95,7 +95,7 @@ public class CliBaseTest {
tmpdir.getTmpDir().getPath()));
String actual = getNormalizedCompilerOutput(outputAndExitCode.first, outputAndExitCode.second, testDataDir);
JetTestUtils.assertEqualsToFile(new File(testDataDir + "/" + testName.getMethodName() + ".out"), actual);
KotlinTestUtils.assertEqualsToFile(new File(testDataDir + "/" + testName.getMethodName() + ".out"), actual);
}
@NotNull
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli;
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;
@@ -34,228 +34,228 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
@RunWith(JUnit3RunnerWithInners.class)
public static class Jvm extends AbstractKotlincExecutableTest {
public void testAllFilesPresentInJvm() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), false);
}
@TestMetadata("classAndFileClassClash.args")
public void testClassAndFileClassClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndFileClassClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndFileClassClash.args");
doJvmTest(fileName);
}
@TestMetadata("classAndOtherFileClassClash.args")
public void testClassAndOtherFileClassClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndOtherFileClassClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndOtherFileClassClash.args");
doJvmTest(fileName);
}
@TestMetadata("classAndPartClash.args")
public void testClassAndPartClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndPartClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndPartClash.args");
doJvmTest(fileName);
}
@TestMetadata("classAndTraitClash.args")
public void testClassAndTraitClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndTraitClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classAndTraitClash.args");
doJvmTest(fileName);
}
@TestMetadata("classpath.args")
public void testClasspath() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/classpath.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/classpath.args");
doJvmTest(fileName);
}
@TestMetadata("conflictingOverloads.args")
public void testConflictingOverloads() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/conflictingOverloads.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/conflictingOverloads.args");
doJvmTest(fileName);
}
@TestMetadata("diagnosticsOrder.args")
public void testDiagnosticsOrder() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/diagnosticsOrder.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/diagnosticsOrder.args");
doJvmTest(fileName);
}
@TestMetadata("duplicateSources.args")
public void testDuplicateSources() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSources.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSources.args");
doJvmTest(fileName);
}
@TestMetadata("duplicateSourcesInModule.args")
public void testDuplicateSourcesInModule() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSourcesInModule.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/duplicateSourcesInModule.args");
doJvmTest(fileName);
}
@TestMetadata("emptySources.args")
public void testEmptySources() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/emptySources.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/emptySources.args");
doJvmTest(fileName);
}
@TestMetadata("extraHelp.args")
public void testExtraHelp() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/extraHelp.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/extraHelp.args");
doJvmTest(fileName);
}
@TestMetadata("fileClassAndMultifileClassClash.args")
public void testFileClassAndMultifileClassClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndMultifileClassClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndMultifileClassClash.args");
doJvmTest(fileName);
}
@TestMetadata("fileClassAndTImplClash.args")
public void testFileClassAndTImplClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndTImplClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassAndTImplClash.args");
doJvmTest(fileName);
}
@TestMetadata("fileClassClashMultipleFiles.args")
public void testFileClassClashMultipleFiles() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassClashMultipleFiles.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/fileClassClashMultipleFiles.args");
doJvmTest(fileName);
}
@TestMetadata("help.args")
public void testHelp() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/help.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/help.args");
doJvmTest(fileName);
}
@TestMetadata("inlineCycle.args")
public void testInlineCycle() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/inlineCycle.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/inlineCycle.args");
doJvmTest(fileName);
}
@TestMetadata("multipleTextRangesInDiagnosticsOrder.args")
public void testMultipleTextRangesInDiagnosticsOrder() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/multipleTextRangesInDiagnosticsOrder.args");
doJvmTest(fileName);
}
@TestMetadata("nonExistingClassPathAndAnnotationsPath.args")
public void testNonExistingClassPathAndAnnotationsPath() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingClassPathAndAnnotationsPath.args");
doJvmTest(fileName);
}
@TestMetadata("nonExistingSourcePath.args")
public void testNonExistingSourcePath() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingSourcePath.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonExistingSourcePath.args");
doJvmTest(fileName);
}
@TestMetadata("nonLocalDisabled.args")
public void testNonLocalDisabled() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonLocalDisabled.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonLocalDisabled.args");
doJvmTest(fileName);
}
@TestMetadata("nonexistentPathInModule.args")
public void testNonexistentPathInModule() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentPathInModule.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentPathInModule.args");
doJvmTest(fileName);
}
@TestMetadata("nonexistentScript.args")
public void testNonexistentScript() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentScript.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/nonexistentScript.args");
doJvmTest(fileName);
}
@TestMetadata("pluginSimple.args")
public void testPluginSimple() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimple.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimple.args");
doJvmTest(fileName);
}
@TestMetadata("pluginSimpleUsage.args")
public void testPluginSimpleUsage() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimpleUsage.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/pluginSimpleUsage.args");
doJvmTest(fileName);
}
@TestMetadata("sanitized-name.clash.args")
public void testSanitized_name_clash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/sanitized-name.clash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/sanitized-name.clash.args");
doJvmTest(fileName);
}
@TestMetadata("signatureClash.args")
public void testSignatureClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/signatureClash.args");
doJvmTest(fileName);
}
@TestMetadata("simple.args")
public void testSimple() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/simple.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/simple.args");
doJvmTest(fileName);
}
@TestMetadata("suppressAllWarningsJvm.args")
public void testSuppressAllWarningsJvm() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/suppressAllWarningsJvm.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/suppressAllWarningsJvm.args");
doJvmTest(fileName);
}
@TestMetadata("syntheticAccessorForPropertiesSignatureClash.args")
public void testSyntheticAccessorForPropertiesSignatureClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorForPropertiesSignatureClash.args");
doJvmTest(fileName);
}
@TestMetadata("syntheticAccessorPropertyAndFunSignatureClash.args")
public void testSyntheticAccessorPropertyAndFunSignatureClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorPropertyAndFunSignatureClash.args");
doJvmTest(fileName);
}
@TestMetadata("syntheticAccessorSignatureClash.args")
public void testSyntheticAccessorSignatureClash() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorSignatureClash.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/syntheticAccessorSignatureClash.args");
doJvmTest(fileName);
}
@TestMetadata("warningsInDummy.args")
public void testWarningsInDummy() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/warningsInDummy.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/warningsInDummy.args");
doJvmTest(fileName);
}
@TestMetadata("wrongAbiVersion.args")
public void testWrongAbiVersion() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersion.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersion.args");
doJvmTest(fileName);
}
@TestMetadata("wrongAbiVersionNoErrors.args")
public void testWrongAbiVersionNoErrors() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersionNoErrors.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongAbiVersionNoErrors.args");
doJvmTest(fileName);
}
@TestMetadata("wrongArgument.args")
public void testWrongArgument() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongArgument.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongArgument.args");
doJvmTest(fileName);
}
@TestMetadata("wrongKotlinSignature.args")
public void testWrongKotlinSignature() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongKotlinSignature.args");
doJvmTest(fileName);
}
@TestMetadata("wrongScriptWithNoSource.args")
public void testWrongScriptWithNoSource() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/wrongScriptWithNoSource.args");
doJvmTest(fileName);
}
}
@@ -265,120 +265,120 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes
@RunWith(JUnit3RunnerWithInners.class)
public static class Js extends AbstractKotlincExecutableTest {
public void testAllFilesPresentInJs() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), false);
KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), false);
}
@TestMetadata("createMetadata.args")
public void testCreateMetadata() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/createMetadata.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/createMetadata.args");
doJsTest(fileName);
}
@TestMetadata("diagnosticForClassLiteral.args")
public void testDiagnosticForClassLiteral() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForClassLiteral.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForClassLiteral.args");
doJsTest(fileName);
}
@TestMetadata("diagnosticForUnhandledElements.args")
public void testDiagnosticForUnhandledElements() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForUnhandledElements.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticForUnhandledElements.args");
doJsTest(fileName);
}
@TestMetadata("diagnosticWhenReferenceToBuiltinsMember.args")
public void testDiagnosticWhenReferenceToBuiltinsMember() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticWhenReferenceToBuiltinsMember.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/diagnosticWhenReferenceToBuiltinsMember.args");
doJsTest(fileName);
}
@TestMetadata("emptySources.args")
public void testEmptySources() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/emptySources.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/emptySources.args");
doJsTest(fileName);
}
@TestMetadata("inlineCycle.args")
public void testInlineCycle() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/inlineCycle.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/inlineCycle.args");
doJsTest(fileName);
}
@TestMetadata("jsExtraHelp.args")
public void testJsExtraHelp() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/jsExtraHelp.args");
doJsTest(fileName);
}
@TestMetadata("jsHelp.args")
public void testJsHelp() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/jsHelp.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/jsHelp.args");
doJsTest(fileName);
}
@TestMetadata("libraryDirNotFound.args")
public void testLibraryDirNotFound() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/libraryDirNotFound.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/libraryDirNotFound.args");
doJsTest(fileName);
}
@TestMetadata("nonExistingSourcePath.args")
public void testNonExistingSourcePath() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/nonExistingSourcePath.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/nonExistingSourcePath.args");
doJsTest(fileName);
}
@TestMetadata("notValidLibraryDir.args")
public void testNotValidLibraryDir() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/notValidLibraryDir.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/notValidLibraryDir.args");
doJsTest(fileName);
}
@TestMetadata("outputIsDirectory.args")
public void testOutputIsDirectory() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputIsDirectory.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/outputIsDirectory.args");
doJsTest(fileName);
}
@TestMetadata("outputPostfixFileNotFound.args")
public void testOutputPostfixFileNotFound() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPostfixFileNotFound.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/outputPostfixFileNotFound.args");
doJsTest(fileName);
}
@TestMetadata("outputPrefixFileNotFound.args")
public void testOutputPrefixFileNotFound() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/outputPrefixFileNotFound.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/outputPrefixFileNotFound.args");
doJsTest(fileName);
}
@TestMetadata("simple2js.args")
public void testSimple2js() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/simple2js.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/simple2js.args");
doJsTest(fileName);
}
@TestMetadata("suppressAllWarningsJS.args")
public void testSuppressAllWarningsJS() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/suppressAllWarningsJS.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/suppressAllWarningsJS.args");
doJsTest(fileName);
}
@TestMetadata("withFolderAsLib.args")
public void testWithFolderAsLib() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/withFolderAsLib.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/withFolderAsLib.args");
doJsTest(fileName);
}
@TestMetadata("withLib.args")
public void testWithLib() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/withLib.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/withLib.args");
doJsTest(fileName);
}
@TestMetadata("wrongAbiVersion.args")
public void testWrongAbiVersion() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/cli/js/wrongAbiVersion.args");
String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/wrongAbiVersion.args");
doJsTest(fileName);
}
}