From ebc8ed1fdddac34e525d5abcec0eb5032043ee7d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 10 Jul 2012 15:21:12 +0400 Subject: [PATCH] TestGen: Base class passed instead of its name --- .../jet/checkers/AbstractJetDiagnosticsTest.java | 3 +-- .../jet/checkers/JetDiagnosticsTestGenerated.java | 2 +- .../compiler/AbstractReadJavaBinaryClassTest.java | 3 +-- .../lang/resolve/lazy/LazyResolveTestGenerator.java | 6 ++---- .../jetbrains/jet/test/generator/TestGenerator.java | 12 +++++------- 5 files changed, 10 insertions(+), 16 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index b7b67154ecb..fc373269d14 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -183,8 +183,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture { "compiler/tests/", aPackage, "JetDiagnosticsTestGenerated", - aPackage, - AbstractJetDiagnosticsTest.class.getSimpleName(), + AbstractJetDiagnosticsTest.class, Arrays.asList( new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests"), true, "kt", "doTest"), new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests/script"), true, "ktscript", "doTest") diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index d3271894365..dbd43517990 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.test.TestMetadata; import java.io.File; -/* This class is generated by org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest}. DO NOT MODIFY MANUALLY */ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests") public static class Tests extends AbstractJetDiagnosticsTest { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java index cf32aab1ca9..c3d5891ecb1 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java @@ -116,8 +116,7 @@ public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir "compiler/tests/", aPackage, "ReadJavaBinaryClassTestGenerated", - aPackage, - "AbstractReadJavaBinaryClassTest", + AbstractReadJavaBinaryClassTest.class, Arrays.asList( new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest") ), diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java index 224fbf4ada0..2e152c00391 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java @@ -41,8 +41,7 @@ public class LazyResolveTestGenerator { "compiler/tests/", TARGET_PACKAGE, "LazyResolveDescriptorRendererTestGenerated", - TARGET_PACKAGE, - "AbstractLazyResolveDescriptorRendererTest", + AbstractLazyResolveDescriptorRendererTest.class, Arrays.asList( new SimpleTestClassModel(new File("compiler/testData/renderer"), true, @@ -62,8 +61,7 @@ public class LazyResolveTestGenerator { "compiler/tests/", TARGET_PACKAGE, "LazyResolveNamespaceComparingTestGenerated", - TARGET_PACKAGE, - "AbstractLazyResolveNamespaceComparingTest", + AbstractLazyResolveNamespaceComparingTest.class, Arrays.asList( new SimpleTestClassModel(new File("compiler/testData/readKotlinBinaryClass"), true, diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java index bf98f212ad7..2fe68411b0a 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java @@ -137,12 +137,11 @@ public class TestGenerator { @NotNull String baseDir, @NotNull String suiteClassPackage, @NotNull String suiteClassName, - @NotNull String baseTestClassPackage, - @NotNull String baseTestClassName, + @NotNull Class baseTestClass, @NotNull Collection testClassModels, @NotNull String generatorName ) { - this(baseDir, suiteClassPackage, suiteClassName, baseTestClassPackage, baseTestClassName, testClassModels, + this(baseDir, suiteClassPackage, suiteClassName, baseTestClass, testClassModels, generatorName, TargetTestFrameworks.JUNIT_4); } @@ -150,8 +149,7 @@ public class TestGenerator { @NotNull String baseDir, @NotNull String suiteClassPackage, @NotNull String suiteClassName, - @NotNull String baseTestClassPackage, - @NotNull String baseTestClassName, + @NotNull Class baseTestClass, @NotNull Collection testClassModels, @NotNull String generatorName, @NotNull TargetTestFramework targetTestFramework @@ -159,8 +157,8 @@ public class TestGenerator { this.baseDir = baseDir; this.suiteClassPackage = suiteClassPackage; this.suiteClassName = suiteClassName; - this.baseTestClassPackage = baseTestClassPackage; - this.baseTestClassName = baseTestClassName; + this.baseTestClassPackage = baseTestClass.getPackage().getName(); + this.baseTestClassName = baseTestClass.getSimpleName(); this.testClassModels = Lists.newArrayList(testClassModels); this.generatorName = generatorName; this.targetTestFramework = targetTestFramework;