From ade544a8b7124de39d74257eb026a728a2d78618 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 23 Sep 2013 14:12:39 -0700 Subject: [PATCH] Test generator moved to the 'generators' module --- .../org/jetbrains/jet/generators/tests/GenerateTests.java | 6 +++--- .../tests}/generator/DelegatingTestClassModel.java | 2 +- .../generators/tests}/generator/SimpleTestClassModel.java | 2 +- .../generators/tests}/generator/SimpleTestMethodModel.java | 2 +- .../jet/generators/tests}/generator/TestClassModel.java | 2 +- .../jet/generators/tests}/generator/TestEntityModel.java | 2 +- .../jet/generators/tests}/generator/TestGenerator.java | 7 +++++-- .../jet/generators/tests}/generator/TestGeneratorUtil.java | 2 +- .../jet/generators/tests}/generator/TestMethodModel.java | 2 +- 9 files changed, 15 insertions(+), 12 deletions(-) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/DelegatingTestClassModel.java (96%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/SimpleTestClassModel.java (98%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/SimpleTestMethodModel.java (97%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/TestClassModel.java (94%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/TestEntityModel.java (93%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/TestGenerator.java (98%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/TestGeneratorUtil.java (95%) rename {compiler/tests/org/jetbrains/jet/test => generators/src/org/jetbrains/jet/generators/tests}/generator/TestMethodModel.java (93%) diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java index 226eee30419..dac7745c620 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.java @@ -57,9 +57,9 @@ import org.jetbrains.jet.psi.AbstractJetPsiMatcherTest; import org.jetbrains.jet.resolve.AbstractResolveBaseTest; import org.jetbrains.jet.resolve.AbstractResolveTest; import org.jetbrains.jet.safeDelete.AbstractJetSafeDeleteTest; -import org.jetbrains.jet.test.generator.SimpleTestClassModel; -import org.jetbrains.jet.test.generator.TestClassModel; -import org.jetbrains.jet.test.generator.TestGenerator; +import org.jetbrains.jet.generators.tests.generator.SimpleTestClassModel; +import org.jetbrains.jet.generators.tests.generator.TestClassModel; +import org.jetbrains.jet.generators.tests.generator.TestGenerator; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/test/generator/DelegatingTestClassModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/DelegatingTestClassModel.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/test/generator/DelegatingTestClassModel.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/DelegatingTestClassModel.java index 67071b90c60..02f2331ca43 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/DelegatingTestClassModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/DelegatingTestClassModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java index d933499754f..c6501e5813b 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestClassModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestClassModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import com.google.common.collect.Lists; import com.intellij.openapi.util.text.StringUtil; diff --git a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java index c11b64b7b56..dab86a0fc67 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/SimpleTestMethodModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/SimpleTestMethodModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestClassModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestClassModel.java similarity index 94% rename from compiler/tests/org/jetbrains/jet/test/generator/TestClassModel.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/TestClassModel.java index 3392f16d9fa..327c8d6e820 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestClassModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestClassModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestEntityModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestEntityModel.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/test/generator/TestEntityModel.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/TestEntityModel.java index b1b42bf3972..c02ea4f7576 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestEntityModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestEntityModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import org.jetbrains.annotations.Nullable; diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java index eedac399645..74a4a40236e 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import com.google.common.collect.Lists; import com.intellij.openapi.util.io.FileUtil; @@ -24,7 +24,10 @@ import org.jetbrains.jet.utils.Printer; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.List; public class TestGenerator { diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGeneratorUtil.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGeneratorUtil.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/test/generator/TestGeneratorUtil.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/TestGeneratorUtil.java index 863e1d2a193..755076b36d4 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGeneratorUtil.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestGeneratorUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; public class TestGeneratorUtil { public static String escapeForJavaIdentifier(String fileName) { diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestMethodModel.java b/generators/src/org/jetbrains/jet/generators/tests/generator/TestMethodModel.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/test/generator/TestMethodModel.java rename to generators/src/org/jetbrains/jet/generators/tests/generator/TestMethodModel.java index 197da93f546..7009a9d8d83 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestMethodModel.java +++ b/generators/src/org/jetbrains/jet/generators/tests/generator/TestMethodModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.generator; +package org.jetbrains.jet.generators.tests.generator; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.utils.Printer;