azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TestGen: Base class passed instead of its name

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-10 15:21:12 +04:00
parent b5e82adb5c
commit ebc8ed1fdd
5 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java
+1 -2
View File
@@ -183,8 +183,7 @@ public abstract class AbstractJetDiagnosticsTest extends JetLiteFixture {
"compiler/tests/", "compiler/tests/",
aPackage, aPackage,
"JetDiagnosticsTestGenerated", "JetDiagnosticsTestGenerated",
aPackage, AbstractJetDiagnosticsTest.class,
AbstractJetDiagnosticsTest.class.getSimpleName(),
Arrays.asList( Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests"), true, "kt", "doTest"), new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests"), true, "kt", "doTest"),
new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests/script"), true, "ktscript", "doTest") new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests/script"), true, "ktscript", "doTest")
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.jet.test.TestMetadata;
import java.io.File; 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 { public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@TestMetadata("compiler/testData/diagnostics/tests") @TestMetadata("compiler/testData/diagnostics/tests")
public static class Tests extends AbstractJetDiagnosticsTest { public static class Tests extends AbstractJetDiagnosticsTest {
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java
+1 -2
View File
@@ -116,8 +116,7 @@ public abstract class AbstractReadJavaBinaryClassTest extends TestCaseWithTmpdir
"compiler/tests/", "compiler/tests/",
aPackage, aPackage,
"ReadJavaBinaryClassTestGenerated", "ReadJavaBinaryClassTestGenerated",
aPackage, AbstractReadJavaBinaryClassTest.class,
"AbstractReadJavaBinaryClassTest",
Arrays.asList( Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest") new SimpleTestClassModel(new File("compiler/testData/readJavaBinaryClass"), true, extension, "doTest")
), ),
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerator.java
+2 -4
View File
@@ -41,8 +41,7 @@ public class LazyResolveTestGenerator {
"compiler/tests/", "compiler/tests/",
TARGET_PACKAGE, TARGET_PACKAGE,
"LazyResolveDescriptorRendererTestGenerated", "LazyResolveDescriptorRendererTestGenerated",
TARGET_PACKAGE, AbstractLazyResolveDescriptorRendererTest.class,
"AbstractLazyResolveDescriptorRendererTest",
Arrays.asList( Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/renderer"), new SimpleTestClassModel(new File("compiler/testData/renderer"),
true, true,
@@ -62,8 +61,7 @@ public class LazyResolveTestGenerator {
"compiler/tests/", "compiler/tests/",
TARGET_PACKAGE, TARGET_PACKAGE,
"LazyResolveNamespaceComparingTestGenerated", "LazyResolveNamespaceComparingTestGenerated",
TARGET_PACKAGE, AbstractLazyResolveNamespaceComparingTest.class,
"AbstractLazyResolveNamespaceComparingTest",
Arrays.asList( Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/readKotlinBinaryClass"), new SimpleTestClassModel(new File("compiler/testData/readKotlinBinaryClass"),
true, true,
compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
+5 -7
View File
@@ -137,12 +137,11 @@ public class TestGenerator {
@NotNull String baseDir, @NotNull String baseDir,
@NotNull String suiteClassPackage, @NotNull String suiteClassPackage,
@NotNull String suiteClassName, @NotNull String suiteClassName,
@NotNull String baseTestClassPackage, @NotNull Class<?> baseTestClass,
@NotNull String baseTestClassName,
@NotNull Collection<? extends TestClassModel> testClassModels, @NotNull Collection<? extends TestClassModel> testClassModels,
@NotNull String generatorName @NotNull String generatorName
) { ) {
this(baseDir, suiteClassPackage, suiteClassName, baseTestClassPackage, baseTestClassName, testClassModels, this(baseDir, suiteClassPackage, suiteClassName, baseTestClass, testClassModels,
generatorName, TargetTestFrameworks.JUNIT_4); generatorName, TargetTestFrameworks.JUNIT_4);
} }
@@ -150,8 +149,7 @@ public class TestGenerator {
@NotNull String baseDir, @NotNull String baseDir,
@NotNull String suiteClassPackage, @NotNull String suiteClassPackage,
@NotNull String suiteClassName, @NotNull String suiteClassName,
@NotNull String baseTestClassPackage, @NotNull Class<?> baseTestClass,
@NotNull String baseTestClassName,
@NotNull Collection<? extends TestClassModel> testClassModels, @NotNull Collection<? extends TestClassModel> testClassModels,
@NotNull String generatorName, @NotNull String generatorName,
@NotNull TargetTestFramework targetTestFramework @NotNull TargetTestFramework targetTestFramework
@@ -159,8 +157,8 @@ public class TestGenerator {
this.baseDir = baseDir; this.baseDir = baseDir;
this.suiteClassPackage = suiteClassPackage; this.suiteClassPackage = suiteClassPackage;
this.suiteClassName = suiteClassName; this.suiteClassName = suiteClassName;
this.baseTestClassPackage = baseTestClassPackage; this.baseTestClassPackage = baseTestClass.getPackage().getName();
this.baseTestClassName = baseTestClassName; this.baseTestClassName = baseTestClass.getSimpleName();
this.testClassModels = Lists.newArrayList(testClassModels); this.testClassModels = Lists.newArrayList(testClassModels);
this.generatorName = generatorName; this.generatorName = generatorName;
this.targetTestFramework = targetTestFramework; this.targetTestFramework = targetTestFramework;