From 19ad2406ff1e566d97a781934721c099b8959a5f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Nov 2014 18:07:31 +0300 Subject: [PATCH] Moved test data into common directory. --- .../jet/generators/tests/GenerateTests.kt | 2 +- .../jps/build/IncrementalJpsTestGenerated.java | 16 ++++++++-------- .../build.log | 0 .../dependencies.txt | 0 .../module1_a.kt | 0 .../module2_b.kt | 0 .../module2_b.kt.new | 0 7 files changed, 9 insertions(+), 9 deletions(-) rename jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/build.log (100%) rename jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/dependencies.txt (100%) rename jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/module1_a.kt (100%) rename jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/module2_b.kt (100%) rename jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/module2_b.kt.new (100%) diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 088631f1cee..7a4ebd7ba60 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -660,7 +660,7 @@ fun main(args: Array) { testGroup("jps-plugin/test", "jps-plugin/testData") { testClass(javaClass()) { - 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) } diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 44089d4fe3b..da301120372 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/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); } diff --git a/jps-plugin/testData/incremental/circularDependency/simple/build.log b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log similarity index 100% rename from jps-plugin/testData/incremental/circularDependency/simple/build.log rename to jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log diff --git a/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/dependencies.txt similarity index 100% rename from jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt rename to jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/dependencies.txt diff --git a/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module1_a.kt similarity index 100% rename from jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt rename to jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module1_a.kt diff --git a/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt similarity index 100% rename from jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt rename to jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt diff --git a/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new b/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt.new similarity index 100% rename from jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new rename to jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt.new