Moved test generating code into TestsGenerator, got rid of duplicates.
This commit is contained in:
-21
@@ -22,12 +22,8 @@ import org.jetbrains.jet.lang.psi.JetFile;
|
||||
import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter;
|
||||
import org.jetbrains.jet.lang.resolve.BindingContext;
|
||||
import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM;
|
||||
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;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
@@ -55,21 +51,4 @@ public abstract class AbstractDiagnosticsTestWithEagerResolve extends AbstractJe
|
||||
|
||||
assertTrue("Diagnostics mismatch. See the output above", ok);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String aPackage = "org.jetbrains.jet.checkers";
|
||||
Class<AbstractDiagnosticsTestWithEagerResolve> thisClass = AbstractDiagnosticsTestWithEagerResolve.class;
|
||||
new TestGenerator(
|
||||
"compiler/tests/",
|
||||
aPackage,
|
||||
"JetDiagnosticsTestGenerated",
|
||||
thisClass,
|
||||
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")
|
||||
),
|
||||
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 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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,13 +23,9 @@ import org.jetbrains.jet.analyzer.AnalyzeExhaust;
|
||||
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
|
||||
import org.jetbrains.jet.lang.resolve.BindingContext;
|
||||
import org.jetbrains.jet.test.TestCaseWithTmpdir;
|
||||
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
|
||||
import org.jetbrains.jet.test.generator.TestGenerator;
|
||||
import org.jetbrains.jet.test.util.NamespaceComparator;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME;
|
||||
import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalyzeExhaust;
|
||||
@@ -56,19 +52,4 @@ public abstract class AbstractLoadCompiledKotlinTest extends TestCaseWithTmpdir
|
||||
ConfigurationKind.JDK_ONLY);
|
||||
compareNamespaces(namespaceFromSource, namespaceFromClass, NamespaceComparator.DONT_INCLUDE_METHODS_OF_OBJECT, txtFile);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String aPackage = "org.jetbrains.jet.jvm.compiler";
|
||||
String extension = "kt";
|
||||
new TestGenerator(
|
||||
"compiler/tests/",
|
||||
aPackage,
|
||||
"LoadCompiledKotlinTestGenerated",
|
||||
AbstractLoadCompiledKotlinTest.class,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"), true, extension, "doTest")
|
||||
),
|
||||
AbstractLoadCompiledKotlinTest.class
|
||||
).generateAndSave();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,13 +20,9 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.ConfigurationKind;
|
||||
import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
|
||||
import org.jetbrains.jet.test.TestCaseWithTmpdir;
|
||||
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
|
||||
import org.jetbrains.jet.test.generator.TestGenerator;
|
||||
import org.junit.Assert;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
|
||||
import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.analyzeKotlinAndLoadTestNamespace;
|
||||
@@ -52,19 +48,4 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
|
||||
tmpdir, myTestRootDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
|
||||
compareNamespaces(nsa, nsb, DONT_INCLUDE_METHODS_OF_OBJECT, txtFile);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String aPackage = "org.jetbrains.jet.jvm.compiler";
|
||||
String extension = "java";
|
||||
new TestGenerator(
|
||||
"compiler/tests/",
|
||||
aPackage,
|
||||
"LoadJavaTestGenerated",
|
||||
AbstractLoadJavaTest.class,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, extension, "doTest")
|
||||
),
|
||||
AbstractLoadJavaTest.class
|
||||
).generateAndSave();
|
||||
}
|
||||
}
|
||||
|
||||
-24
@@ -31,13 +31,10 @@ import org.jetbrains.jet.lang.psi.*;
|
||||
import org.jetbrains.jet.lang.resolve.name.FqName;
|
||||
import org.jetbrains.jet.lang.resolve.name.Name;
|
||||
import org.jetbrains.jet.resolve.DescriptorRenderer;
|
||||
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.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
@@ -145,25 +142,4 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe
|
||||
Document document = new DocumentImpl(psiFile.getText());
|
||||
assertEquals(JetTestUtils.getLastCommentedLines(document), renderedDescriptors.toString());
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String extension = "kt";
|
||||
new TestGenerator(
|
||||
"compiler/tests/",
|
||||
AbstractLazyResolveDescriptorRendererTest.class.getPackage().getName(),
|
||||
"LazyResolveDescriptorRendererTestGenerated",
|
||||
AbstractLazyResolveDescriptorRendererTest.class,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("compiler/testData/renderer"),
|
||||
true,
|
||||
extension,
|
||||
"doTest"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/lazyResolve/descriptorRenderer"),
|
||||
true,
|
||||
extension,
|
||||
"doTest")
|
||||
),
|
||||
AbstractLazyResolveDescriptorRendererTest.class
|
||||
).generateAndSave();
|
||||
}
|
||||
}
|
||||
|
||||
+1
-22
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.lazy;
|
||||
|
||||
import com.google.common.base.Predicate;
|
||||
import com.intellij.openapi.util.io.FileUtil;
|
||||
import junit.framework.TestCase;
|
||||
import org.jetbrains.jet.JetTestUtils;
|
||||
import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest;
|
||||
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
|
||||
@@ -26,13 +25,9 @@ import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
|
||||
import org.jetbrains.jet.lang.psi.JetFile;
|
||||
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
|
||||
import org.jetbrains.jet.lang.resolve.name.Name;
|
||||
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
|
||||
import org.jetbrains.jet.test.generator.TestGenerator;
|
||||
import org.jetbrains.jet.test.util.NamespaceComparator;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@@ -41,7 +36,7 @@ import java.util.Set;
|
||||
*/
|
||||
public abstract class AbstractLazyResolveDiagnosticsTest extends AbstractJetDiagnosticsTest {
|
||||
|
||||
private static final File TEST_DATA_DIR = new File("compiler/testData/diagnostics/tests");
|
||||
public static final File TEST_DATA_DIR = new File("compiler/testData/diagnostics/tests");
|
||||
|
||||
@Override
|
||||
protected void analyzeAndCheck(File testDataFile, String expectedText, List<TestFile> files) {
|
||||
@@ -73,20 +68,4 @@ public abstract class AbstractLazyResolveDiagnosticsTest extends AbstractJetDiag
|
||||
}),
|
||||
txtFile);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
Class<? extends TestCase> thisClass = AbstractLazyResolveDiagnosticsTest.class;
|
||||
new TestGenerator(
|
||||
"compiler/tests/",
|
||||
thisClass.getPackage().getName(),
|
||||
"LazyResolveDiagnosticsTestGenerated",
|
||||
thisClass,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(TEST_DATA_DIR, true, "kt", "doTest")
|
||||
),
|
||||
thisClass
|
||||
).generateAndSave();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
-28
@@ -26,13 +26,10 @@ import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
|
||||
import org.jetbrains.jet.lang.psi.JetFile;
|
||||
import org.jetbrains.jet.lang.psi.JetPsiFactory;
|
||||
import org.jetbrains.jet.lang.resolve.name.Name;
|
||||
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
|
||||
import org.jetbrains.jet.test.generator.TestGenerator;
|
||||
import org.jetbrains.jet.test.util.NamespaceComparator;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@@ -78,29 +75,4 @@ public abstract class AbstractLazyResolveNamespaceComparingTest extends KotlinTe
|
||||
protected void doTestSinglePackage(String testFileName) throws Exception {
|
||||
doTest(testFileName);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String extension = "kt";
|
||||
new TestGenerator(
|
||||
"compiler/tests/",
|
||||
AbstractLazyResolveNamespaceComparingTest.class.getPackage().getName(),
|
||||
"LazyResolveNamespaceComparingTestGenerated",
|
||||
AbstractLazyResolveNamespaceComparingTest.class,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"),
|
||||
true,
|
||||
extension,
|
||||
"doTestSinglePackage"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadJava"),
|
||||
true,
|
||||
extension,
|
||||
"doTestSinglePackage"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/lazyResolve/namespaceComparator"),
|
||||
true,
|
||||
extension,
|
||||
"doTestSinglePackage")
|
||||
),
|
||||
AbstractLazyResolveNamespaceComparingTest.class
|
||||
).generateAndSave();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,6 +16,8 @@
|
||||
|
||||
package org.jetbrains.jet.generators;
|
||||
|
||||
import junit.framework.TestCase;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.checkers.AbstractDiagnosticsTestWithEagerResolve;
|
||||
import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest;
|
||||
import org.jetbrains.jet.codegen.AbstractDataClassCodegenTest;
|
||||
@@ -28,24 +30,133 @@ import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest;
|
||||
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest;
|
||||
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest;
|
||||
import org.jetbrains.jet.plugin.highlighter.AbstractDeprecatedHighlightingTest;
|
||||
import org.jetbrains.jet.test.generator.SimpleTestClassModel;
|
||||
import org.jetbrains.jet.test.generator.TestClassModel;
|
||||
import org.jetbrains.jet.test.generator.TestGenerator;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Arrays;
|
||||
|
||||
public class GenerateTests {
|
||||
private static void generateTest(
|
||||
@NotNull String baseDir,
|
||||
@NotNull String suiteClass,
|
||||
@NotNull Class<? extends TestCase> baseTestClass,
|
||||
@NotNull TestClassModel... testClassModels
|
||||
) throws IOException {
|
||||
new TestGenerator(
|
||||
baseDir,
|
||||
baseTestClass.getPackage().getName(),
|
||||
suiteClass,
|
||||
baseTestClass,
|
||||
Arrays.asList(testClassModels),
|
||||
GenerateTests.class
|
||||
).generateAndSave();
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
AbstractDiagnosticsTestWithEagerResolve.main(args);
|
||||
AbstractDataClassCodegenTest.main(args);
|
||||
AbstractIntrinsicsTestCase.main(args);
|
||||
AbstractMultiDeclTestCase.main(args);
|
||||
AbstractWriteFlagsTest.main(args);
|
||||
AbstractLabelGenTest.main(args);
|
||||
AbstractLoadCompiledKotlinTest.main(args);
|
||||
AbstractLoadJavaTest.main(args);
|
||||
AbstractLazyResolveDescriptorRendererTest.main(args);
|
||||
//AbstractLazyResolveDiagnosticsTest.main(args); - temporarily disabled
|
||||
AbstractLazyResolveNamespaceComparingTest.main(args);
|
||||
AbstractJetPsiCheckerTest.main(args);
|
||||
AbstractDeprecatedHighlightingTest.main(args);
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"JetDiagnosticsTestGenerated",
|
||||
AbstractDiagnosticsTestWithEagerResolve.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests"), true, "kt", "doTest"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests/script"), true, "ktscript", "doTest")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"DataClassCodegenTestGenerated",
|
||||
AbstractDataClassCodegenTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/codegen/dataClasses"), true, "kt", "blackBoxFileByFullPath")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"IntrinsicsTestGenerated",
|
||||
AbstractIntrinsicsTestCase.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/codegen/intrinsics"), true, "kt", "blackBoxFileByFullPath")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"MultiDeclTestGenerated",
|
||||
AbstractMultiDeclTestCase.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/codegen/multiDecl"), true, "kt", "blackBoxFileByFullPath")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"WriteFlagsTestGenerated",
|
||||
AbstractWriteFlagsTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/writeFlags"), true, "kt", "doTest")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"LabelGenTestGenerated",
|
||||
AbstractLabelGenTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/codegen/label"), true, "kt", "doTest")
|
||||
);
|
||||
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"LoadCompiledKotlinTestGenerated",
|
||||
AbstractLoadCompiledKotlinTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"), true, "kt", "doTest")
|
||||
);
|
||||
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"LoadJavaTestGenerated",
|
||||
AbstractLoadJavaTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, "java", "doTest")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"LazyResolveDescriptorRendererTestGenerated",
|
||||
AbstractLazyResolveDescriptorRendererTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/renderer"), true, "kt", "doTest"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/lazyResolve/descriptorRenderer"), true, "kt", "doTest")
|
||||
);
|
||||
|
||||
// TODO test is temporarily disabled
|
||||
//generateTest(
|
||||
// "compiler/tests/",
|
||||
// "org.jetbrains.jet.lang.resolve.lazy",
|
||||
// "LazyResolveDiagnosticsTestGenerated",
|
||||
// AbstractLazyResolveDiagnosticsTest.class,
|
||||
// new SimpleTestClassModel(AbstractLazyResolveDiagnosticsTest.TEST_DATA_DIR, true, "kt", "doTest")
|
||||
//);
|
||||
|
||||
generateTest(
|
||||
"compiler/tests/",
|
||||
"LazyResolveNamespaceComparingTestGenerated",
|
||||
AbstractLazyResolveNamespaceComparingTest.class,
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"), true, "kt", "doTestSinglePackage"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, "kt", "doTestSinglePackage"),
|
||||
new SimpleTestClassModel(new File("compiler/testData/lazyResolve/namespaceComparator"), true, "kt", "doTestSinglePackage")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"idea/tests/",
|
||||
"JetPsiCheckerTestGenerated",
|
||||
AbstractJetPsiCheckerTest.class,
|
||||
new SimpleTestClassModel(new File("idea/testData/checker"), false, "jet", "doTest"),
|
||||
new SimpleTestClassModel(new File("idea/testData/checker/regression"), true, "jet", "doTest"),
|
||||
new SimpleTestClassModel(new File("idea/testData/checker/rendering"), true, "kt", "doTest"),
|
||||
new SimpleTestClassModel(new File("idea/testData/checker/infos"), true, "jet", "doTestWithInfos")
|
||||
);
|
||||
|
||||
generateTest(
|
||||
"idea/tests/",
|
||||
"DeprecatedHighlightingTestGenerated",
|
||||
AbstractDeprecatedHighlightingTest.class,
|
||||
new SimpleTestClassModel(new File("idea/testData/highlighter/deprecated"), true, "kt", "doTest")
|
||||
);
|
||||
}
|
||||
|
||||
private GenerateTests() {
|
||||
|
||||
@@ -20,12 +20,6 @@ import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
|
||||
import com.intellij.openapi.projectRoots.Sdk;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.plugin.PluginTestCaseBase;
|
||||
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 abreslav
|
||||
@@ -48,22 +42,4 @@ public abstract class AbstractJetPsiCheckerTest extends LightDaemonAnalyzerTestC
|
||||
protected Sdk getProjectJDK() {
|
||||
return PluginTestCaseBase.jdkFromIdeaHome();
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
Class<AbstractJetPsiCheckerTest> thisClass = AbstractJetPsiCheckerTest.class;
|
||||
String aPackage = thisClass.getPackage().getName();
|
||||
new TestGenerator(
|
||||
"idea/tests/",
|
||||
aPackage,
|
||||
"JetPsiCheckerTestGenerated",
|
||||
thisClass,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("idea/testData/checker"), false, "jet", "doTest"),
|
||||
new SimpleTestClassModel(new File("idea/testData/checker/regression"), true, "jet", "doTest"),
|
||||
new SimpleTestClassModel(new File("idea/testData/checker/rendering"), true, "kt", "doTest"),
|
||||
new SimpleTestClassModel(new File("idea/testData/checker/infos"), true, "jet", "doTestWithInfos")
|
||||
),
|
||||
thisClass
|
||||
).generateAndSave();
|
||||
}
|
||||
}
|
||||
|
||||
-22
@@ -4,12 +4,6 @@ import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase;
|
||||
import com.intellij.openapi.projectRoots.Sdk;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.jet.plugin.PluginTestCaseBase;
|
||||
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 AbstractDeprecatedHighlightingTest extends LightDaemonAnalyzerTestCase {
|
||||
|
||||
@@ -27,20 +21,4 @@ public abstract class AbstractDeprecatedHighlightingTest extends LightDaemonAnal
|
||||
protected String getTestDataPath() {
|
||||
return PluginTestCaseBase.getTestDataPathBase() + "/highlighter/deprecated/";
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws IOException {
|
||||
String aPackage = "org.jetbrains.jet.plugin.highlighter";
|
||||
Class<AbstractDeprecatedHighlightingTest> thisClass = AbstractDeprecatedHighlightingTest.class;
|
||||
new TestGenerator(
|
||||
"idea/tests/",
|
||||
aPackage,
|
||||
"DeprecatedHighlightingTestGenerated",
|
||||
thisClass,
|
||||
Arrays.asList(
|
||||
new SimpleTestClassModel(new File("idea/testData/highlighter/deprecated"), true, "kt", "doTest")
|
||||
),
|
||||
thisClass
|
||||
).generateAndSave();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user