TestGen: Base class passed instead of its name

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

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 {

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")
                 ),

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,

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<? extends TestClassModel> 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<? extends TestClassModel> 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;