From 2312013c41504d4a33cc520d3cfc3b59f81c387d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 21 Aug 2017 07:10:43 +0300 Subject: [PATCH] Move JVM specific IC tests to separate dir --- ...rementalJsCompilerRunnerTestGenerated.java | 12 ---------- ...ementalJvmCompilerRunnerTestGenerated.java | 24 +++++++++---------- .../build/IncrementalJpsTestGenerated.java | 24 +++++++++---------- .../a.kt | 0 .../b.kt | 0 .../b.kt.new | 0 .../build.log | 0 .../other.kt | 0 .../usage.kt | 0 .../defaultValueInConstructorAdded/A.kt | 0 .../defaultValueInConstructorAdded/A.kt.new.1 | 0 .../defaultValueInConstructorAdded/B.kt | 0 .../defaultValueInConstructorAdded/C.kt | 0 .../defaultValueInConstructorAdded/build.log | 0 .../createADefault.kt | 0 .../createANonDefault.kt | 0 .../defaultValueInConstructorAdded/createB.kt | 0 .../defaultValueInConstructorAdded/useA.kt | 0 .../defaultValueInConstructorAdded/useB.kt | 0 19 files changed, 24 insertions(+), 36 deletions(-) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/accessingFunctionsViaRenamedFileClass/a.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/accessingFunctionsViaRenamedFileClass/b.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/accessingFunctionsViaRenamedFileClass/b.kt.new (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/accessingFunctionsViaRenamedFileClass/build.log (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/accessingFunctionsViaRenamedFileClass/other.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/accessingFunctionsViaRenamedFileClass/usage.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/A.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/A.kt.new.1 (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/B.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/C.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/build.log (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/createADefault.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/createANonDefault.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/createB.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/useA.kt (100%) rename jps-plugin/testData/incremental/{pureKotlin => withJava/other}/defaultValueInConstructorAdded/useB.kt (100%) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java index a435ccdfa34..aeab6644286 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java @@ -40,12 +40,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("accessingFunctionsViaRenamedFileClass") - public void testAccessingFunctionsViaRenamedFileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); - doTest(fileName); - } - @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); @@ -212,12 +206,6 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa doTest(fileName); } - @TestMetadata("defaultValueInConstructorAdded") - public void testDefaultValueInConstructorAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); - doTest(fileName); - } - @TestMetadata("defaultValueInConstructorChanged") public void testDefaultValueInConstructorChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java index d9fe2fa7f5e..266856cea56 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java @@ -40,12 +40,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("accessingFunctionsViaRenamedFileClass") - public void testAccessingFunctionsViaRenamedFileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); - doTest(fileName); - } - @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); @@ -212,12 +206,6 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } - @TestMetadata("defaultValueInConstructorAdded") - public void testDefaultValueInConstructorAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); - doTest(fileName); - } - @TestMetadata("defaultValueInConstructorChanged") public void testDefaultValueInConstructorChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); @@ -1317,6 +1305,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Other extends AbstractIncrementalJvmCompilerRunnerTest { + @TestMetadata("accessingFunctionsViaRenamedFileClass") + public void testAccessingFunctionsViaRenamedFileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/"); + doTest(fileName); + } + public void testAllFilesPresentInOther() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @@ -1333,6 +1327,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement doTest(fileName); } + @TestMetadata("defaultValueInConstructorAdded") + public void testDefaultValueInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/"); + doTest(fileName); + } + @TestMetadata("inlineTopLevelFunctionWithJvmName") public void testInlineTopLevelFunctionWithJvmName() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/"); diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 3829cc8aadc..d305ec368f4 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -211,12 +211,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("accessingFunctionsViaRenamedFileClass") - public void testAccessingFunctionsViaRenamedFileClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); - doTest(fileName); - } - @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); @@ -383,12 +377,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("defaultValueInConstructorAdded") - public void testDefaultValueInConstructorAdded() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); - doTest(fileName); - } - @TestMetadata("defaultValueInConstructorChanged") public void testDefaultValueInConstructorChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); @@ -1158,6 +1146,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class Other extends AbstractIncrementalJpsTest { + @TestMetadata("accessingFunctionsViaRenamedFileClass") + public void testAccessingFunctionsViaRenamedFileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/"); + doTest(fileName); + } + public void testAllFilesPresentInOther() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @@ -1174,6 +1168,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("defaultValueInConstructorAdded") + public void testDefaultValueInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/"); + doTest(fileName); + } + @TestMetadata("inlineTopLevelFunctionWithJvmName") public void testInlineTopLevelFunctionWithJvmName() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/"); diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/a.kt b/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/a.kt rename to jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/a.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt b/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt rename to jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt.new b/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt.new rename to jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/b.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log rename to jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/other.kt b/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/other.kt rename to jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/other.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt b/jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt rename to jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass/usage.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1 similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/A.kt.new.1 diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/B.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/C.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/build.log diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createADefault.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createANonDefault.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/createB.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useA.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt b/jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt rename to jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/useB.kt