diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java index 95838d748a7..4c3324bd040 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskBaseTest.java @@ -24,9 +24,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; public abstract class AntTaskBaseTest extends KotlinIntegrationTestBase { + protected static final File ANT_TASK_TEST_DATA_BASE_DIR = new File(INTEGRATION_TEST_DATA_BASE_DIR, "ant"); + protected static final int SUCCESSFUL = 0; protected static final int FAILED = 1; @@ -43,7 +45,7 @@ public abstract class AntTaskBaseTest extends KotlinIntegrationTestBase { String[] basicArgs = { "-jar", getAntHome() + File.separator + "lib" + File.separator + "ant-launcher.jar", "-Dkotlin.lib=" + getCompilerLib(), - "-Dtest.data=" + testDataDir, + "-Dtest.data=" + getTestDataDir(), "-Dtemp=" + tmpdir.getTmpDir(), "-f", scriptName }; diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java index f79d9bef17f..b000d33277b 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJsTest.java @@ -22,7 +22,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.utils.fileUtils.FileUtilsPackage; import org.jetbrains.k2js.test.rhino.RhinoFunctionResultChecker; import org.jetbrains.k2js.test.rhino.RhinoUtils; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; import java.io.File; import java.io.IOException; @@ -33,6 +35,15 @@ import static org.junit.Assert.assertTrue; public class AntTaskJsTest extends AntTaskBaseTest { private static final String JS_OUT_FILE = "out.js"; + @Rule + public final TestName name = new TestName(); + + @NotNull + @Override + protected File getTestDataDir() { + return new File(new File(ANT_TASK_TEST_DATA_BASE_DIR, "js"), name.getMethodName()); + } + private void doJsAntTest() throws Exception { doAntTest(SUCCESSFUL); @@ -45,8 +56,8 @@ public class AntTaskJsTest extends AntTaskBaseTest { doJsAntTest(); File outputFile = getOutputFileByName(JS_OUT_FILE); - File prefixFile = prefix != null ? new File(testDataDir, prefix) : null; - File postfixFile = postfix != null ? new File(testDataDir, postfix) : null; + File prefixFile = prefix != null ? new File(getTestDataDir(), prefix) : null; + File postfixFile = postfix != null ? new File(getTestDataDir(), postfix) : null; checkFilePrefixPostfix(outputFile, prefixFile, postfixFile); } @@ -62,57 +73,57 @@ public class AntTaskJsTest extends AntTaskBaseTest { } @Test - public void k2jsSimple() throws Exception { + public void simple() throws Exception { doJsAntTest(); } @Test - public void k2jsWithMain() throws Exception { + public void simpleWithMain() throws Exception { doJsAntTest(); } @Test - public void k2jsWithMainFQArgs() throws Exception { + public void simpleWithMainFQArgs() throws Exception { doJsAntTest(); } @Test - public void k2jsWithMainVarargs() throws Exception { + public void simpleWithVarargMain() throws Exception { doJsAntTest(); } @Test - public void k2jsManySources() throws Exception { + public void manySources() throws Exception { doJsAntTest(); } @Test - public void k2jsWithoutSrcParam() throws Exception { + public void noSrcParam() throws Exception { doAntTest(FAILED); } @Test - public void k2jsWithoutOutputParam() throws Exception { + public void noOutputParam() throws Exception { doAntTest(FAILED); } @Test - public void k2jsWithPrefix() throws Exception { + public void outputPrefix() throws Exception { doJsAntTestForPostfixPrefix("prefix", null); } @Test - public void k2jsWithPostfix() throws Exception { + public void outputPostfix() throws Exception { doJsAntTestForPostfixPrefix(null, "postfix"); } @Test - public void k2jsWithPrefixAndPostfix() throws Exception { + public void bothPrefixAndPostfix() throws Exception { doJsAntTestForPostfixPrefix("prefix", "postfix"); } @Test - public void k2jsWithSourcemap() throws Exception { + public void sourcemap() throws Exception { doJsAntTest(); File sourcemap = getOutputFileByName(JS_OUT_FILE + ".map"); diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java index af86d67c1b8..71fa826035f 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/AntTaskJvmTest.java @@ -16,13 +16,25 @@ package org.jetbrains.kotlin; +import org.jetbrains.annotations.NotNull; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; import java.io.File; public class AntTaskJvmTest extends AntTaskBaseTest { private static final String JVM_OUT_FILE = "hello.jar"; + @Rule + public final TestName name = new TestName(); + + @NotNull + @Override + protected File getTestDataDir() { + return new File(new File(ANT_TASK_TEST_DATA_BASE_DIR, "jvm"), name.getMethodName()); + } + private void doJvmAntTest(String... extraJavaArgs) throws Exception { doAntTest(SUCCESSFUL, extraJavaArgs); @@ -40,17 +52,17 @@ public class AntTaskJvmTest extends AntTaskBaseTest { } @Test - public void antTaskJvm() throws Exception { + public void helloWorld() throws Exception { doJvmAntTest(); } @Test - public void antAdditionalArguments() throws Exception { + public void additionalArguments() throws Exception { doJvmAntTest(); } @Test - public void antWrongArguments() throws Exception { + public void wrongArguments() throws Exception { doAntTest(FAILED); } @@ -60,7 +72,7 @@ public class AntTaskJvmTest extends AntTaskBaseTest { } @Test - public void antTaskJvmManyRoots() throws Exception { + public void manySourceRoots() throws Exception { doJvmAntTest(); } diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java index 891f431f2b6..52505cc2c8a 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/CompilerSmokeTest.java @@ -16,15 +16,27 @@ package org.jetbrains.kotlin; +import org.jetbrains.annotations.NotNull; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestName; import java.io.File; import static org.junit.Assert.assertEquals; public class CompilerSmokeTest extends KotlinIntegrationTestBase { + @Rule + public final TestName name = new TestName(); + + @NotNull + @Override + protected File getTestDataDir() { + return new File(new File(INTEGRATION_TEST_DATA_BASE_DIR, "smoke"), name.getMethodName()); + } + @Test - public void compileAndRunHelloApp() throws Exception { + public void helloApp() throws Exception { String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "hello.jar"; assertEquals("compilation failed", 0, runCompiler("hello.compile", "-includeRuntime", "hello.kt", "-d", jar)); @@ -32,7 +44,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { } @Test - public void compileAndRunHelloAppFQMain() throws Exception { + public void helloAppFQMain() throws Exception { String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "hello.jar"; assertEquals("compilation failed", 0, runCompiler("hello.compile", "-includeRuntime", "hello.kt", "-d", jar)); @@ -40,7 +52,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { } @Test - public void compileAndRunHelloAppVarargMain() throws Exception { + public void helloAppVarargMain() throws Exception { String jar = tmpdir.getTmpDir().getAbsolutePath() + File.separator + "hello.jar"; assertEquals("compilation failed", 0, runCompiler("hello.compile", "-includeRuntime", "hello.kt", "-d", jar)); diff --git a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java index b8b72abd269..8b585b422ad 100644 --- a/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java +++ b/compiler/integration-tests/src/org/jetbrains/kotlin/KotlinIntegrationTestBase.java @@ -30,13 +30,11 @@ import com.intellij.util.ArrayUtil; import kotlin.Function1; import kotlin.KotlinPackage; import org.intellij.lang.annotations.Language; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.Tmpdir; import org.junit.ComparisonFailure; import org.junit.Rule; -import org.junit.rules.TestRule; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; import java.io.File; import java.io.IOException; @@ -49,25 +47,19 @@ import java.util.regex.Pattern; import static org.junit.Assert.*; public abstract class KotlinIntegrationTestBase { - protected File testDataDir; + protected static final File INTEGRATION_TEST_DATA_BASE_DIR = + new File(getKotlinProjectHome(), "compiler" + File.separator + "integration-tests" + File.separator + "testData"); @Rule public final Tmpdir tmpdir = new Tmpdir(); - @Rule - public TestRule watchman = new TestWatcher() { - @Override - protected void starting(Description description) { - File baseTestDataDir = - new File(getKotlinProjectHome(), "compiler" + File.separator + "integration-tests" + File.separator + "testData"); - testDataDir = new File(baseTestDataDir, description.getMethodName()); - } - }; - static { System.setProperty("java.awt.headless", "true"); } + @NotNull + protected abstract File getTestDataDir(); + protected int runCompiler(String logName, String... arguments) throws Exception { File lib = getCompilerLib(); @@ -86,7 +78,7 @@ public abstract class KotlinIntegrationTestBase { protected int runJava(String logName, String... arguments) throws Exception { GeneralCommandLine commandLine = new GeneralCommandLine(); - commandLine.setWorkDirectory(testDataDir); + commandLine.setWorkDirectory(getTestDataDir()); commandLine.setExePath(getJavaRuntime().getAbsolutePath()); commandLine.addParameters(arguments); @@ -118,7 +110,7 @@ public abstract class KotlinIntegrationTestBase { } protected String normalizeOutput(String content) { - content = normalizePath(content, testDataDir, "[TestData]"); + content = normalizePath(content, getTestDataDir(), "[TestData]"); content = normalizePath(content, tmpdir.getTmpDir(), "[Temp]"); content = normalizePath(content, getCompilerLib(), "[CompilerLib]"); content = StringUtil.convertLineSeparators(content); @@ -126,8 +118,8 @@ public abstract class KotlinIntegrationTestBase { } protected void check(String baseName, String content) throws IOException { - File actualFile = new File(testDataDir, baseName + ".actual"); - File expectedFile = new File(testDataDir, baseName + ".expected"); + File actualFile = new File(getTestDataDir(), baseName + ".actual"); + File expectedFile = new File(getTestDataDir(), baseName + ".expected"); String normalizedContent = normalizeOutput(content); diff --git a/compiler/integration-tests/testData/k2jsSimple/build.log.expected b/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsSimple/build.log.expected rename to compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/build.xml b/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/build.xml rename to compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithPostfix/postfix b/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/postfix similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPostfix/postfix rename to compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/postfix diff --git a/compiler/integration-tests/testData/k2jsWithPrefix/prefix b/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/prefix similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefix/prefix rename to compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/prefix diff --git a/compiler/integration-tests/testData/k2jsSimple/root1/foo.kt b/compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsSimple/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/bothPrefixAndPostfix/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsManySources/bar.kt b/compiler/integration-tests/testData/ant/js/manySources/bar.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsManySources/bar.kt rename to compiler/integration-tests/testData/ant/js/manySources/bar.kt diff --git a/compiler/integration-tests/testData/k2jsManySources/build.log.expected b/compiler/integration-tests/testData/ant/js/manySources/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsManySources/build.log.expected rename to compiler/integration-tests/testData/ant/js/manySources/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsManySources/build.xml b/compiler/integration-tests/testData/ant/js/manySources/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsManySources/build.xml rename to compiler/integration-tests/testData/ant/js/manySources/build.xml diff --git a/compiler/integration-tests/testData/k2jsManySources/root1/main.kt b/compiler/integration-tests/testData/ant/js/manySources/root1/main.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsManySources/root1/main.kt rename to compiler/integration-tests/testData/ant/js/manySources/root1/main.kt diff --git a/compiler/integration-tests/testData/k2jsManySources/root2/Bar.js b/compiler/integration-tests/testData/ant/js/manySources/root2/Bar.js similarity index 100% rename from compiler/integration-tests/testData/k2jsManySources/root2/Bar.js rename to compiler/integration-tests/testData/ant/js/manySources/root2/Bar.js diff --git a/compiler/integration-tests/testData/k2jsManySources/root2/Foo.kt b/compiler/integration-tests/testData/ant/js/manySources/root2/Foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsManySources/root2/Foo.kt rename to compiler/integration-tests/testData/ant/js/manySources/root2/Foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithoutOutputParam/build.log.expected b/compiler/integration-tests/testData/ant/js/noOutputParam/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithoutOutputParam/build.log.expected rename to compiler/integration-tests/testData/ant/js/noOutputParam/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithoutOutputParam/build.xml b/compiler/integration-tests/testData/ant/js/noOutputParam/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithoutOutputParam/build.xml rename to compiler/integration-tests/testData/ant/js/noOutputParam/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithoutSrcParam/build.log.expected b/compiler/integration-tests/testData/ant/js/noSrcParam/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithoutSrcParam/build.log.expected rename to compiler/integration-tests/testData/ant/js/noSrcParam/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithoutSrcParam/build.xml b/compiler/integration-tests/testData/ant/js/noSrcParam/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithoutSrcParam/build.xml rename to compiler/integration-tests/testData/ant/js/noSrcParam/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithMain/build.log.expected b/compiler/integration-tests/testData/ant/js/outputPostfix/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMain/build.log.expected rename to compiler/integration-tests/testData/ant/js/outputPostfix/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithPostfix/build.xml b/compiler/integration-tests/testData/ant/js/outputPostfix/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPostfix/build.xml rename to compiler/integration-tests/testData/ant/js/outputPostfix/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/postfix b/compiler/integration-tests/testData/ant/js/outputPostfix/postfix similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/postfix rename to compiler/integration-tests/testData/ant/js/outputPostfix/postfix diff --git a/compiler/integration-tests/testData/k2jsWithPostfix/root1/foo.kt b/compiler/integration-tests/testData/ant/js/outputPostfix/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPostfix/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/outputPostfix/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithMainFQArgs/build.log.expected b/compiler/integration-tests/testData/ant/js/outputPrefix/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMainFQArgs/build.log.expected rename to compiler/integration-tests/testData/ant/js/outputPrefix/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithPrefix/build.xml b/compiler/integration-tests/testData/ant/js/outputPrefix/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefix/build.xml rename to compiler/integration-tests/testData/ant/js/outputPrefix/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/prefix b/compiler/integration-tests/testData/ant/js/outputPrefix/prefix similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/prefix rename to compiler/integration-tests/testData/ant/js/outputPrefix/prefix diff --git a/compiler/integration-tests/testData/k2jsWithPrefix/root1/foo.kt b/compiler/integration-tests/testData/ant/js/outputPrefix/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefix/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/outputPrefix/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithMainVarargs/build.log.expected b/compiler/integration-tests/testData/ant/js/simple/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMainVarargs/build.log.expected rename to compiler/integration-tests/testData/ant/js/simple/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsSimple/build.xml b/compiler/integration-tests/testData/ant/js/simple/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsSimple/build.xml rename to compiler/integration-tests/testData/ant/js/simple/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/root1/foo.kt b/compiler/integration-tests/testData/ant/js/simple/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/simple/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithPostfix/build.log.expected b/compiler/integration-tests/testData/ant/js/simpleWithMain/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPostfix/build.log.expected rename to compiler/integration-tests/testData/ant/js/simpleWithMain/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithMain/build.xml b/compiler/integration-tests/testData/ant/js/simpleWithMain/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMain/build.xml rename to compiler/integration-tests/testData/ant/js/simpleWithMain/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithMain/root1/foo.kt b/compiler/integration-tests/testData/ant/js/simpleWithMain/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMain/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/simpleWithMain/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithPrefix/build.log.expected b/compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefix/build.log.expected rename to compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithMainFQArgs/build.xml b/compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMainFQArgs/build.xml rename to compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithMainFQArgs/root1/foo.kt b/compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMainFQArgs/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/simpleWithMainFQArgs/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/build.log.expected b/compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithPrefixAndPostfix/build.log.expected rename to compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithMainVarargs/build.xml b/compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMainVarargs/build.xml rename to compiler/integration-tests/testData/ant/js/simpleWithVarargMain/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithMainVarargs/root1/foo.kt b/compiler/integration-tests/testData/ant/js/simpleWithVarargMain/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithMainVarargs/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/simpleWithVarargMain/root1/foo.kt diff --git a/compiler/integration-tests/testData/k2jsWithSourcemap/build.log.expected b/compiler/integration-tests/testData/ant/js/sourcemap/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/k2jsWithSourcemap/build.log.expected rename to compiler/integration-tests/testData/ant/js/sourcemap/build.log.expected diff --git a/compiler/integration-tests/testData/k2jsWithSourcemap/build.xml b/compiler/integration-tests/testData/ant/js/sourcemap/build.xml similarity index 100% rename from compiler/integration-tests/testData/k2jsWithSourcemap/build.xml rename to compiler/integration-tests/testData/ant/js/sourcemap/build.xml diff --git a/compiler/integration-tests/testData/k2jsWithSourcemap/root1/foo.kt b/compiler/integration-tests/testData/ant/js/sourcemap/root1/foo.kt similarity index 100% rename from compiler/integration-tests/testData/k2jsWithSourcemap/root1/foo.kt rename to compiler/integration-tests/testData/ant/js/sourcemap/root1/foo.kt diff --git a/compiler/integration-tests/testData/antAdditionalArguments/build.log.expected b/compiler/integration-tests/testData/ant/jvm/additionalArguments/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/antAdditionalArguments/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/additionalArguments/build.log.expected diff --git a/compiler/integration-tests/testData/antAdditionalArguments/build.xml b/compiler/integration-tests/testData/ant/jvm/additionalArguments/build.xml similarity index 100% rename from compiler/integration-tests/testData/antAdditionalArguments/build.xml rename to compiler/integration-tests/testData/ant/jvm/additionalArguments/build.xml diff --git a/compiler/integration-tests/testData/antAdditionalArguments/hello.kt b/compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.kt similarity index 100% rename from compiler/integration-tests/testData/antAdditionalArguments/hello.kt rename to compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.kt diff --git a/compiler/integration-tests/testData/antAdditionalArguments/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/antAdditionalArguments/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/additionalArguments/hello.run.expected diff --git a/compiler/integration-tests/testData/externalAnnotations/build.log.expected b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.log.expected diff --git a/compiler/integration-tests/testData/externalAnnotations/build.xml b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.xml similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/build.xml rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/build.xml diff --git a/compiler/integration-tests/testData/externalAnnotations/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/hello.run.expected diff --git a/compiler/integration-tests/testData/externalAnnotations/root1/a/j/annotations.xml b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/a/j/annotations.xml similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/root1/a/j/annotations.xml rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/a/j/annotations.xml diff --git a/compiler/integration-tests/testData/externalAnnotations/root1/b/j/annotations.xml b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/b/j/annotations.xml similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/root1/b/j/annotations.xml rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/b/j/annotations.xml diff --git a/compiler/integration-tests/testData/externalAnnotations/root1/hello.kt b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/hello.kt similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/root1/hello.kt rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/hello.kt diff --git a/compiler/integration-tests/testData/externalAnnotations/root1/j/Java.java b/compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/j/Java.java similarity index 100% rename from compiler/integration-tests/testData/externalAnnotations/root1/j/Java.java rename to compiler/integration-tests/testData/ant/jvm/externalAnnotations/root1/j/Java.java diff --git a/compiler/integration-tests/testData/antTaskJvm/build.log.expected b/compiler/integration-tests/testData/ant/jvm/helloWorld/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/antTaskJvm/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/helloWorld/build.log.expected diff --git a/compiler/integration-tests/testData/antTaskJvm/build.xml b/compiler/integration-tests/testData/ant/jvm/helloWorld/build.xml similarity index 100% rename from compiler/integration-tests/testData/antTaskJvm/build.xml rename to compiler/integration-tests/testData/ant/jvm/helloWorld/build.xml diff --git a/compiler/integration-tests/testData/antTaskJvm/hello.kt b/compiler/integration-tests/testData/ant/jvm/helloWorld/hello.kt similarity index 100% rename from compiler/integration-tests/testData/antTaskJvm/hello.kt rename to compiler/integration-tests/testData/ant/jvm/helloWorld/hello.kt diff --git a/compiler/integration-tests/testData/antTaskJvm/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/helloWorld/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/antTaskJvm/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/helloWorld/hello.run.expected diff --git a/compiler/integration-tests/testData/javacCompiler/build.log.expected b/compiler/integration-tests/testData/ant/jvm/javacCompiler/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/javacCompiler/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/javacCompiler/build.log.expected diff --git a/compiler/integration-tests/testData/javacCompiler/build.xml b/compiler/integration-tests/testData/ant/jvm/javacCompiler/build.xml similarity index 100% rename from compiler/integration-tests/testData/javacCompiler/build.xml rename to compiler/integration-tests/testData/ant/jvm/javacCompiler/build.xml diff --git a/compiler/integration-tests/testData/javacCompiler/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/javacCompiler/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/javacCompiler/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/javacCompiler/hello.run.expected diff --git a/compiler/integration-tests/testData/javacCompiler/root1/hello.kt b/compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/hello.kt similarity index 100% rename from compiler/integration-tests/testData/javacCompiler/root1/hello.kt rename to compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/hello.kt diff --git a/compiler/integration-tests/testData/javacCompiler/root1/j/Java.java b/compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/j/Java.java similarity index 100% rename from compiler/integration-tests/testData/javacCompiler/root1/j/Java.java rename to compiler/integration-tests/testData/ant/jvm/javacCompiler/root1/j/Java.java diff --git a/compiler/integration-tests/testData/jvmClasspath/build.log.expected b/compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/jvmClasspath/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.log.expected diff --git a/compiler/integration-tests/testData/jvmClasspath/build.xml b/compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.xml similarity index 100% rename from compiler/integration-tests/testData/jvmClasspath/build.xml rename to compiler/integration-tests/testData/ant/jvm/jvmClasspath/build.xml diff --git a/compiler/integration-tests/testData/jvmClasspath/hello.kt b/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt similarity index 100% rename from compiler/integration-tests/testData/jvmClasspath/hello.kt rename to compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.kt diff --git a/compiler/integration-tests/testData/jvmClasspath/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/jvmClasspath/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/jvmClasspath/hello.run.expected diff --git a/compiler/integration-tests/testData/kotlinCompiler/build.log.expected b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.log.expected diff --git a/compiler/integration-tests/testData/kotlinCompiler/build.xml b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.xml similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/build.xml rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/build.xml diff --git a/compiler/integration-tests/testData/kotlinCompiler/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/hello.run.expected diff --git a/compiler/integration-tests/testData/kotlinCompiler/root1/a/j/annotations.xml b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/root1/a/j/annotations.xml rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/a/j/annotations.xml diff --git a/compiler/integration-tests/testData/kotlinCompiler/root1/b/j/annotations.xml b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/root1/b/j/annotations.xml rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/b/j/annotations.xml diff --git a/compiler/integration-tests/testData/kotlinCompiler/root1/hello.kt b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/hello.kt similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/root1/hello.kt rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/hello.kt diff --git a/compiler/integration-tests/testData/kotlinCompiler/root1/j/Java.java b/compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/j/Java.java similarity index 100% rename from compiler/integration-tests/testData/kotlinCompiler/root1/j/Java.java rename to compiler/integration-tests/testData/ant/jvm/kotlinCompiler/root1/j/Java.java diff --git a/compiler/integration-tests/testData/antTaskJvmManyRoots/build.log.expected b/compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/antTaskJvmManyRoots/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.log.expected diff --git a/compiler/integration-tests/testData/antTaskJvmManyRoots/build.xml b/compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.xml similarity index 100% rename from compiler/integration-tests/testData/antTaskJvmManyRoots/build.xml rename to compiler/integration-tests/testData/ant/jvm/manySourceRoots/build.xml diff --git a/compiler/integration-tests/testData/antTaskJvmManyRoots/hello.run.expected b/compiler/integration-tests/testData/ant/jvm/manySourceRoots/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/antTaskJvmManyRoots/hello.run.expected rename to compiler/integration-tests/testData/ant/jvm/manySourceRoots/hello.run.expected diff --git a/compiler/integration-tests/testData/antTaskJvmManyRoots/root1/hello.kt b/compiler/integration-tests/testData/ant/jvm/manySourceRoots/root1/hello.kt similarity index 100% rename from compiler/integration-tests/testData/antTaskJvmManyRoots/root1/hello.kt rename to compiler/integration-tests/testData/ant/jvm/manySourceRoots/root1/hello.kt diff --git a/compiler/integration-tests/testData/antTaskJvmManyRoots/root2/foo.kt b/compiler/integration-tests/testData/ant/jvm/manySourceRoots/root2/foo.kt similarity index 100% rename from compiler/integration-tests/testData/antTaskJvmManyRoots/root2/foo.kt rename to compiler/integration-tests/testData/ant/jvm/manySourceRoots/root2/foo.kt diff --git a/compiler/integration-tests/testData/antWrongArguments/build.log.expected b/compiler/integration-tests/testData/ant/jvm/wrongArguments/build.log.expected similarity index 100% rename from compiler/integration-tests/testData/antWrongArguments/build.log.expected rename to compiler/integration-tests/testData/ant/jvm/wrongArguments/build.log.expected diff --git a/compiler/integration-tests/testData/antWrongArguments/build.xml b/compiler/integration-tests/testData/ant/jvm/wrongArguments/build.xml similarity index 100% rename from compiler/integration-tests/testData/antWrongArguments/build.xml rename to compiler/integration-tests/testData/ant/jvm/wrongArguments/build.xml diff --git a/compiler/integration-tests/testData/antWrongArguments/hello.kt b/compiler/integration-tests/testData/ant/jvm/wrongArguments/hello.kt similarity index 100% rename from compiler/integration-tests/testData/antWrongArguments/hello.kt rename to compiler/integration-tests/testData/ant/jvm/wrongArguments/hello.kt diff --git a/compiler/integration-tests/testData/compilationFailed/hello.compile.expected b/compiler/integration-tests/testData/smoke/compilationFailed/hello.compile.expected similarity index 100% rename from compiler/integration-tests/testData/compilationFailed/hello.compile.expected rename to compiler/integration-tests/testData/smoke/compilationFailed/hello.compile.expected diff --git a/compiler/integration-tests/testData/compilationFailed/hello.kt b/compiler/integration-tests/testData/smoke/compilationFailed/hello.kt similarity index 100% rename from compiler/integration-tests/testData/compilationFailed/hello.kt rename to compiler/integration-tests/testData/smoke/compilationFailed/hello.kt diff --git a/compiler/integration-tests/testData/compileAndRunModule/Smoke.compile.expected b/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.compile.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunModule/Smoke.compile.expected rename to compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.compile.expected diff --git a/compiler/integration-tests/testData/compileAndRunModule/Smoke.kt b/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.kt similarity index 100% rename from compiler/integration-tests/testData/compileAndRunModule/Smoke.kt rename to compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.kt diff --git a/compiler/integration-tests/testData/compileAndRunModule/Smoke.ktm b/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.ktm similarity index 100% rename from compiler/integration-tests/testData/compileAndRunModule/Smoke.ktm rename to compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.ktm diff --git a/compiler/integration-tests/testData/compileAndRunModule/Smoke.run.expected b/compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.run.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunModule/Smoke.run.expected rename to compiler/integration-tests/testData/smoke/compileAndRunModule/Smoke.run.expected diff --git a/compiler/integration-tests/testData/compileAndRunHelloApp/hello.compile.expected b/compiler/integration-tests/testData/smoke/helloApp/hello.compile.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloApp/hello.compile.expected rename to compiler/integration-tests/testData/smoke/helloApp/hello.compile.expected diff --git a/compiler/integration-tests/testData/compileAndRunHelloApp/hello.kt b/compiler/integration-tests/testData/smoke/helloApp/hello.kt similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloApp/hello.kt rename to compiler/integration-tests/testData/smoke/helloApp/hello.kt diff --git a/compiler/integration-tests/testData/compileAndRunHelloApp/hello.run.expected b/compiler/integration-tests/testData/smoke/helloApp/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloApp/hello.run.expected rename to compiler/integration-tests/testData/smoke/helloApp/hello.run.expected diff --git a/compiler/integration-tests/testData/compileAndRunHelloAppFQMain/hello.compile.expected b/compiler/integration-tests/testData/smoke/helloAppFQMain/hello.compile.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloAppFQMain/hello.compile.expected rename to compiler/integration-tests/testData/smoke/helloAppFQMain/hello.compile.expected diff --git a/compiler/integration-tests/testData/compileAndRunHelloAppFQMain/hello.kt b/compiler/integration-tests/testData/smoke/helloAppFQMain/hello.kt similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloAppFQMain/hello.kt rename to compiler/integration-tests/testData/smoke/helloAppFQMain/hello.kt diff --git a/compiler/integration-tests/testData/compileAndRunHelloAppFQMain/hello.run.expected b/compiler/integration-tests/testData/smoke/helloAppFQMain/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloAppFQMain/hello.run.expected rename to compiler/integration-tests/testData/smoke/helloAppFQMain/hello.run.expected diff --git a/compiler/integration-tests/testData/compileAndRunHelloAppVarargMain/hello.compile.expected b/compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.compile.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloAppVarargMain/hello.compile.expected rename to compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.compile.expected diff --git a/compiler/integration-tests/testData/compileAndRunHelloAppVarargMain/hello.kt b/compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.kt similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloAppVarargMain/hello.kt rename to compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.kt diff --git a/compiler/integration-tests/testData/compileAndRunHelloAppVarargMain/hello.run.expected b/compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.run.expected similarity index 100% rename from compiler/integration-tests/testData/compileAndRunHelloAppVarargMain/hello.run.expected rename to compiler/integration-tests/testData/smoke/helloAppVarargMain/hello.run.expected diff --git a/compiler/integration-tests/testData/simpleScript/script.expected b/compiler/integration-tests/testData/smoke/simpleScript/script.expected similarity index 100% rename from compiler/integration-tests/testData/simpleScript/script.expected rename to compiler/integration-tests/testData/smoke/simpleScript/script.expected diff --git a/compiler/integration-tests/testData/simpleScript/script.kts b/compiler/integration-tests/testData/smoke/simpleScript/script.kts similarity index 100% rename from compiler/integration-tests/testData/simpleScript/script.kts rename to compiler/integration-tests/testData/smoke/simpleScript/script.kts diff --git a/compiler/integration-tests/testData/syntaxErrors/test.compile.expected b/compiler/integration-tests/testData/smoke/syntaxErrors/test.compile.expected similarity index 100% rename from compiler/integration-tests/testData/syntaxErrors/test.compile.expected rename to compiler/integration-tests/testData/smoke/syntaxErrors/test.compile.expected diff --git a/compiler/integration-tests/testData/syntaxErrors/test.kt b/compiler/integration-tests/testData/smoke/syntaxErrors/test.kt similarity index 100% rename from compiler/integration-tests/testData/syntaxErrors/test.kt rename to compiler/integration-tests/testData/smoke/syntaxErrors/test.kt