From 5dd4e4cdd435b26deef420d7967843bf03d370df Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 15 Jun 2017 19:04:47 +0300 Subject: [PATCH] Move JVM specific proto comparison tests to separate dir --- .../kotlin/generators/tests/GenerateTests.kt | 1 + .../ProtoComparisonTestGenerated.java | 51 ++++++++++++------- .../membersFlagsChanged/new.kt | 4 -- .../membersFlagsChanged/old.kt | 4 -- .../membersFlagsChanged/result.out | 2 +- .../classWithSuperTypeListChanged/new.kt | 2 +- .../classToFileFacade/new.kt | 0 .../classToFileFacade/old.kt | 0 .../classToFileFacade/result.out | 0 .../jvmOnly/membersFlagsChanged/new.kt | 7 +++ .../jvmOnly/membersFlagsChanged/old.kt | 7 +++ .../jvmOnly/membersFlagsChanged/result.out | 3 ++ .../new1.kt | 0 .../new2.kt | 0 .../old1.kt | 0 .../old2.kt | 0 .../result.out | 0 .../packageFacadeToClass/new.kt | 0 .../packageFacadeToClass/old.kt | 0 .../packageFacadeToClass/result.out | 0 20 files changed, 53 insertions(+), 28 deletions(-) rename jps-plugin/testData/comparison/{classSignatureChange => jvmOnly}/classToFileFacade/new.kt (100%) rename jps-plugin/testData/comparison/{classSignatureChange => jvmOnly}/classToFileFacade/old.kt (100%) rename jps-plugin/testData/comparison/{classSignatureChange => jvmOnly}/classToFileFacade/result.out (100%) create mode 100644 jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/new.kt create mode 100644 jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/old.kt create mode 100644 jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out rename jps-plugin/testData/comparison/{packageMembers => jvmOnly}/packageFacadeMultifileClassChanged/new1.kt (100%) rename jps-plugin/testData/comparison/{packageMembers => jvmOnly}/packageFacadeMultifileClassChanged/new2.kt (100%) rename jps-plugin/testData/comparison/{packageMembers => jvmOnly}/packageFacadeMultifileClassChanged/old1.kt (100%) rename jps-plugin/testData/comparison/{packageMembers => jvmOnly}/packageFacadeMultifileClassChanged/old2.kt (100%) rename jps-plugin/testData/comparison/{packageMembers => jvmOnly}/packageFacadeMultifileClassChanged/result.out (100%) rename jps-plugin/testData/comparison/{classSignatureChange => jvmOnly}/packageFacadeToClass/new.kt (100%) rename jps-plugin/testData/comparison/{classSignatureChange => jvmOnly}/packageFacadeToClass/old.kt (100%) rename jps-plugin/testData/comparison/{classSignatureChange => jvmOnly}/packageFacadeToClass/result.out (100%) diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 187156c92b8..39b74e914e2 100755 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -1219,6 +1219,7 @@ fun main(args: Array) { model("comparison/packageMembers", extension = null, excludeParentDirs = true) model("comparison/unchanged", extension = null, excludeParentDirs = true) } + model("comparison/jvmOnly", extension = null, excludeParentDirs = true) } testGroup("plugins/plugins-tests/tests", "plugins/android-extensions/android-extensions-compiler/testData") { diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index bcd0ee79157..07a71ae9747 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -56,12 +56,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("classToFileFacade") - public void testClassToFileFacade() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); - doTest(fileName); - } - @TestMetadata("classTypeParameterListChanged") public void testClassTypeParameterListChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/"); @@ -73,12 +67,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); doTest(fileName); } - - @TestMetadata("packageFacadeToClass") - public void testPackageFacadeToClass() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); - doTest(fileName); - } } @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange") @@ -197,12 +185,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("packageFacadeMultifileClassChanged") - public void testPackageFacadeMultifileClassChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); - doTest(fileName); - } - @TestMetadata("packageFacadePrivateOnlyChanges") public void testPackageFacadePrivateOnlyChanges() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/"); @@ -236,4 +218,37 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } } + + @TestMetadata("jps-plugin/testData/comparison/jvmOnly") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JvmOnly extends AbstractProtoComparisonTest { + public void testAllFilesPresentInJvmOnly() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + } + + @TestMetadata("classToFileFacade") + public void testClassToFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/jvmOnly/classToFileFacade/"); + doTest(fileName); + } + + @TestMetadata("membersFlagsChanged") + public void testMembersFlagsChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/"); + doTest(fileName); + } + + @TestMetadata("packageFacadeMultifileClassChanged") + public void testPackageFacadeMultifileClassChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/"); + doTest(fileName); + } + + @TestMetadata("packageFacadeToClass") + public void testPackageFacadeToClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/"); + doTest(fileName); + } + } } diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt index c662c9dddcc..e9da791aa13 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt @@ -8,10 +8,6 @@ abstract class A { fun abstractFlagRemovedFun() {} abstract fun abstractFlagUnchangedFun() - external fun externalFlagAddedFun() - fun externalFlagRemovedFun() {} - external fun externalFlagUnchangedFun() - final val finalFlagAddedVal = "" val finalFlagRemovedVal = "" final val finalFlagUnchangedVal = "" diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt index ac61296a5fd..8eaad77a5d1 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt @@ -8,10 +8,6 @@ abstract class A { abstract fun abstractFlagRemovedFun() abstract fun abstractFlagUnchangedFun() - fun externalFlagAddedFun() {} - external fun externalFlagRemovedFun() - external fun externalFlagUnchangedFun() - val finalFlagAddedVal = "" final val finalFlagRemovedVal = "" final val finalFlagUnchangedVal = "" diff --git a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out index f767ff8431d..529f33d6682 100644 --- a/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out +++ b/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out @@ -1,4 +1,4 @@ changes in test/A: MEMBERS - [abstractFlagAddedFun, abstractFlagAddedVal, abstractFlagRemovedFun, abstractFlagRemovedVal, externalFlagAddedFun, externalFlagRemovedFun, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, lateinitFlagAddedVal, lateinitFlagRemovedVal, openFlagAddedFun, openFlagAddedVal, openFlagRemovedFun, openFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, protectedFlagAddedFun, protectedFlagAddedVal, protectedFlagRemovedFun, protectedFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun] + [abstractFlagAddedFun, abstractFlagAddedVal, abstractFlagRemovedFun, abstractFlagRemovedVal, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, lateinitFlagAddedVal, lateinitFlagRemovedVal, openFlagAddedFun, openFlagAddedVal, openFlagRemovedFun, openFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, protectedFlagAddedFun, protectedFlagAddedVal, protectedFlagRemovedFun, protectedFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun] changes in test/O: MEMBERS [constFlagAddedVal, constFlagRemovedVal] diff --git a/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt b/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt index 682185d1729..7632cc8272e 100644 --- a/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt +++ b/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt @@ -1,4 +1,4 @@ package test -class ClassWithSuperTypeListChanged : java.io.Serializable { +class ClassWithSuperTypeListChanged : Throwable() { } diff --git a/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/new.kt b/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/new.kt similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/new.kt rename to jps-plugin/testData/comparison/jvmOnly/classToFileFacade/new.kt diff --git a/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/old.kt b/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/old.kt similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/old.kt rename to jps-plugin/testData/comparison/jvmOnly/classToFileFacade/old.kt diff --git a/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out b/jps-plugin/testData/comparison/jvmOnly/classToFileFacade/result.out similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out rename to jps-plugin/testData/comparison/jvmOnly/classToFileFacade/result.out diff --git a/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/new.kt b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/new.kt new file mode 100644 index 00000000000..5ebb80f3de4 --- /dev/null +++ b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/new.kt @@ -0,0 +1,7 @@ +package test + +abstract class A { + external fun externalFlagAddedFun() + fun externalFlagRemovedFun() {} + external fun externalFlagUnchangedFun() +} diff --git a/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/old.kt b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/old.kt new file mode 100644 index 00000000000..ad26c6d328f --- /dev/null +++ b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/old.kt @@ -0,0 +1,7 @@ +package test + +abstract class A { + fun externalFlagAddedFun() {} + external fun externalFlagRemovedFun() + external fun externalFlagUnchangedFun() +} \ No newline at end of file diff --git a/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out new file mode 100644 index 00000000000..3d5dfe8cff9 --- /dev/null +++ b/jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out @@ -0,0 +1,3 @@ +changes in test/A: MEMBERS + [externalFlagAddedFun, externalFlagRemovedFun] + diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new1.kt b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new1.kt similarity index 100% rename from jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new1.kt rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new1.kt diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new2.kt b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new2.kt similarity index 100% rename from jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new2.kt rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/new2.kt diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old1.kt b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old1.kt similarity index 100% rename from jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old1.kt rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old1.kt diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old2.kt b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old2.kt similarity index 100% rename from jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old2.kt rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/old2.kt diff --git a/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out b/jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out similarity index 100% rename from jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged/result.out diff --git a/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/new.kt b/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/new.kt similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/new.kt rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/new.kt diff --git a/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/old.kt b/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/old.kt similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/old.kt rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/old.kt diff --git a/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out b/jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/result.out similarity index 100% rename from jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out rename to jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass/result.out