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

Made GenerateTests even more compact!

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-11-12 19:50:44 +04:00
parent 799a986812
commit 97d749f361
1 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/org/jetbrains/jet/generators/GenerateTests.java
+36 -19
View File
@@ -60,43 +60,43 @@ public class GenerateTests {
"compiler/tests/", "compiler/tests/",
"JetDiagnosticsTestGenerated", "JetDiagnosticsTestGenerated",
AbstractDiagnosticsTestWithEagerResolve.class, AbstractDiagnosticsTestWithEagerResolve.class,
new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests"), true, "kt", "doTest"), testModel("compiler/testData/diagnostics/tests"),
new SimpleTestClassModel(new File("compiler/testData/diagnostics/tests/script"), true, "ktscript", "doTest") testModel("compiler/testData/diagnostics/tests/script", true, "ktscript", "doTest")
); );
generateTest( generateTest(
"compiler/tests/", "compiler/tests/",
"DataClassCodegenTestGenerated", "DataClassCodegenTestGenerated",
AbstractDataClassCodegenTest.class, AbstractDataClassCodegenTest.class,
new SimpleTestClassModel(new File("compiler/testData/codegen/dataClasses"), true, "kt", "blackBoxFileByFullPath") testModel("compiler/testData/codegen/dataClasses", "blackBoxFileByFullPath")
); );
generateTest( generateTest(
"compiler/tests/", "compiler/tests/",
"IntrinsicsTestGenerated", "IntrinsicsTestGenerated",
AbstractIntrinsicsTestCase.class, AbstractIntrinsicsTestCase.class,
new SimpleTestClassModel(new File("compiler/testData/codegen/intrinsics"), true, "kt", "blackBoxFileByFullPath") testModel("compiler/testData/codegen/intrinsics", "blackBoxFileByFullPath")
); );
generateTest( generateTest(
"compiler/tests/", "compiler/tests/",
"MultiDeclTestGenerated", "MultiDeclTestGenerated",
AbstractMultiDeclTestCase.class, AbstractMultiDeclTestCase.class,
new SimpleTestClassModel(new File("compiler/testData/codegen/multiDecl"), true, "kt", "blackBoxFileByFullPath") testModel("compiler/testData/codegen/multiDecl", "blackBoxFileByFullPath")
); );
generateTest( generateTest(
"compiler/tests/", "compiler/tests/",
"WriteFlagsTestGenerated", "WriteFlagsTestGenerated",
AbstractWriteFlagsTest.class, AbstractWriteFlagsTest.class,
new SimpleTestClassModel(new File("compiler/testData/writeFlags"), true, "kt", "doTest") testModel("compiler/testData/writeFlags")
); );
generateTest( generateTest(
"compiler/tests/", "compiler/tests/",
"LabelGenTestGenerated", "LabelGenTestGenerated",
AbstractLabelGenTest.class, AbstractLabelGenTest.class,
new SimpleTestClassModel(new File("compiler/testData/codegen/label"), true, "kt", "doTest") testModel("compiler/testData/codegen/label")
); );
@@ -104,7 +104,7 @@ public class GenerateTests {
"compiler/tests/", "compiler/tests/",
"LoadCompiledKotlinTestGenerated", "LoadCompiledKotlinTestGenerated",
AbstractLoadCompiledKotlinTest.class, AbstractLoadCompiledKotlinTest.class,
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"), true, "kt", "doTest") testModel("compiler/testData/loadKotlin")
); );
@@ -112,15 +112,15 @@ public class GenerateTests {
"compiler/tests/", "compiler/tests/",
"LoadJavaTestGenerated", "LoadJavaTestGenerated",
AbstractLoadJavaTest.class, AbstractLoadJavaTest.class,
new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, "java", "doTest") testModel("compiler/testData/loadJava", true, "java", "doTest")
); );
generateTest( generateTest(
"compiler/tests/", "compiler/tests/",
"LazyResolveDescriptorRendererTestGenerated", "LazyResolveDescriptorRendererTestGenerated",
AbstractLazyResolveDescriptorRendererTest.class, AbstractLazyResolveDescriptorRendererTest.class,
new SimpleTestClassModel(new File("compiler/testData/renderer"), true, "kt", "doTest"), testModel("compiler/testData/renderer"),
new SimpleTestClassModel(new File("compiler/testData/lazyResolve/descriptorRenderer"), true, "kt", "doTest") testModel("compiler/testData/lazyResolve/descriptorRenderer")
); );
// TODO test is temporarily disabled // TODO test is temporarily disabled
@@ -136,28 +136,45 @@ public class GenerateTests {
"compiler/tests/", "compiler/tests/",
"LazyResolveNamespaceComparingTestGenerated", "LazyResolveNamespaceComparingTestGenerated",
AbstractLazyResolveNamespaceComparingTest.class, AbstractLazyResolveNamespaceComparingTest.class,
new SimpleTestClassModel(new File("compiler/testData/loadKotlin"), true, "kt", "doTestSinglePackage"), testModel("compiler/testData/loadKotlin", "doTestSinglePackage"),
new SimpleTestClassModel(new File("compiler/testData/loadJava"), true, "kt", "doTestSinglePackage"), testModel("compiler/testData/loadJava", "doTestSinglePackage"),
new SimpleTestClassModel(new File("compiler/testData/lazyResolve/namespaceComparator"), true, "kt", "doTestSinglePackage") testModel("compiler/testData/lazyResolve/namespaceComparator", "doTestSinglePackage")
); );
generateTest( generateTest(
"idea/tests/", "idea/tests/",
"JetPsiCheckerTestGenerated", "JetPsiCheckerTestGenerated",
AbstractJetPsiCheckerTest.class, AbstractJetPsiCheckerTest.class,
new SimpleTestClassModel(new File("idea/testData/checker"), false, "kt", "doTest"), testModel("idea/testData/checker", false, "kt", "doTest"),
new SimpleTestClassModel(new File("idea/testData/checker/regression"), true, "kt", "doTest"), testModel("idea/testData/checker/regression"),
new SimpleTestClassModel(new File("idea/testData/checker/rendering"), true, "kt", "doTest"), testModel("idea/testData/checker/rendering"),
new SimpleTestClassModel(new File("idea/testData/checker/infos"), true, "kt", "doTestWithInfos") testModel("idea/testData/checker/infos")
); );
generateTest( generateTest(
"idea/tests/", "idea/tests/",
"DeprecatedHighlightingTestGenerated", "DeprecatedHighlightingTestGenerated",
AbstractDeprecatedHighlightingTest.class, AbstractDeprecatedHighlightingTest.class,
new SimpleTestClassModel(new File("idea/testData/highlighter/deprecated"), true, "kt", "doTest") testModel("idea/testData/highlighter/deprecated")
); );
} }
private static SimpleTestClassModel testModel(@NotNull String rootPath) {
return testModel(rootPath, true, "kt", "doTest");
}
private static SimpleTestClassModel testModel(@NotNull String rootPath, @NotNull String methodName) {
return testModel(rootPath, true, "kt", methodName);
}
private static SimpleTestClassModel testModel(
@NotNull String rootPath,
boolean recursive,
@NotNull String extension,
@NotNull String doTestMethodName
) {
return new SimpleTestClassModel(new File(rootPath), recursive, extension, doTestMethodName);
}
private GenerateTests() { private GenerateTests() {
} }