From a53166b73283ee111e9d5e69dec825e97eeaaf2e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 8 Feb 2016 21:25:14 +0530 Subject: [PATCH] CLI tests: rename CliBaseTest to AbstractCliTest --- .../{CliBaseTest.java => AbstractCliTest.java} | 2 +- .../cli/AbstractKotlincExecutableTest.java | 8 ++++---- .../kotlin/cli/WrongBytecodeVersionTest.kt | 4 ++-- .../org/jetbrains/kotlin/cli/js/K2JsCliTest.java | 4 ++-- .../jetbrains/kotlin/cli/jvm/K2JvmCliTest.java | 4 ++-- .../CompileKotlinAgainstCustomBinariesTest.java | 16 ++++++++-------- 6 files changed, 19 insertions(+), 19 deletions(-) rename compiler/tests/org/jetbrains/kotlin/cli/{CliBaseTest.java => AbstractCliTest.java} (99%) diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java similarity index 99% rename from compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java index 5b795153347..7e1cae4f756 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/AbstractCliTest.java @@ -45,7 +45,7 @@ import java.io.PrintStream; import java.util.ArrayList; import java.util.List; -public abstract class CliBaseTest extends TestCaseWithTmpdir { +public abstract class AbstractCliTest extends TestCaseWithTmpdir { static final String JS_TEST_DATA = "compiler/testData/cli/js"; static final String JVM_TEST_DATA = "compiler/testData/cli/jvm"; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java index 20034df4b27..957d3394878 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java @@ -34,7 +34,7 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir { File kotlincFile = new File(PathUtil.getKotlinPathsForDistDirectory().getHomePath(), "bin/" + executableFileName); assertTrue("kotlinc executable not found, probably you need to invoke 'dist' Ant target: " + kotlincFile.getAbsolutePath(), kotlincFile.exists()); - List args = CliBaseTest.readArgs(argsFilePath, testDataDir, tmpdir.getAbsolutePath()); + List args = AbstractCliTest.readArgs(argsFilePath, testDataDir, tmpdir.getAbsolutePath()); args.add(0, kotlincFile.getAbsolutePath()); ProcessOutput processOutput = ExecUtil.execAndGetOutput(args, null); @@ -42,7 +42,7 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir { String stderr = processOutput.getStderr(); int exitCode = processOutput.getExitCode(); - String normalizedOutput = CliBaseTest.getNormalizedCompilerOutput(stderr, ExitCode.values()[exitCode], testDataDir); + String normalizedOutput = AbstractCliTest.getNormalizedCompilerOutput(stderr, ExitCode.values()[exitCode], testDataDir); File outFile = new File(argsFilePath.replace(".args", ".out")); try { @@ -58,10 +58,10 @@ public abstract class AbstractKotlincExecutableTest extends TestCaseWithTmpdir { } protected void doJvmTest(@NotNull String argsFilePath) throws Exception { - doTest(argsFilePath, "kotlinc-jvm", CliBaseTest.JVM_TEST_DATA); + doTest(argsFilePath, "kotlinc-jvm", AbstractCliTest.JVM_TEST_DATA); } protected void doJsTest(@NotNull String argsFilePath) throws Exception { - doTest(argsFilePath, "kotlinc-js", CliBaseTest.JS_TEST_DATA); + doTest(argsFilePath, "kotlinc-js", AbstractCliTest.JS_TEST_DATA); } } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt index 4e19958ec69..5db023704be 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt @@ -45,7 +45,7 @@ class WrongBytecodeVersionTest : UsefulTestCase() { changeVersionInBytecode(classFile) } - val (output, exitCode) = CliBaseTest.executeCompilerGrabOutput(K2JVMCompiler(), listOf( + val (output, exitCode) = AbstractCliTest.executeCompilerGrabOutput(K2JVMCompiler(), listOf( usageSource.path, "-classpath", tmpdir.path, "-d", tmpdir.path @@ -53,7 +53,7 @@ class WrongBytecodeVersionTest : UsefulTestCase() { assertEquals("Compilation error expected", ExitCode.COMPILATION_ERROR, exitCode) - val normalized = CliBaseTest.getNormalizedCompilerOutput(output, exitCode, tmpdir.path, JvmBytecodeBinaryVersion.INSTANCE) + val normalized = AbstractCliTest.getNormalizedCompilerOutput(output, exitCode, tmpdir.path, JvmBytecodeBinaryVersion.INSTANCE) KotlinTestUtils.assertEqualsToFile(File(directory, "output.txt"), normalized) } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java index 149adc01c63..4d574ff9769 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.cli.js; -import org.jetbrains.kotlin.cli.CliBaseTest; +import org.jetbrains.kotlin.cli.AbstractCliTest; -public class K2JsCliTest extends CliBaseTest { +public class K2JsCliTest extends AbstractCliTest { public void testSimple2js() throws Exception { executeCompilerCompareOutputJS(); } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java index 8b001d868e6..b39af81bf6b 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.cli.jvm; -import org.jetbrains.kotlin.cli.CliBaseTest; +import org.jetbrains.kotlin.cli.AbstractCliTest; -public class K2JvmCliTest extends CliBaseTest { +public class K2JvmCliTest extends AbstractCliTest { public void testWrongAbiVersion() throws Exception { executeCompilerCompareOutputJVM(); } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 616a980b3f2..4c97165a649 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -23,7 +23,7 @@ import com.intellij.openapi.util.io.FileUtil; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.analyzer.AnalysisResult; -import org.jetbrains.kotlin.cli.CliBaseTest; +import org.jetbrains.kotlin.cli.AbstractCliTest; import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector; @@ -77,7 +77,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { @NotNull private String normalizeOutput(@NotNull Pair output) { - return CliBaseTest.getNormalizedCompilerOutput(output.getFirst(), output.getSecond(), getTestDataDirectory().getPath()); + return AbstractCliTest.getNormalizedCompilerOutput(output.getFirst(), output.getSecond(), getTestDataDirectory().getPath()); } private void doTestWithTxt(@NotNull File... extraClassPath) throws Exception { @@ -159,7 +159,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { File libSrc = new File(getTestDataDirectory(), "library/test/lib.kt"); - Pair outputLib = CliBaseTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( + Pair outputLib = AbstractCliTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( libSrc.getPath(), "-classpath", tmpdir.getPath(), "-d", tmpdir.getPath() @@ -167,7 +167,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { File mainSrc = new File(getTestDataDirectory(), "main.kt"); - Pair outputMain = CliBaseTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( + Pair outputMain = AbstractCliTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( mainSrc.getPath(), "-classpath", tmpdir.getPath(), "-d", tmpdir.getPath() @@ -240,7 +240,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { File source = new File(getTestDataDirectory(), "source.kt"); - Pair output = CliBaseTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( + Pair output = AbstractCliTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( source.getPath(), "-classpath", tmpdir.getPath(), "-d", tmpdir.getPath() @@ -256,7 +256,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { File source = new File(getTestDataDirectory(), "source.kt"); - Pair output = CliBaseTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( + Pair output = AbstractCliTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( source.getPath(), "-classpath", library.getPath(), "-d", tmpdir.getPath() @@ -269,7 +269,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { public void testInlineFunWithoutDebugInfo() throws Exception { File inlineSource = new File(getTestDataDirectory(), "sourceInline.kt"); - CliBaseTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( + AbstractCliTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( inlineSource.getPath(), "-d", tmpdir.getPath() )); @@ -303,7 +303,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { } File resultSource = new File(getTestDataDirectory(), "source.kt"); - CliBaseTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( + AbstractCliTest.executeCompilerGrabOutput(new K2JVMCompiler(), Arrays.asList( resultSource.getPath(), "-classpath", tmpdir.getPath(), "-d", tmpdir.getPath()