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

One test suite per source file

Browse Source 
This removes annoying yellow nodes from IDEA test tree
This commit is contained in:
Andrey Breslav
2012-07-11 16:26:10 +04:00
parent 9d9eba2a49
commit 2315412c45
4 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java
+5 -8
View File
@@ -15,15 +15,12 @@
*/
package org.jetbrains.jet.checkers;
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestSuite;
import java.io.File;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest;
import java.io.File;
/** This class is generated by {@link org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest}. DO NOT MODIFY MANUALLY */
public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
@@ -1230,7 +1227,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("IncompleteCode");
suite.addTestSuite(IncompleteCode.class);
suite.addTestSuite(DiagnosticWithSyntaxError.class);
@@ -2622,7 +2619,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("Tests");
suite.addTestSuite(Tests.class);
suite.addTestSuite(Annotations.class);
@@ -2636,7 +2633,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
suite.addTestSuite(DeclarationChecks.class);
suite.addTestSuite(Extensions.class);
suite.addTestSuite(Generics.class);
suite.addTest(IncompleteCode.suite());
suite.addTest(IncompleteCode.innerSuite());
suite.addTestSuite(Inference.class);
suite.addTestSuite(Infos.class);
suite.addTestSuite(J_k.class);
@@ -2689,7 +2686,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
public static Test suite() {
TestSuite suite = new TestSuite("JetDiagnosticsTestGenerated");
suite.addTest(Tests.suite());
suite.addTest(Tests.innerSuite());
suite.addTestSuite(Script.class);
return suite;
}
compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java
+2 -2
View File
@@ -360,7 +360,7 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("KotlinSignature");
suite.addTestSuite(KotlinSignature.class);
suite.addTestSuite(Error.class);
@@ -428,7 +428,7 @@ public class ReadJavaBinaryClassTestGenerated extends AbstractReadJavaBinaryClas
suite.addTestSuite(Annotation.class);
suite.addTestSuite(Constructor.class);
suite.addTestSuite(JavaBean.class);
suite.addTest(KotlinSignature.suite());
suite.addTest(KotlinSignature.innerSuite());
suite.addTestSuite(Modality.class);
suite.addTestSuite(NotNull.class);
suite.addTestSuite(Vararg.class);
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+9 -12
View File
@@ -15,15 +15,12 @@
*/
package org.jetbrains.jet.lang.resolve.lazy;
import junit.framework.Assert;
import junit.framework.Test;
import junit.framework.TestSuite;
import java.io.File;
import org.jetbrains.jet.JetTestUtils;
import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest;
import java.io.File;
/** This class is generated by {@link org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveNamespaceComparingTest}. DO NOT MODIFY MANUALLY */
public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyResolveNamespaceComparingTest {
@@ -475,7 +472,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("Fun");
suite.addTestSuite(Fun.class);
suite.addTestSuite(GenericWithTypeVariables.class);
@@ -834,14 +831,14 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("ReadKotlinBinaryClass");
suite.addTestSuite(ReadKotlinBinaryClass.class);
suite.addTestSuite(Class.class);
suite.addTestSuite(ClassFun.class);
suite.addTestSuite(ClassObject.class);
suite.addTestSuite(Constructor.class);
suite.addTest(Fun.suite());
suite.addTest(Fun.innerSuite());
suite.addTestSuite(Prop.class);
suite.addTestSuite(Type.class);
suite.addTestSuite(Visibility.class);
@@ -1183,7 +1180,7 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("KotlinSignature");
suite.addTestSuite(KotlinSignature.class);
suite.addTestSuite(Error.class);
@@ -1245,13 +1242,13 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
}
public static Test suite() {
public static Test innerSuite() {
TestSuite suite = new TestSuite("ReadJavaBinaryClass");
suite.addTestSuite(ReadJavaBinaryClass.class);
suite.addTestSuite(Annotation.class);
suite.addTestSuite(Constructor.class);
suite.addTestSuite(JavaBean.class);
suite.addTest(KotlinSignature.suite());
suite.addTest(KotlinSignature.innerSuite());
suite.addTestSuite(Modality.class);
suite.addTestSuite(NotNull.class);
suite.addTestSuite(Vararg.class);
@@ -1294,8 +1291,8 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
public static Test suite() {
TestSuite suite = new TestSuite("LazyResolveNamespaceComparingTestGenerated");
suite.addTest(ReadKotlinBinaryClass.suite());
suite.addTest(ReadJavaBinaryClass.suite());
suite.addTest(ReadKotlinBinaryClass.innerSuite());
suite.addTest(ReadJavaBinaryClass.innerSuite());
suite.addTestSuite(NamespaceComparator.class);
return suite;
}
compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java
+5 -4
View File
@@ -151,15 +151,16 @@ public class TestGenerator {
}
if (!innerTestClasses.isEmpty()) {
generateSuiteMethod(p, testClassModel);
generateSuiteMethod(p, testClassModel, isStatic);
}
p.popIndent();
p.println("}");
}
private static void generateSuiteMethod(Printer p, TestClassModel testClassModel) {
p.println("public static Test suite() {");
private static void generateSuiteMethod(Printer p, TestClassModel testClassModel, boolean innerClass) {
String name = innerClass ? "innerSuite" : "suite";
p.println("public static Test " + name + "() {");
p.pushIndent();
p.println("TestSuite suite = new TestSuite(\"", testClassModel.getName(), "\");");
@@ -174,7 +175,7 @@ public class TestGenerator {
p.println("suite.addTestSuite(", innerTestClass.getName(), ".class);");
}
else {
p.println("suite.addTest(", innerTestClass.getName(), ".suite());");
p.println("suite.addTest(", innerTestClass.getName(), ".innerSuite());");
}
}
p.println("return suite;");