Moved test data into common directory.

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

@@ -660,7 +660,7 @@ fun main(args: Array<String>) {
 
     testGroup("jps-plugin/test", "jps-plugin/testData") {
         testClass(javaClass<AbstractIncrementalJpsTest>()) {
-            model("incremental/circularDependency", extension = null, excludeParentDirs = true)
+            model("incremental/multiModule", extension = null, excludeParentDirs = true)
             model("incremental/pureKotlin", extension = null, excludeParentDirs = true)
             model("incremental/withJava", extension = null, excludeParentDirs = true)
         }

jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java

@@ -28,21 +28,21 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-@InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class})
+@InnerTestClasses({IncrementalJpsTestGenerated.MultiModule.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class})
 @RunWith(JUnit3RunnerWithInners.class)
 public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
-    @TestMetadata("jps-plugin/testData/incremental/circularDependency")
+    @TestMetadata("jps-plugin/testData/incremental/multiModule")
     @TestDataPath("$PROJECT_ROOT")
     @InnerTestClasses({})
     @RunWith(JUnit3RunnerWithInners.class)
-    public static class CircularDependency extends AbstractIncrementalJpsTest {
-        public void testAllFilesPresentInCircularDependency() throws Exception {
-            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/circularDependency"), Pattern.compile("^([^\\.]+)$"), true);
+    public static class MultiModule extends AbstractIncrementalJpsTest {
+        public void testAllFilesPresentInMultiModule() throws Exception {
+            JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true);
         }
 
-        @TestMetadata("simple")
-        public void testSimple() throws Exception {
-            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/circularDependency/simple/");
+        @TestMetadata("circularDependencyTopLevelFunctions")
+        public void testCircularDependencyTopLevelFunctions() throws Exception {
+            String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/");
             doTest(fileName);
         }