Moved test generating code into TestsGenerator, got rid of duplicates.

This commit is contained in:
Evgeny Gerashchenko
2012-11-12 17:12:40 +04:00
parent cdc96225d0
commit 7b677d7ff1
14 changed files with 125 additions and 299 deletions
@@ -16,13 +16,6 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
import org.jetbrains.jet.test.generator.TestGenerator;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
/**
* @author udalov
*/
@@ -32,19 +25,4 @@ public abstract class AbstractDataClassCodegenTest extends CodegenTestCase {
super.setUp();
createEnvironmentWithFullJdk();
}
public static void main(String[] args) throws IOException {
Class<AbstractDataClassCodegenTest> thisClass = AbstractDataClassCodegenTest.class;
String aPackage = thisClass.getPackage().getName();
new TestGenerator(
"compiler/tests/",
aPackage,
"DataClassCodegenTestGenerated",
thisClass,
Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/codegen/dataClasses"), true, "kt", "blackBoxFileByFullPath")
),
thisClass
).generateAndSave();
}
}
@@ -16,13 +16,6 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
import org.jetbrains.jet.test.generator.TestGenerator;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
/**
* @author svtk
*/
@@ -37,20 +30,4 @@ public abstract class AbstractIntrinsicsTestCase extends CodegenTestCase {
super.setUp();
createEnvironmentWithMockJdkAndIdeaAnnotations();
}
public static void main(String[] args) throws IOException {
Class<AbstractIntrinsicsTestCase> thisClass = AbstractIntrinsicsTestCase.class;
String aPackage = thisClass.getPackage().getName();
new TestGenerator(
"compiler/tests/",
aPackage,
"IntrinsicsTestGenerated",
thisClass,
Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/codegen/intrinsics"), true, "kt", "blackBoxFileByFullPath")
),
thisClass
).generateAndSave();
}
}
@@ -16,13 +16,6 @@
package org.jetbrains.jet.codegen;
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
import org.jetbrains.jet.test.generator.TestGenerator;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
/**
* @author svtk
*/
@@ -37,20 +30,4 @@ public abstract class AbstractMultiDeclTestCase extends CodegenTestCase {
super.setUp();
createEnvironmentWithMockJdkAndIdeaAnnotations();
}
public static void main(String[] args) throws IOException {
Class<AbstractMultiDeclTestCase> thisClass = AbstractMultiDeclTestCase.class;
String aPackage = thisClass.getPackage().getName();
new TestGenerator(
"compiler/tests/",
aPackage,
"MultiDeclTestGenerated",
thisClass,
Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/codegen/multiDecl"), true, "kt", "blackBoxFileByFullPath")
),
thisClass
).generateAndSave();
}
}
@@ -16,7 +16,6 @@
package org.jetbrains.jet.codegen.flags;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.testFramework.UsefulTestCase;
import org.jetbrains.asm4.*;
@@ -26,13 +25,10 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.codegen.ClassFileFactory;
import org.jetbrains.jet.codegen.GenerationUtils;
import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
import org.jetbrains.jet.test.generator.TestGenerator;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.List;
import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefix;
@@ -85,21 +81,6 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
}
}
public static void main(String[] args) throws IOException {
String aPackage = "org.jetbrains.jet.codegen.flags";
Class<AbstractWriteFlagsTest> thisClass = AbstractWriteFlagsTest.class;
new TestGenerator(
"compiler/tests/",
aPackage,
"WriteFlagsTestGenerated",
thisClass,
Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/writeFlags"), true, "kt", "doTest")
),
thisClass
).generateAndSave();
}
private static TestedObject parseExpectedTestedObject(String fileText) {
TestedObject result = new TestedObject();
List<String> testedObjects = findListWithPrefix("// TESTED_OBJECTS: ", fileText);
@@ -17,14 +17,9 @@
package org.jetbrains.jet.codegen.labels;
import org.jetbrains.jet.ConfigurationKind;
import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
import org.jetbrains.jet.codegen.CodegenTestCase;
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
import org.jetbrains.jet.test.generator.TestGenerator;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
public abstract class AbstractLabelGenTest extends CodegenTestCase {
@@ -40,19 +35,4 @@ public abstract class AbstractLabelGenTest extends CodegenTestCase {
String relativePath = path.substring(REDUNDANT_PATH_PREFIX.length());
blackBoxFile(relativePath);
}
public static void main(String[] args) throws IOException {
String aPackage = "org.jetbrains.jet.codegen.labels";
Class<AbstractLabelGenTest> thisClass = AbstractLabelGenTest.class;
new TestGenerator(
"compiler/tests/",
aPackage,
"LabelGenTestGenerated",
thisClass,
Arrays.asList(
new SimpleTestClassModel(new File("compiler/testData/codegen/label"), true, "kt", "doTest")
),
thisClass
).generateAndSave();
}
}