Move JVM specific proto comparison tests to separate dir

generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt

@@ -1219,6 +1219,7 @@ fun main(args: Array<String>) {
             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") {

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);
+        }
+    }
 }

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 = ""

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 = ""

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]

jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt

@@ -1,4 +1,4 @@
 package test
 
-class ClassWithSuperTypeListChanged : java.io.Serializable {
+class ClassWithSuperTypeListChanged : Throwable() {
 }

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()
+}

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()
+}

jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged/result.out

@@ -0,0 +1,3 @@
+changes in test/A: MEMBERS
+    [externalFlagAddedFun, externalFlagRemovedFun]
+