From 2315412c45161a54806eed8c4f8876c679c1be47 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 11 Jul 2012 16:26:10 +0400 Subject: [PATCH] One test suite per source file This removes annoying yellow nodes from IDEA test tree --- .../checkers/JetDiagnosticsTestGenerated.java | 13 +++++------- .../ReadJavaBinaryClassTestGenerated.java | 4 ++-- ...esolveNamespaceComparingTestGenerated.java | 21 ++++++++----------- .../jet/test/generator/TestGenerator.java | 9 ++++---- 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index a387b154639..d147fe7ae33 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -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; } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java index 8678007f7ae..70794cf4e9e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTestGenerated.java @@ -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); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java index 5abe05c4dfb..66104e0461b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java @@ -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; } diff --git a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java index 4bf2e9084ed..65795487f3c 100644 --- a/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java +++ b/compiler/tests/org/jetbrains/jet/test/generator/TestGenerator.java @@ -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;");