From 041d009b9af68512e7bd166cb7229b5a0f1ac59c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 9 Sep 2014 12:12:39 +0400 Subject: [PATCH] Regenerate tests --- .../asJava/KotlinLightClassTestGenerated.java | 12 +- .../jet/cfg/ControlFlowTestGenerated.java | 45 +-- .../jet/cfg/DataFlowTestGenerated.java | 14 +- .../jet/cfg/PseudoValueTestGenerated.java | 64 ++-- .../checkers/JetDiagnosticsTestGenerated.java | 327 ++++++------------ ...JetDiagnosticsTestWithStdLibGenerated.java | 38 +- .../cli/KotlincExecutableTestGenerated.java | 23 +- .../codegen/BytecodeTextTestGenerated.java | 22 +- ...CheckLocalVariablesTableTestGenerated.java | 3 + .../codegen/ScriptCodegenTestGenerated.java | 3 + ...opLevelMembersInvocationTestGenerated.java | 3 + ...faultArgumentsReflectionTestGenerated.java | 3 + .../flags/WriteFlagsTestGenerated.java | 78 ++--- ...ackBoxAgainstJavaCodegenTestGenerated.java | 64 ++-- .../BlackBoxCodegenTestGenerated.java | 231 +++++-------- .../BlackBoxInlineCodegenTestGenerated.java | 45 +-- ...BlackBoxMultiFileCodegenTestGenerated.java | 3 + .../BlackBoxWithJavaCodegenTestGenerated.java | 3 + ...lackBoxWithStdlibCodegenTestGenerated.java | 124 +++---- .../EvaluateExpressionTestGenerated.java | 13 +- ...CompileJavaAgainstKotlinTestGenerated.java | 34 +- ...otlinAgainstInlineKotlinTestGenerated.java | 45 +-- ...mpileKotlinAgainstKotlinTestGenerated.java | 3 + .../jvm/compiler/LoadJavaTestGenerated.java | 243 ++++--------- .../compiler/WriteSignatureTestGenerated.java | 14 +- ...esolveDescriptorRendererTestGenerated.java | 3 + ...esolveRecursiveComparingTestGenerated.java | 124 +++---- .../lazy/LazyResolveTestGenerated.java | 3 + .../xml/ModuleXmlParserTestGenerated.java | 3 + .../jet/parsing/JetParsingTestGenerated.java | 51 ++- .../repl/ReplInterpreterTestGenerated.java | 18 +- .../jet/resolve/ResolveTestGenerated.java | 20 +- .../AnnotationParameterTestGenerated.java | 10 +- .../calls/ResolvedCallsTestGenerated.java | 41 +-- .../ConstraintSystemTestGenerated.java | 18 +- .../checkers/JetJsCheckerTestGenerated.java | 3 + .../checkers/JetPsiCheckerTestGenerated.java | 30 +- ...edKotlinInJavaCompletionTestGenerated.java | 8 +- .../DataFlowValueRenderingTestGenerated.java | 3 + .../JSBasicCompletionTestGenerated.java | 20 +- .../JvmBasicCompletionTestGenerated.java | 20 +- .../JvmSmartCompletionTestGenerated.java | 3 + ...vmWithLibBasicCompletionTestGenerated.java | 3 + .../KeywordCompletionTestGenerated.java | 3 + ...inSourceInJavaCompletionTestGenerated.java | 8 +- ...tiFileJvmBasicCompletionTestGenerated.java | 3 + .../SmartCompletionHandlerTestGenerated.java | 3 + .../CompletionWeigherTestGenerated.java | 3 + .../JetQuickDocProviderTestGenerated.java | 3 + .../JetFindUsagesTestGenerated.java | 49 +-- .../formatter/JetFormatterTestGenerated.java | 23 +- ...JetTypingIndentationTestBaseGenerated.java | 23 +- .../JavaTypeSubstitutorTestGenerated.java | 3 + .../ExpressionSelectionTestGenerated.java | 3 + .../plugin/SmartSelectionTestGenerated.java | 3 + .../InsertImportOnPasteTestGenerated.java | 11 +- .../JetInspectionTestGenerated.java | 3 + .../OutOfBlockModificationTestGenerated.java | 3 + .../moveUpDown/CodeMoverTestGenerated.java | 51 ++- .../SurroundWithTestGenerated.java | 65 ++-- .../unwrap/UnwrapRemoveTestGenerated.java | 29 +- ...ureProjectByChangingFileTestGenerated.java | 20 +- ...otlinCopyPasteConversionTestGenerated.java | 3 + .../debugger/KotlinSteppingTestGenerated.java | 13 +- .../debugger/SmartStepIntoTestGenerated.java | 3 + .../CodeFragmentCompletionTestGenerated.java | 3 + ...CodeFragmentHighlightingTestGenerated.java | 11 +- ...KotlinEvaluateExpressionTestGenerated.java | 25 +- ...ectExpressionForDebuggerTestGenerated.java | 3 + .../folding/KotlinFoldingTestGenerated.java | 11 +- .../hierarchy/HierarchyTestGenerated.java | 19 +- .../DiagnosticMessageTestGenerated.java | 3 + .../HighlightingTestGenerated.java | 10 +- .../imports/OptimizeImportsTestGenerated.java | 3 + .../intentions/IntentionTestGenerated.java | 212 ++++-------- .../declarations/JoinLinesTestGenerated.java | 3 + .../DecompiledTextTestGenerated.java | 8 +- .../navigation/GotoSuperTestGenerated.java | 3 + .../navigation/KotlinGotoTestGenerated.java | 11 +- .../FunctionParameterInfoTestGenerated.java | 3 + .../QuickFixMultiFileTestGenerated.java | 98 +----- .../quickfix/QuickFixTestGenerated.java | 174 +++------- .../inline/InlineTestGenerated.java | 16 +- .../JetExtractionTestGenerated.java | 83 ++--- .../move/JetMoveTestGenerated.java | 3 + .../rename/RenameTestGenerated.java | 3 + .../KotlinFileStructureTestGenerated.java | 3 + .../stubs/LazyResolveByStubTestGenerated.java | 116 ++----- .../MultiFileHighlightingTestGenerated.java | 3 + .../stubs/StubBuilderTestGenerated.java | 3 + .../jet/psi/JetPsiMatcherTestGenerated.java | 34 +- ...esolveDescriptorRendererTestGenerated.java | 3 + ...eResolveInLibrarySourcesTestGenerated.java | 3 + .../ReferenceResolveTestGenerated.java | 34 +- .../ReferenceResolveWithLibTestGenerated.java | 3 + ...vaWithWrongFileStructureTestGenerated.java | 3 + .../JetSafeDeleteTestGenerated.java | 31 +- .../shortenRefs/ShortenRefsTestGenerated.java | 16 +- .../JavaToKotlinConverterTestGenerated.java | 144 ++++---- .../build/IncrementalJpsTestGenerated.java | 22 +- 100 files changed, 1238 insertions(+), 2051 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java index 7e5b0cc5fc6..5728dae2df4 100644 --- a/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/asJava/KotlinLightClassTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.asJava; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/asJava/lightClasses") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({KotlinLightClassTestGenerated.Delegation.class, KotlinLightClassTestGenerated.NullabilityAnnotations.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest @TestMetadata("compiler/testData/asJava/lightClasses/delegation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Delegation extends AbstractKotlinLightClassTest { public void testAllFilesPresentInDelegation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/delegation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -59,6 +63,7 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest @TestMetadata("compiler/testData/asJava/lightClasses/nullabilityAnnotations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NullabilityAnnotations extends AbstractKotlinLightClassTest { public void testAllFilesPresentInNullabilityAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/asJava/lightClasses/nullabilityAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -174,11 +179,4 @@ public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest } - public static Test suite() { - TestSuite suite = new TestSuite("KotlinLightClassTestGenerated"); - suite.addTestSuite(KotlinLightClassTestGenerated.class); - suite.addTestSuite(Delegation.class); - suite.addTestSuite(NullabilityAnnotations.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java index 1e8c427734b..872107556c4 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/cfg/ControlFlowTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.cfg; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/cfg") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ControlFlowTestGenerated.Arrays.class, ControlFlowTestGenerated.Basic.class, ControlFlowTestGenerated.Bugs.class, ControlFlowTestGenerated.ControlStructures.class, ControlFlowTestGenerated.Conventions.class, ControlFlowTestGenerated.DeadCode.class, ControlFlowTestGenerated.Declarations.class, ControlFlowTestGenerated.Expressions.class, ControlFlowTestGenerated.Functions.class, ControlFlowTestGenerated.TailCalls.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ControlFlowTestGenerated extends AbstractControlFlowTest { public void testAllFilesPresentInCfg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/arrays") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Arrays extends AbstractControlFlowTest { public void testAllFilesPresentInArrays() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); @@ -83,6 +87,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/basic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Basic extends AbstractControlFlowTest { public void testAllFilesPresentInBasic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); @@ -110,6 +115,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/bugs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bugs extends AbstractControlFlowTest { public void testAllFilesPresentInBugs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -125,6 +131,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/controlStructures") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractControlFlowTest { public void testAllFilesPresentInControlStructures() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); @@ -194,6 +201,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/conventions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Conventions extends AbstractControlFlowTest { public void testAllFilesPresentInConventions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -233,6 +241,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/deadCode") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeadCode extends AbstractControlFlowTest { public void testAllFilesPresentInDeadCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); @@ -261,6 +270,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Declarations extends AbstractControlFlowTest { public void testAllFilesPresentInDeclarations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -268,6 +278,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassesAndObjects extends AbstractControlFlowTest { public void testAllFilesPresentInClassesAndObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -295,6 +306,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations/functionLiterals") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractControlFlowTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); @@ -310,6 +322,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations/functions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractControlFlowTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -331,6 +344,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations/local") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Local extends AbstractControlFlowTest { public void testAllFilesPresentInLocal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); @@ -364,6 +378,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MultiDeclaration extends AbstractControlFlowTest { public void testAllFilesPresentInMultiDeclaration() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); @@ -385,6 +400,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/declarations/properties") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Properties extends AbstractControlFlowTest { public void testAllFilesPresentInProperties() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); @@ -416,21 +432,11 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Declarations"); - suite.addTestSuite(Declarations.class); - suite.addTestSuite(ClassesAndObjects.class); - suite.addTestSuite(FunctionLiterals.class); - suite.addTestSuite(Functions.class); - suite.addTestSuite(Local.class); - suite.addTestSuite(MultiDeclaration.class); - suite.addTestSuite(Properties.class); - return suite; - } } @TestMetadata("compiler/testData/cfg/expressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expressions extends AbstractControlFlowTest { public void testAllFilesPresentInExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -560,6 +566,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/functions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractControlFlowTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -581,6 +588,7 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { @TestMetadata("compiler/testData/cfg/tailCalls") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TailCalls extends AbstractControlFlowTest { public void testAllFilesPresentInTailCalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true); @@ -618,19 +626,4 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { } - public static Test suite() { - TestSuite suite = new TestSuite("ControlFlowTestGenerated"); - suite.addTestSuite(ControlFlowTestGenerated.class); - suite.addTestSuite(Arrays.class); - suite.addTestSuite(Basic.class); - suite.addTestSuite(Bugs.class); - suite.addTestSuite(ControlStructures.class); - suite.addTestSuite(Conventions.class); - suite.addTestSuite(DeadCode.class); - suite.addTest(Declarations.innerSuite()); - suite.addTestSuite(Expressions.class); - suite.addTestSuite(Functions.class); - suite.addTestSuite(TailCalls.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java index dfd65de8bcb..c1df90b639e 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/cfg/DataFlowTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.cfg; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/cfg-variables") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DataFlowTestGenerated.Basic.class, DataFlowTestGenerated.Bugs.class, DataFlowTestGenerated.LexicalScopes.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class DataFlowTestGenerated extends AbstractDataFlowTest { public void testAllFilesPresentInCfg_variables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { @TestMetadata("compiler/testData/cfg-variables/basic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Basic extends AbstractDataFlowTest { public void testAllFilesPresentInBasic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true); @@ -77,6 +81,7 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { @TestMetadata("compiler/testData/cfg-variables/bugs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bugs extends AbstractDataFlowTest { public void testAllFilesPresentInBugs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -104,6 +109,7 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { @TestMetadata("compiler/testData/cfg-variables/lexicalScopes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LexicalScopes extends AbstractDataFlowTest { public void testAllFilesPresentInLexicalScopes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -183,12 +189,4 @@ public class DataFlowTestGenerated extends AbstractDataFlowTest { } - public static Test suite() { - TestSuite suite = new TestSuite("DataFlowTestGenerated"); - suite.addTestSuite(DataFlowTestGenerated.class); - suite.addTestSuite(Basic.class); - suite.addTestSuite(Bugs.class); - suite.addTestSuite(LexicalScopes.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java index 95a14c36b39..05be2f6ba13 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/cfg/PseudoValueTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.cfg; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({PseudoValueTestGenerated.Cfg.class, PseudoValueTestGenerated.Cfg_variables.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Cfg.Arrays.class, Cfg.Basic.class, Cfg.Bugs.class, Cfg.ControlStructures.class, Cfg.Conventions.class, Cfg.DeadCode.class, Cfg.Declarations.class, Cfg.Expressions.class, Cfg.Functions.class, Cfg.TailCalls.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Cfg extends AbstractPseudoValueTest { public void testAllFilesPresentInCfg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -40,6 +44,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/arrays") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Arrays extends AbstractPseudoValueTest { public void testAllFilesPresentInArrays() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/arrays"), Pattern.compile("^(.+)\\.kt$"), true); @@ -85,6 +90,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/basic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Basic extends AbstractPseudoValueTest { public void testAllFilesPresentInBasic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/basic"), Pattern.compile("^(.+)\\.kt$"), true); @@ -112,6 +118,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/bugs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bugs extends AbstractPseudoValueTest { public void testAllFilesPresentInBugs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/bugs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -127,6 +134,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/controlStructures") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractPseudoValueTest { public void testAllFilesPresentInControlStructures() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); @@ -196,6 +204,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/conventions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Conventions extends AbstractPseudoValueTest { public void testAllFilesPresentInConventions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/conventions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -235,6 +244,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/deadCode") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeadCode extends AbstractPseudoValueTest { public void testAllFilesPresentInDeadCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); @@ -263,6 +273,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Declarations.ClassesAndObjects.class, Declarations.FunctionLiterals.class, Declarations.Functions.class, Declarations.Local.class, Declarations.MultiDeclaration.class, Declarations.Properties.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Declarations extends AbstractPseudoValueTest { public void testAllFilesPresentInDeclarations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -270,6 +281,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations/classesAndObjects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassesAndObjects extends AbstractPseudoValueTest { public void testAllFilesPresentInClassesAndObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/classesAndObjects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -297,6 +309,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations/functionLiterals") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractPseudoValueTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); @@ -312,6 +325,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations/functions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractPseudoValueTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -333,6 +347,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations/local") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Local extends AbstractPseudoValueTest { public void testAllFilesPresentInLocal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/local"), Pattern.compile("^(.+)\\.kt$"), true); @@ -366,6 +381,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations/multiDeclaration") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MultiDeclaration extends AbstractPseudoValueTest { public void testAllFilesPresentInMultiDeclaration() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/multiDeclaration"), Pattern.compile("^(.+)\\.kt$"), true); @@ -387,6 +403,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/declarations/properties") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Properties extends AbstractPseudoValueTest { public void testAllFilesPresentInProperties() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/declarations/properties"), Pattern.compile("^(.+)\\.kt$"), true); @@ -418,21 +435,11 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Declarations"); - suite.addTestSuite(Declarations.class); - suite.addTestSuite(ClassesAndObjects.class); - suite.addTestSuite(FunctionLiterals.class); - suite.addTestSuite(Functions.class); - suite.addTestSuite(Local.class); - suite.addTestSuite(MultiDeclaration.class); - suite.addTestSuite(Properties.class); - return suite; - } } @TestMetadata("compiler/testData/cfg/expressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expressions extends AbstractPseudoValueTest { public void testAllFilesPresentInExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/expressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -562,6 +569,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/functions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractPseudoValueTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -583,6 +591,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg/tailCalls") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TailCalls extends AbstractPseudoValueTest { public void testAllFilesPresentInTailCalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg/tailCalls"), Pattern.compile("^(.+)\\.kt$"), true); @@ -620,26 +629,12 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Cfg"); - suite.addTestSuite(Cfg.class); - suite.addTestSuite(Arrays.class); - suite.addTestSuite(Basic.class); - suite.addTestSuite(Bugs.class); - suite.addTestSuite(ControlStructures.class); - suite.addTestSuite(Conventions.class); - suite.addTestSuite(DeadCode.class); - suite.addTest(Declarations.innerSuite()); - suite.addTestSuite(Expressions.class); - suite.addTestSuite(Functions.class); - suite.addTestSuite(TailCalls.class); - return suite; - } } @TestMetadata("compiler/testData/cfg-variables") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Cfg_variables.Basic.class, Cfg_variables.Bugs.class, Cfg_variables.LexicalScopes.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Cfg_variables extends AbstractPseudoValueTest { public void testAllFilesPresentInCfg_variables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -647,6 +642,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg-variables/basic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Basic extends AbstractPseudoValueTest { public void testAllFilesPresentInBasic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/basic"), Pattern.compile("^(.+)\\.kt$"), true); @@ -686,6 +682,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg-variables/bugs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bugs extends AbstractPseudoValueTest { public void testAllFilesPresentInBugs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/bugs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -713,6 +710,7 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg-variables/lexicalScopes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LexicalScopes extends AbstractPseudoValueTest { public void testAllFilesPresentInLexicalScopes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cfg-variables/lexicalScopes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -792,20 +790,6 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Cfg_variables"); - suite.addTestSuite(Cfg_variables.class); - suite.addTestSuite(Basic.class); - suite.addTestSuite(Bugs.class); - suite.addTestSuite(LexicalScopes.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("PseudoValueTestGenerated"); - suite.addTest(Cfg.innerSuite()); - suite.addTest(Cfg_variables.innerSuite()); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java index fe902014de2..4fffecbfab4 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.checkers; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetDiagnosticsTestGenerated.Tests.class, JetDiagnosticsTestGenerated.Script.class, JetDiagnosticsTestGenerated.TailRecursion.class, JetDiagnosticsTestGenerated.OnObjects.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Tests.Annotations.class, Tests.BackingField.class, Tests.Cast.class, Tests.CheckArguments.class, Tests.ClassObjects.class, Tests.ControlFlowAnalysis.class, Tests.ControlStructures.class, Tests.CyclicHierarchy.class, Tests.DataClasses.class, Tests.DataFlow.class, Tests.DataFlowInfoTraversal.class, Tests.DeclarationChecks.class, Tests.DelegatedProperty.class, Tests.Delegation.class, Tests.Deparenthesize.class, Tests.DuplicateJvmSignature.class, Tests.Enum.class, Tests.Evaluate.class, Tests.Extensions.class, Tests.FunctionLiterals.class, Tests.Generics.class, Tests.Imports.class, Tests.IncompleteCode.class, Tests.Inference.class, Tests.Infos.class, Tests.Inline.class, Tests.Inner.class, Tests.J_k.class, Tests.Jdk_annotations.class, Tests.Labels.class, Tests.Library.class, Tests.Multimodule.class, Tests.NamedArguments.class, Tests.NullabilityAndAutoCasts.class, Tests.NullableTypes.class, Tests.Numbers.class, Tests.Objects.class, Tests.OperatorsOverloading.class, Tests.Overload.class, Tests.Override.class, Tests.Recovery.class, Tests.Redeclarations.class, Tests.Regressions.class, Tests.Resolve.class, Tests.Scopes.class, Tests.SenselessComparison.class, Tests.Shadowing.class, Tests.SmartCasts.class, Tests.Substitutions.class, Tests.Subtyping.class, Tests.Suppress.class, Tests.ThisAndSuper.class, Tests.TraitWithRequired.class, Tests.Typedefs.class, Tests.Unit.class, Tests.Varargs.class, Tests.When.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Tests extends AbstractJetDiagnosticsTest { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { @@ -545,6 +549,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/annotations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Annotations.AnnotationParameterMustBeConstant.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -696,6 +701,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true); @@ -739,16 +745,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Annotations"); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(AnnotationParameterMustBeConstant.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/backingField") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BackingField extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInBackingField() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/backingField"), Pattern.compile("^(.+)\\.kt$"), true); @@ -885,6 +886,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cast") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Cast.Bare.class, Cast.NeverSucceeds.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Cast extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInCast() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1156,6 +1158,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cast/bare") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bare extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInBare() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/bare"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1279,6 +1282,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cast/neverSucceeds") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NeverSucceeds extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNeverSucceeds() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cast/neverSucceeds"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1310,17 +1314,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Cast"); - suite.addTestSuite(Cast.class); - suite.addTestSuite(Bare.class); - suite.addTestSuite(NeverSucceeds.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/checkArguments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CheckArguments extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInCheckArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/checkArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1354,6 +1352,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/classObjects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassObjects extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInClassObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/classObjects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1418,6 +1417,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ControlFlowAnalysis.DeadCode.class, ControlFlowAnalysis.DefiniteReturn.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ControlFlowAnalysis extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInControlFlowAnalysis() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1677,6 +1677,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeadCode extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDeadCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1830,6 +1831,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefiniteReturn extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDefiniteReturn() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1855,17 +1857,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ControlFlowAnalysis"); - suite.addTestSuite(ControlFlowAnalysis.class); - suite.addTestSuite(DeadCode.class); - suite.addTestSuite(DefiniteReturn.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/controlStructures") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInControlStructures() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1971,6 +1967,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cyclicHierarchy") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CyclicHierarchy extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInCyclicHierarchy() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/cyclicHierarchy"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2034,6 +2031,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataClasses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataClasses extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDataClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2176,6 +2174,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlow") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DataFlow.Local.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataFlow extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDataFlow() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2207,6 +2206,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlow/local") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Local extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInLocal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlow/local"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2286,16 +2286,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DataFlow"); - suite.addTestSuite(DataFlow.class); - suite.addTestSuite(Local.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataFlowInfoTraversal extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/dataFlowInfoTraversal"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2618,6 +2613,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DeclarationChecks.MultiDeclarations.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeclarationChecks extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDeclarationChecks() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2763,6 +2759,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MultiDeclarations extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInMultiDeclarations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2824,17 +2821,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DeclarationChecks"); - suite.addTestSuite(DeclarationChecks.class); - suite.addTestSuite(MultiDeclarations.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DelegatedProperty.Inference.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractJetDiagnosticsTest { @TestMetadata("absentErrorAboutInitializer.kt") public void testAbsentErrorAboutInitializer() throws Exception { @@ -3040,6 +3032,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty/inference") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inference extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegatedProperty/inference"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3101,16 +3094,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DelegatedProperty"); - suite.addTestSuite(DelegatedProperty.class); - suite.addTestSuite(Inference.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/delegation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Delegation extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDelegation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/delegation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3168,6 +3156,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/deparenthesize") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Deparenthesize extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDeparenthesize() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/deparenthesize"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3190,6 +3179,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DuplicateJvmSignature.AccidentalOverrides.class, DuplicateJvmSignature.Bridges.class, DuplicateJvmSignature.Erasure.class, DuplicateJvmSignature.FunctionAndProperty.class, DuplicateJvmSignature.SpecialNames.class, DuplicateJvmSignature.TraitImpl.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3215,6 +3205,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AccidentalOverrides extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInAccidentalOverrides() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3320,6 +3311,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bridges extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInBridges() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3347,6 +3339,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Erasure extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInErasure() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3440,6 +3433,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionAndProperty extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInFunctionAndProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3563,6 +3557,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SpecialNames extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSpecialNames() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3632,6 +3627,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TraitImpl extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInTraitImpl() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3651,22 +3647,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DuplicateJvmSignature"); - suite.addTestSuite(DuplicateJvmSignature.class); - suite.addTestSuite(AccidentalOverrides.class); - suite.addTestSuite(Bridges.class); - suite.addTestSuite(Erasure.class); - suite.addTestSuite(FunctionAndProperty.class); - suite.addTestSuite(SpecialNames.class); - suite.addTestSuite(TraitImpl.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/enum") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Enum.Inner.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractJetDiagnosticsTest { @TestMetadata("AbstractEnum.kt") public void testAbstractEnum() throws Exception { @@ -3818,6 +3804,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/enum/inner") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inner extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInner() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/enum/inner"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3891,16 +3878,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Enum"); - suite.addTestSuite(Enum.class); - suite.addTestSuite(Inner.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/evaluate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Evaluate extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInEvaluate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/evaluate"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4018,6 +4000,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/extensions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Extensions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInExtensions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/extensions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4118,6 +4101,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FunctionLiterals.Return.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4197,6 +4181,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals/return") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Return extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInReturn() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/functionLiterals/return"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4282,17 +4267,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FunctionLiterals"); - suite.addTestSuite(FunctionLiterals.class); - suite.addTestSuite(Return.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/generics") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Generics.TpAsReified.class, Generics.VarProjection.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Generics extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInGenerics() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4366,6 +4346,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics/tpAsReified") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TpAsReified extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInTpAsReified() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/tpAsReified"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4405,6 +4386,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics/varProjection") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class VarProjection extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInVarProjection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/generics/varProjection"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4436,17 +4418,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Generics"); - suite.addTestSuite(Generics.class); - suite.addTestSuite(TpAsReified.class); - suite.addTestSuite(VarProjection.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/imports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Imports extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/imports"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4475,6 +4451,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IncompleteCode.DiagnosticWithSyntaxError.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IncompleteCode extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInIncompleteCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4590,6 +4567,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DiagnosticWithSyntaxError extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDiagnosticWithSyntaxError() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4675,17 +4653,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("IncompleteCode"); - suite.addTestSuite(IncompleteCode.class); - suite.addTestSuite(DiagnosticWithSyntaxError.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/inference") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Inference.Constraints.class, Inference.NestedCalls.class, Inference.Regressions.class, Inference.ReportingImprovements.class, Inference.UpperBounds.class, Inference.Varargs.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inference extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4867,6 +4840,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/constraints") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constraints extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInConstraints() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/constraints"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4906,6 +4880,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/nestedCalls") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NestedCalls extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNestedCalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4981,6 +4956,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/regressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regressions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInRegressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/regressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5248,6 +5224,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/reportingImprovements") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReportingImprovements extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInReportingImprovements() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/reportingImprovements"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5287,6 +5264,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/upperBounds") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UpperBounds extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInUpperBounds() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/upperBounds"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5338,6 +5316,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference/varargs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Varargs extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInVarargs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inference/varargs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5351,21 +5330,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Inference"); - suite.addTestSuite(Inference.class); - suite.addTestSuite(Constraints.class); - suite.addTestSuite(NestedCalls.class); - suite.addTestSuite(Regressions.class); - suite.addTestSuite(ReportingImprovements.class); - suite.addTestSuite(UpperBounds.class); - suite.addTestSuite(Varargs.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/infos") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Infos extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInfos() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/infos"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5388,6 +5357,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Inline.BinaryExpressions.class, Inline.NonLocalReturns.class, Inline.NonPublicMember.class, Inline.Regressions.class, Inline.UnaryExpressions.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inline extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5533,6 +5503,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/binaryExpressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BinaryExpressions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInBinaryExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/binaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5590,6 +5561,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5689,6 +5661,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/nonPublicMember") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonPublicMember extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNonPublicMember() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/nonPublicMember"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5740,6 +5713,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/regressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regressions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInRegressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/regressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5755,6 +5729,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inline/unaryExpressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnaryExpressions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInUnaryExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inline/unaryExpressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5780,21 +5755,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Inline"); - suite.addTestSuite(Inline.class); - suite.addTestSuite(BinaryExpressions.class); - suite.addTestSuite(NonLocalReturns.class); - suite.addTestSuite(NonPublicMember.class); - suite.addTestSuite(Regressions.class); - suite.addTestSuite(UnaryExpressions.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/inner") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Inner.QualifiedExpression.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inner extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInner() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5970,6 +5936,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inner/qualifiedExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class QualifiedExpression extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInQualifiedExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/inner/qualifiedExpression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6037,16 +6004,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Inner"); - suite.addTestSuite(Inner.class); - suite.addTestSuite(QualifiedExpression.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/j+k") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class J_k extends AbstractJetDiagnosticsTest { @TestMetadata("accessClassObjectFromJava.kt") public void testAccessClassObjectFromJava() throws Exception { @@ -6249,6 +6211,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Jdk_annotations.Sql.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Jdk_annotations extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInJdk_annotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/jdk-annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6274,6 +6237,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations/sql") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Sql extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSql() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/jdk-annotations/sql"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6299,16 +6263,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Jdk_annotations"); - suite.addTestSuite(Jdk_annotations.class); - suite.addTestSuite(Sql.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/labels") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Labels extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInLabels() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/labels"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6378,6 +6337,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/library") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Library extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/library"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6400,6 +6360,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Multimodule.DuplicateClass.class, Multimodule.DuplicateMethod.class, Multimodule.DuplicateSuper.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Multimodule extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInMultimodule() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6419,6 +6380,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DuplicateClass extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDuplicateClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6506,6 +6468,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateMethod") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DuplicateMethod extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDuplicateMethod() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateMethod"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6653,6 +6616,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/multimodule/duplicateSuper") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DuplicateSuper extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDuplicateSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/multimodule/duplicateSuper"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6684,18 +6648,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Multimodule"); - suite.addTestSuite(Multimodule.class); - suite.addTestSuite(DuplicateClass.class); - suite.addTestSuite(DuplicateMethod.class); - suite.addTestSuite(DuplicateSuper.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/namedArguments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NamedArguments extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNamedArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6741,6 +6698,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NullabilityAndAutoCasts extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNullabilityAndAutoCasts() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullabilityAndAutoCasts"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6936,6 +6894,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/nullableTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NullableTypes extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNullableTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/nullableTypes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6987,6 +6946,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/numbers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Numbers extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNumbers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/numbers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -7020,6 +6980,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/objects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Objects extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/objects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -7095,6 +7056,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/operatorsOverloading") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OperatorsOverloading extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInOperatorsOverloading() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/operatorsOverloading"), Pattern.compile("^(.+)\\.kt$"), true); @@ -7140,6 +7102,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/overload") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Overload extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInOverload() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/overload"), Pattern.compile("^(.+)\\.kt$"), true); @@ -7234,6 +7197,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/override") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Override.ParameterNames.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Override extends AbstractJetDiagnosticsTest { @TestMetadata("AbstractFunImplemented.kt") public void testAbstractFunImplemented() throws Exception { @@ -7535,6 +7499,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/override/parameterNames") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ParameterNames extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInParameterNames() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/override/parameterNames"), Pattern.compile("^(.+)\\.kt$"), true); @@ -7584,16 +7549,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Override"); - suite.addTestSuite(Override.class); - suite.addTestSuite(ParameterNames.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/recovery") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Recovery extends AbstractJetDiagnosticsTest { @TestMetadata("absentLeftHandSide.kt") public void testAbsentLeftHandSide() throws Exception { @@ -7627,6 +7587,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/redeclarations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Redeclarations extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInRedeclarations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/redeclarations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -7720,6 +7681,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/regressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regressions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInRegressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/regressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8330,6 +8292,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Resolve.Invoke.class, Resolve.NestedCalls.class, Resolve.SpecialConstructions.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Resolve extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInResolve() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8398,6 +8361,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Invoke.Errors.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Invoke extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInvoke() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8465,6 +8429,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke/errors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Errors extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInErrors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/invoke/errors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8520,16 +8485,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Invoke"); - suite.addTestSuite(Invoke.class); - suite.addTestSuite(Errors.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/resolve/nestedCalls") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NestedCalls extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInNestedCalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/nestedCalls"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8569,6 +8529,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve/specialConstructions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SpecialConstructions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSpecialConstructions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/resolve/specialConstructions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8594,18 +8555,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Resolve"); - suite.addTestSuite(Resolve.class); - suite.addTest(Invoke.innerSuite()); - suite.addTestSuite(NestedCalls.class); - suite.addTestSuite(SpecialConstructions.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/scopes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Scopes extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInScopes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/scopes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8879,6 +8833,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/senselessComparison") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SenselessComparison extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSenselessComparison() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/senselessComparison"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8894,6 +8849,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/shadowing") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Shadowing extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInShadowing() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/shadowing"), Pattern.compile("^(.+)\\.kt$"), true); @@ -8964,6 +8920,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({SmartCasts.Inference.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SmartCasts extends AbstractJetDiagnosticsTest { @TestMetadata("afterBinaryExpr.kt") public void testAfterBinaryExpr() throws Exception { @@ -9037,6 +8994,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts/inference") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inference extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/smartCasts/inference"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9098,16 +9056,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("SmartCasts"); - suite.addTestSuite(SmartCasts.class); - suite.addTestSuite(Inference.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/substitutions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Substitutions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSubstitutions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/substitutions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9141,6 +9094,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/subtyping") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Subtyping extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSubtyping() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/subtyping"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9217,6 +9171,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Suppress.AllWarnings.class, Suppress.ManyWarnings.class, Suppress.OneWarning.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Suppress extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSuppress() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9224,6 +9179,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress/allWarnings") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AllWarnings extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInAllWarnings() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/allWarnings"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9281,6 +9237,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress/manyWarnings") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ManyWarnings extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInManyWarnings() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/manyWarnings"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9344,6 +9301,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/suppress/oneWarning") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OneWarning extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInOneWarning() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/suppress/oneWarning"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9405,18 +9363,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Suppress"); - suite.addTestSuite(Suppress.class); - suite.addTestSuite(AllWarnings.class); - suite.addTestSuite(ManyWarnings.class); - suite.addTestSuite(OneWarning.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/thisAndSuper") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ThisAndSuper extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInThisAndSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/thisAndSuper"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9498,6 +9449,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/traitWithRequired") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TraitWithRequired extends AbstractJetDiagnosticsTest { @TestMetadata("abstractClass.kt") public void testAbstractClass() throws Exception { @@ -9573,6 +9525,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/typedefs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Typedefs extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInTypedefs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/typedefs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9588,6 +9541,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/unit") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Unit extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInUnit() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/unit"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9603,6 +9557,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/varargs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Varargs extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInVarargs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/varargs"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9678,6 +9633,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -9739,72 +9695,11 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Tests"); - suite.addTestSuite(Tests.class); - suite.addTest(Annotations.innerSuite()); - suite.addTestSuite(BackingField.class); - suite.addTest(Cast.innerSuite()); - suite.addTestSuite(CheckArguments.class); - suite.addTestSuite(ClassObjects.class); - suite.addTest(ControlFlowAnalysis.innerSuite()); - suite.addTestSuite(ControlStructures.class); - suite.addTestSuite(CyclicHierarchy.class); - suite.addTestSuite(DataClasses.class); - suite.addTest(DataFlow.innerSuite()); - suite.addTestSuite(DataFlowInfoTraversal.class); - suite.addTest(DeclarationChecks.innerSuite()); - suite.addTest(DelegatedProperty.innerSuite()); - suite.addTestSuite(Delegation.class); - suite.addTestSuite(Deparenthesize.class); - suite.addTest(DuplicateJvmSignature.innerSuite()); - suite.addTest(Enum.innerSuite()); - suite.addTestSuite(Evaluate.class); - suite.addTestSuite(Extensions.class); - suite.addTest(FunctionLiterals.innerSuite()); - suite.addTest(Generics.innerSuite()); - suite.addTestSuite(Imports.class); - suite.addTest(IncompleteCode.innerSuite()); - suite.addTest(Inference.innerSuite()); - suite.addTestSuite(Infos.class); - suite.addTest(Inline.innerSuite()); - suite.addTest(Inner.innerSuite()); - suite.addTestSuite(J_k.class); - suite.addTest(Jdk_annotations.innerSuite()); - suite.addTestSuite(Labels.class); - suite.addTestSuite(Library.class); - suite.addTest(Multimodule.innerSuite()); - suite.addTestSuite(NamedArguments.class); - suite.addTestSuite(NullabilityAndAutoCasts.class); - suite.addTestSuite(NullableTypes.class); - suite.addTestSuite(Numbers.class); - suite.addTestSuite(Objects.class); - suite.addTestSuite(OperatorsOverloading.class); - suite.addTestSuite(Overload.class); - suite.addTest(Override.innerSuite()); - suite.addTestSuite(Recovery.class); - suite.addTestSuite(Redeclarations.class); - suite.addTestSuite(Regressions.class); - suite.addTest(Resolve.innerSuite()); - suite.addTestSuite(Scopes.class); - suite.addTestSuite(SenselessComparison.class); - suite.addTestSuite(Shadowing.class); - suite.addTest(SmartCasts.innerSuite()); - suite.addTestSuite(Substitutions.class); - suite.addTestSuite(Subtyping.class); - suite.addTest(Suppress.innerSuite()); - suite.addTestSuite(ThisAndSuper.class); - suite.addTestSuite(TraitWithRequired.class); - suite.addTestSuite(Typedefs.class); - suite.addTestSuite(Unit.class); - suite.addTestSuite(Varargs.class); - suite.addTestSuite(When.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/tests/script") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Script extends AbstractJetDiagnosticsTest { @TestMetadata("AccessForwardDeclarationInScript.kts") public void testAccessForwardDeclarationInScript() throws Exception { @@ -9838,6 +9733,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TailRecursion extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInTailRecursion() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); @@ -10063,6 +9959,7 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/functions/invoke/onObjects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OnObjects extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInOnObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -10130,12 +10027,4 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { } - public static Test suite() { - TestSuite suite = new TestSuite("JetDiagnosticsTestGenerated"); - suite.addTest(Tests.innerSuite()); - suite.addTestSuite(Script.class); - suite.addTestSuite(TailRecursion.class); - suite.addTestSuite(OnObjects.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java index 404cfd0a8ef..247ac9e6cbc 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.checkers; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/diagnostics/testsWithStdLib") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({JetDiagnosticsTestWithStdLibGenerated.Annotations.class, JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class, JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class, JetDiagnosticsTestWithStdLibGenerated.NonLocalReturns.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInTestsWithStdLib() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib"), Pattern.compile("^(.+)\\.kt$"), true); @@ -39,6 +42,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Annotations.AnnotationApplicability.class, Annotations.AnnotationParameterMustBeConstant.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -52,6 +56,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnnotationApplicability extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationApplicability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability"), Pattern.compile("^(.+)\\.kt$"), true); @@ -73,6 +78,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnnotationParameterMustBeConstant extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotationParameterMustBeConstant() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant"), Pattern.compile("^(.+)\\.kt$"), true); @@ -104,18 +110,12 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Annotations"); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(AnnotationApplicability.class); - suite.addTestSuite(AnnotationParameterMustBeConstant.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CallableReference.Function.class, CallableReference.Property.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInCallableReference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); @@ -129,6 +129,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/function") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractJetDiagnosticsTestWithStdLib { @TestMetadata("abstractClassConstructors.kt") public void testAbstractClassConstructors() throws Exception { @@ -432,6 +433,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference/property") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractJetDiagnosticsTestWithStdLib { @TestMetadata("abstractPropertyViaSubclasses.kt") public void testAbstractPropertyViaSubclasses() throws Exception { @@ -517,17 +519,11 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CallableReference"); - suite.addTestSuite(CallableReference.class); - suite.addTestSuite(Function.class); - suite.addTestSuite(Property.class); - return suite; - } } @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); @@ -555,6 +551,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/functionLiterals") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInFunctionLiterals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); @@ -570,6 +567,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInKotlinSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/kotlinSignature"), Pattern.compile("^(.+)\\.kt$"), true); @@ -591,6 +589,7 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInNonLocalReturns() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/testsWithStdLib/nonLocalReturns"), Pattern.compile("^(.+)\\.kt$"), true); @@ -604,15 +603,4 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic } - public static Test suite() { - TestSuite suite = new TestSuite("JetDiagnosticsTestWithStdLibGenerated"); - suite.addTestSuite(JetDiagnosticsTestWithStdLibGenerated.class); - suite.addTest(Annotations.innerSuite()); - suite.addTest(CallableReference.innerSuite()); - suite.addTestSuite(DuplicateJvmSignature.class); - suite.addTestSuite(FunctionLiterals.class); - suite.addTestSuite(KotlinSignature.class); - suite.addTestSuite(NonLocalReturns.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java index e22e2da89a5..b36987c55e1 100644 --- a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.cli; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({KotlincExecutableTestGenerated.Jvm.class, KotlincExecutableTestGenerated.Js.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest { @TestMetadata("compiler/testData/cli/jvm") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Jvm.WrongAbiVersionLib.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Jvm extends AbstractKotlincExecutableTest { public void testAllFilesPresentInJvm() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm"), Pattern.compile("^(.+)\\.args$"), true); @@ -143,28 +147,19 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes @TestMetadata("compiler/testData/cli/jvm/wrongAbiVersionLib") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WrongAbiVersionLib extends AbstractKotlincExecutableTest { public void testAllFilesPresentInWrongAbiVersionLib() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/jvm/wrongAbiVersionLib"), Pattern.compile("^(.+)\\.args$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("WrongAbiVersionLib"); - suite.addTestSuite(WrongAbiVersionLib.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Jvm"); - suite.addTestSuite(Jvm.class); - suite.addTest(WrongAbiVersionLib.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/cli/js") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Js extends AbstractKotlincExecutableTest { public void testAllFilesPresentInJs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/cli/js"), Pattern.compile("^(.+)\\.args$"), true); @@ -208,10 +203,4 @@ public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTes } - public static Test suite() { - TestSuite suite = new TestSuite("KotlincExecutableTestGenerated"); - suite.addTest(Jvm.innerSuite()); - suite.addTestSuite(Js.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java index 2614f7f6354..09ea3f57791 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/BytecodeTextTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/bytecodeText") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({BytecodeTextTestGenerated.BoxingOptimization.class, BytecodeTextTestGenerated.Constants.class, BytecodeTextTestGenerated.DirectInvoke.class, BytecodeTextTestGenerated.Statements.class, BytecodeTextTestGenerated.When.class, BytecodeTextTestGenerated.WhenEnumOptimization.class, BytecodeTextTestGenerated.WhenStringOptimization.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("accessorForProtected.kt") public void testAccessorForProtected() throws Exception { @@ -182,6 +185,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/boxingOptimization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BoxingOptimization extends AbstractBytecodeTextTest { public void testAllFilesPresentInBoxingOptimization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true); @@ -257,6 +261,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/constants") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constants extends AbstractBytecodeTextTest { public void testAllFilesPresentInConstants() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/constants"), Pattern.compile("^(.+)\\.kt$"), true); @@ -284,6 +289,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/directInvoke") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DirectInvoke extends AbstractBytecodeTextTest { public void testAllFilesPresentInDirectInvoke() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/directInvoke"), Pattern.compile("^(.+)\\.kt$"), true); @@ -311,6 +317,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/statements") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Statements extends AbstractBytecodeTextTest { public void testAllFilesPresentInStatements() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/statements"), Pattern.compile("^(.+)\\.kt$"), true); @@ -356,6 +363,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractBytecodeTextTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -371,6 +379,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/whenEnumOptimization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenEnumOptimization extends AbstractBytecodeTextTest { public void testAllFilesPresentInWhenEnumOptimization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true); @@ -434,6 +443,7 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("compiler/testData/codegen/bytecodeText/whenStringOptimization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenStringOptimization extends AbstractBytecodeTextTest { public void testAllFilesPresentInWhenStringOptimization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/bytecodeText/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true); @@ -489,16 +499,4 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { } - public static Test suite() { - TestSuite suite = new TestSuite("BytecodeTextTestGenerated"); - suite.addTestSuite(BytecodeTextTestGenerated.class); - suite.addTestSuite(BoxingOptimization.class); - suite.addTestSuite(Constants.class); - suite.addTestSuite(DirectInvoke.class); - suite.addTestSuite(Statements.class); - suite.addTestSuite(When.class); - suite.addTestSuite(WhenEnumOptimization.class); - suite.addTestSuite(WhenStringOptimization.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java index 27f444fa31a..de26019a8b7 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CheckLocalVariablesTableTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/checkLocalVariablesTable") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CheckLocalVariablesTableTestGenerated extends AbstractCheckLocalVariablesTableTest { public void testAllFilesPresentInCheckLocalVariablesTable() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/checkLocalVariablesTable"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java index d3eac9c183a..fda626ad9b3 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ScriptCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/script") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest { public void testAllFilesPresentInScript() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/script"), Pattern.compile("^(.+)\\.kts$"), true); diff --git a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java index 6bad2d2c5a2..d5b3ed982d0 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TopLevelMembersInvocationTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/topLevelMemberInvocation") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class TopLevelMembersInvocationTestGenerated extends AbstractTopLevelMembersInvocationTest { public void testAllFilesPresentInTopLevelMemberInvocation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/topLevelMemberInvocation"), Pattern.compile("^([^\\.]+)$"), false); diff --git a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java index d51abde028d..4fd5d1d90d5 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.defaultConstructor; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/defaultArguments/reflection") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class DefaultArgumentsReflectionTestGenerated extends AbstractDefaultArgumentsReflectionTest { public void testAllFilesPresentInReflection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/defaultArguments/reflection"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java index 9049d84881b..8e82d924084 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/flags/WriteFlagsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.flags; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/writeFlags") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({WriteFlagsTestGenerated.Class.class, WriteFlagsTestGenerated.Function.class, WriteFlagsTestGenerated.InnerClass.class, WriteFlagsTestGenerated.Property.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { public void testAllFilesPresentInWriteFlags() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags"), Pattern.compile("^(.+)\\.kt$"), true); @@ -39,6 +42,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Class.AccessFlags.class, Class.DeprecatedFlag.class, Class.Visibility.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -46,6 +50,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/accessFlags") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AccessFlags extends AbstractWriteFlagsTest { public void testAllFilesPresentInAccessFlags() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/accessFlags"), Pattern.compile("^(.+)\\.kt$"), true); @@ -85,6 +90,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/deprecatedFlag") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); @@ -125,6 +131,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/visibility") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Visibility.Internal.class, Visibility.Private.class, Visibility.Public.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -132,6 +139,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/visibility/internal") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Internal extends AbstractWriteFlagsTest { public void testAllFilesPresentInInternal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/internal"), Pattern.compile("^(.+)\\.kt$"), true); @@ -189,6 +197,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/visibility/private") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Private extends AbstractWriteFlagsTest { public void testAllFilesPresentInPrivate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/private"), Pattern.compile("^(.+)\\.kt$"), true); @@ -246,6 +255,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class/visibility/public") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Public extends AbstractWriteFlagsTest { public void testAllFilesPresentInPublic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/class/visibility/public"), Pattern.compile("^(.+)\\.kt$"), true); @@ -301,29 +311,14 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Visibility"); - suite.addTestSuite(Visibility.class); - suite.addTestSuite(Internal.class); - suite.addTestSuite(Private.class); - suite.addTestSuite(Public.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Class"); - suite.addTestSuite(Class.class); - suite.addTestSuite(AccessFlags.class); - suite.addTestSuite(DeprecatedFlag.class); - suite.addTest(Visibility.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/writeFlags/function") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Function.ClassObjectPrivate.class, Function.Constructors.class, Function.DeprecatedFlag.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractWriteFlagsTest { public void testAllFilesPresentInFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function"), Pattern.compile("^(.+)\\.kt$"), true); @@ -331,6 +326,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/function/classObjectPrivate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassObjectPrivate extends AbstractWriteFlagsTest { public void testAllFilesPresentInClassObjectPrivate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/classObjectPrivate"), Pattern.compile("^(.+)\\.kt$"), true); @@ -358,6 +354,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/function/constructors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructors extends AbstractWriteFlagsTest { public void testAllFilesPresentInConstructors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/constructors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -391,6 +388,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/function/deprecatedFlag") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/function/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); @@ -470,19 +468,12 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Function"); - suite.addTestSuite(Function.class); - suite.addTestSuite(ClassObjectPrivate.class); - suite.addTestSuite(Constructors.class); - suite.addTestSuite(DeprecatedFlag.class); - return suite; - } } @TestMetadata("compiler/testData/writeFlags/innerClass") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({InnerClass.Visibility.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InnerClass extends AbstractWriteFlagsTest { public void testAllFilesPresentInInnerClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -490,6 +481,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/innerClass/visibility") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/innerClass/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -533,17 +525,12 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("InnerClass"); - suite.addTestSuite(InnerClass.class); - suite.addTestSuite(Visibility.class); - return suite; - } } @TestMetadata("compiler/testData/writeFlags/property") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Property.ClassObject.class, Property.DeprecatedFlag.class, Property.Visibility.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractWriteFlagsTest { public void testAllFilesPresentInProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property"), Pattern.compile("^(.+)\\.kt$"), true); @@ -552,6 +539,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property/classObject") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ClassObject.Class.class, ClassObject.Rename.class, ClassObject.Trait.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractWriteFlagsTest { public void testAllFilesPresentInClassObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -559,6 +547,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property/classObject/class") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -670,6 +659,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property/classObject/rename") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Rename extends AbstractWriteFlagsTest { public void testAllFilesPresentInRename() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/rename"), Pattern.compile("^(.+)\\.kt$"), true); @@ -703,6 +693,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property/classObject/trait") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Trait extends AbstractWriteFlagsTest { public void testAllFilesPresentInTrait() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/classObject/trait"), Pattern.compile("^(.+)\\.kt$"), true); @@ -812,18 +803,11 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ClassObject"); - suite.addTestSuite(ClassObject.class); - suite.addTestSuite(Class.class); - suite.addTestSuite(Rename.class); - suite.addTestSuite(Trait.class); - return suite; - } } @TestMetadata("compiler/testData/writeFlags/property/deprecatedFlag") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeprecatedFlag extends AbstractWriteFlagsTest { public void testAllFilesPresentInDeprecatedFlag() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/deprecatedFlag"), Pattern.compile("^(.+)\\.kt$"), true); @@ -845,6 +829,7 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property/visibility") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeFlags/property/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -870,23 +855,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Property"); - suite.addTestSuite(Property.class); - suite.addTest(ClassObject.innerSuite()); - suite.addTestSuite(DeprecatedFlag.class); - suite.addTestSuite(Visibility.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("WriteFlagsTestGenerated"); - suite.addTestSuite(WriteFlagsTestGenerated.class); - suite.addTest(Class.innerSuite()); - suite.addTest(Function.innerSuite()); - suite.addTest(InnerClass.innerSuite()); - suite.addTest(Property.innerSuite()); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java index b577d35ad6f..661dbbaadc0 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.generated; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/boxAgainstJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({BlackBoxAgainstJavaCodegenTestGenerated.Annotations.class, BlackBoxAgainstJavaCodegenTestGenerated.CallableReference.class, BlackBoxAgainstJavaCodegenTestGenerated.Constructor.class, BlackBoxAgainstJavaCodegenTestGenerated.Delegation.class, BlackBoxAgainstJavaCodegenTestGenerated.Enum.class, BlackBoxAgainstJavaCodegenTestGenerated.Functions.class, BlackBoxAgainstJavaCodegenTestGenerated.InnerClass.class, BlackBoxAgainstJavaCodegenTestGenerated.Property.class, BlackBoxAgainstJavaCodegenTestGenerated.Reflection.class, BlackBoxAgainstJavaCodegenTestGenerated.Sam.class, BlackBoxAgainstJavaCodegenTestGenerated.StaticFun.class, BlackBoxAgainstJavaCodegenTestGenerated.Visibility.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxAgainstJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/annotations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -83,6 +87,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/callableReference") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); @@ -110,6 +115,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/constructor") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -125,6 +131,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/delegation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Delegation extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDelegation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -140,6 +147,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/enum") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnum() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/enum"), Pattern.compile("^(.+)\\.kt$"), true); @@ -185,6 +193,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/functions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -224,6 +233,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/innerClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InnerClass extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInnerClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -251,6 +261,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/property") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/property"), Pattern.compile("^(.+)\\.kt$"), true); @@ -273,6 +284,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Reflection.Mapping.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection"), Pattern.compile("^(.+)\\.kt$"), true); @@ -280,6 +292,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection/mapping") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Mapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMapping() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true); @@ -299,17 +312,12 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Reflection"); - suite.addTestSuite(Reflection.class); - suite.addTestSuite(Mapping.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Sam.Adapters.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Sam extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSam() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam"), Pattern.compile("^(.+)\\.kt$"), true); @@ -330,6 +338,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Adapters.Operators.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Adapters extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAdapters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -457,6 +466,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Operators extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperators() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true); @@ -536,24 +546,13 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Adapters"); - suite.addTestSuite(Adapters.class); - suite.addTestSuite(Operators.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Sam"); - suite.addTestSuite(Sam.class); - suite.addTest(Adapters.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxAgainstJava/staticFun") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StaticFun extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStaticFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -570,6 +569,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Visibility.Package.class, Visibility.ProtectedAndPackage.class, Visibility.ProtectedStatic.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -577,6 +577,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Package extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPackage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); @@ -610,6 +611,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ProtectedAndPackage extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedAndPackage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true); @@ -643,6 +645,7 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ProtectedStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedStatic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); @@ -722,31 +725,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Visibility"); - suite.addTestSuite(Visibility.class); - suite.addTestSuite(Package.class); - suite.addTestSuite(ProtectedAndPackage.class); - suite.addTestSuite(ProtectedStatic.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("BlackBoxAgainstJavaCodegenTestGenerated"); - suite.addTestSuite(BlackBoxAgainstJavaCodegenTestGenerated.class); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(CallableReference.class); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(Delegation.class); - suite.addTestSuite(Enum.class); - suite.addTestSuite(Functions.class); - suite.addTestSuite(InnerClass.class); - suite.addTestSuite(Property.class); - suite.addTest(Reflection.innerSuite()); - suite.addTest(Sam.innerSuite()); - suite.addTestSuite(StaticFun.class); - suite.addTest(Visibility.innerSuite()); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java index 77e190e5afc..cf747558de1 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.generated; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/box") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.BinaryOp.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.BuiltinStubMethods.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.Constants.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FakeOverride.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Finally.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.JavaInterop.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.Package.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.Regressions.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.SuperConstructorCall.class, BlackBoxCodegenTestGenerated.ToArray.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.TypeMapping.class, BlackBoxCodegenTestGenerated.UnaryOp.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBox() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/arrays") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Arrays extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInArrays() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/arrays"), Pattern.compile("^(.+)\\.kt$"), true); @@ -275,6 +279,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/binaryOp") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BinaryOp extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBinaryOp() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/binaryOp"), Pattern.compile("^(.+)\\.kt$"), true); @@ -327,6 +332,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/bridges") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Bridges.SubstitutionInSuperClass.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Bridges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBridges() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/bridges"), Pattern.compile("^(.+)\\.kt$"), true); @@ -586,6 +592,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/bridges/substitutionInSuperClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SubstitutionInSuperClass extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractFun.kt") public void testAbstractFun() throws Exception { @@ -647,16 +654,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Bridges"); - suite.addTestSuite(Bridges.class); - suite.addTestSuite(SubstitutionInSuperClass.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/builtinStubMethods") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBuiltinStubMethods() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/builtinStubMethods"), Pattern.compile("^(.+)\\.kt$"), true); @@ -738,6 +740,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/casts") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Casts extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCasts() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/casts"), Pattern.compile("^(.+)\\.kt$"), true); @@ -795,6 +798,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/classes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Classes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/classes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1405,6 +1409,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/closures") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Closures.CaptureOuterProperty.class, Closures.ClosureInsideClosure.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Closures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosures() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1562,6 +1567,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/closures/captureOuterProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CaptureOuterProperty extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCaptureOuterProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/captureOuterProperty"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1619,6 +1625,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/closures/closureInsideClosure") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClosureInsideClosure extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosureInsideClosure() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/closures/closureInsideClosure"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1662,17 +1669,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Closures"); - suite.addTestSuite(Closures.class); - suite.addTestSuite(CaptureOuterProperty.class); - suite.addTestSuite(ClosureInsideClosure.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/constants") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constants extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstants() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/constants"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1700,6 +1701,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/controlStructures") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInControlStructures() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/controlStructures"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2046,6 +2048,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/defaultArguments") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DefaultArguments.Constructor.class, DefaultArguments.Function.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2053,6 +2056,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/defaultArguments/constructor") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2128,6 +2132,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/defaultArguments/function") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractClass.kt") public void testAbstractClass() throws Exception { @@ -2267,17 +2272,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DefaultArguments"); - suite.addTestSuite(DefaultArguments.class); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(Function.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/delegatedProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractBlackBoxCodegenTest { @TestMetadata("accessTopLevelDelegatedPropertyInClinit.kt") public void testAccessTopLevelDelegatedPropertyInClinit() throws Exception { @@ -2461,6 +2460,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/elvis") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Elvis extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInElvis() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/elvis"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2482,6 +2482,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/enum") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractMethodInEnum.kt") public void testAbstractMethodInEnum() throws Exception { @@ -2599,6 +2600,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/exclExcl") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExclExcl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExclExcl() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/exclExcl"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2620,6 +2622,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/extensionFunctions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExtensionFunctions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExtensionFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/extensionFunctions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2731,6 +2734,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/extensionProperties") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExtensionProperties extends AbstractBlackBoxCodegenTest { @TestMetadata("accessorForPrivateSetter.kt") public void testAccessorForPrivateSetter() throws Exception { @@ -2794,6 +2798,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/fakeOverride") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FakeOverride extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFakeOverride() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fakeOverride"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2827,6 +2832,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/fieldRename") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FieldRename extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFieldRename() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/fieldRename"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2854,6 +2860,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/finally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Finally extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/finally"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2930,6 +2937,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Functions.Invoke.class, Functions.LocalFunctions.class, Functions.TailRecursion.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3184,6 +3192,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions/invoke") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Invoke.OnObjects.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Invoke extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInvoke() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3257,6 +3266,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions/invoke/onObjects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OnObjects extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOnObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/invoke/onObjects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3324,16 +3334,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Invoke"); - suite.addTestSuite(Invoke.class); - suite.addTestSuite(OnObjects.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/functions/localFunctions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LocalFunctions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/localFunctions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3415,6 +3420,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions/tailRecursion") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TailRecursion extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTailRecursion() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/functions/tailRecursion"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3638,18 +3644,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Functions"); - suite.addTestSuite(Functions.class); - suite.addTest(Invoke.innerSuite()); - suite.addTestSuite(LocalFunctions.class); - suite.addTestSuite(TailRecursion.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/innerNested") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InnerNested extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInnerNested() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/innerNested"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3756,6 +3755,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/instructions") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Instructions.Swap.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Instructions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInstructions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3763,6 +3763,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/instructions/swap") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Swap extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSwap() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/instructions/swap"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3782,16 +3783,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Instructions"); - suite.addTestSuite(Instructions.class); - suite.addTestSuite(Swap.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/intrinsics") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Intrinsics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInIntrinsics() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/intrinsics"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3844,6 +3840,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({JavaInterop.ObjectMethods.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaInterop extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJavaInterop() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3851,6 +3848,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/javaInterop/objectMethods") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ObjectMethods extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObjectMethods() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/javaInterop/objectMethods"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3894,16 +3892,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("JavaInterop"); - suite.addTestSuite(JavaInterop.class); - suite.addTestSuite(ObjectMethods.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/labels") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Labels extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLabels() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/labels"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3943,6 +3936,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/localClasses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LocalClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/localClasses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4055,6 +4049,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({MultiDecl.ForArray.class, MultiDecl.ForIterator.class, MultiDecl.ForRange.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MultiDecl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDecl() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4129,6 +4124,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ForArray.Int.class, ForArray.Long.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForArray() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4166,6 +4162,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/int") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray/int"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4199,6 +4196,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forArray/long") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forArray/long"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4230,18 +4228,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ForArray"); - suite.addTestSuite(ForArray.class); - suite.addTestSuite(Int.class); - suite.addTestSuite(Long.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ForIterator.LongIterator.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForIterator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4279,6 +4271,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator/longIterator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LongIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLongIterator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forIterator/longIterator"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4310,17 +4303,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ForIterator"); - suite.addTestSuite(ForIterator.class); - suite.addTestSuite(LongIterator.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ForRange.ExplicitRangeTo.class, ForRange.ExplicitRangeToWithDot.class, ForRange.Int.class, ForRange.Long.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForRange extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForRange() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4359,6 +4347,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ExplicitRangeTo.Int.class, ExplicitRangeTo.Long.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExplicitRangeTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeTo() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4396,6 +4385,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/int"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4429,6 +4419,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo/long"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4460,18 +4451,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ExplicitRangeTo"); - suite.addTestSuite(ExplicitRangeTo.class); - suite.addTestSuite(Int.class); - suite.addTestSuite(Long.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ExplicitRangeToWithDot.Int.class, ExplicitRangeToWithDot.Long.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExplicitRangeToWithDot extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4509,6 +4494,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/int"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4542,6 +4528,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot/long"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4573,17 +4560,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ExplicitRangeToWithDot"); - suite.addTestSuite(ExplicitRangeToWithDot.class); - suite.addTestSuite(Int.class); - suite.addTestSuite(Long.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/int") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Int extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInt() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/int"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4617,6 +4598,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/long") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Long extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLong() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multiDecl/forRange/long"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4648,29 +4630,13 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ForRange"); - suite.addTestSuite(ForRange.class); - suite.addTest(ExplicitRangeTo.innerSuite()); - suite.addTest(ExplicitRangeToWithDot.innerSuite()); - suite.addTestSuite(Int.class); - suite.addTestSuite(Long.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("MultiDecl"); - suite.addTestSuite(MultiDecl.class); - suite.addTest(ForArray.innerSuite()); - suite.addTest(ForIterator.innerSuite()); - suite.addTest(ForRange.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/objects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Objects extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/objects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4855,6 +4821,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({OperatorConventions.CompareTo.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OperatorConventions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperatorConventions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4880,6 +4847,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/operatorConventions/compareTo") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompareTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCompareTo() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/operatorConventions/compareTo"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4947,16 +4915,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("OperatorConventions"); - suite.addTestSuite(OperatorConventions.class); - suite.addTestSuite(CompareTo.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/package") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Package extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPackage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/package"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5014,6 +4977,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/primitiveTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PrimitiveTypes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPrimitiveTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/primitiveTypes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5311,6 +5275,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/properties") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Properties extends AbstractBlackBoxCodegenTest { @TestMetadata("accessToPrivateProperty.kt") public void testAccessToPrivateProperty() throws Exception { @@ -5536,6 +5501,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/reflection") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/reflection"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5551,6 +5517,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/regressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRegressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/regressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5584,6 +5551,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/safeCall") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SafeCall extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSafeCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/safeCall"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5629,6 +5597,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/samConstructors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SamConstructors extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSamConstructors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/samConstructors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5704,6 +5673,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/strings") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Strings extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStrings() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/strings"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5767,6 +5737,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/super") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Super extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/super"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5896,6 +5867,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/superConstructorCall") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SuperConstructorCall extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSuperConstructorCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/superConstructorCall"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5983,6 +5955,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/toArray") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ToArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInToArray() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/toArray"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6005,6 +5978,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/traits") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Traits.WithRequired.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Traits extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTraits() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/traits"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6090,6 +6064,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/traits/withRequired") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WithRequired extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWithRequired() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/traits/withRequired"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6169,16 +6144,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Traits"); - suite.addTestSuite(Traits.class); - suite.addTestSuite(WithRequired.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/box/typeInfo") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeInfo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypeInfo() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeInfo"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6230,6 +6200,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/typeMapping") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeMapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTypeMapping() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/typeMapping"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6275,6 +6246,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/unaryOp") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnaryOp extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInUnaryOp() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unaryOp"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6320,6 +6292,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/unit") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Unit extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInUnit() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/unit"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6389,6 +6362,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6422,6 +6396,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6537,56 +6512,4 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - public static Test suite() { - TestSuite suite = new TestSuite("BlackBoxCodegenTestGenerated"); - suite.addTestSuite(BlackBoxCodegenTestGenerated.class); - suite.addTestSuite(Arrays.class); - suite.addTestSuite(BinaryOp.class); - suite.addTest(Bridges.innerSuite()); - suite.addTestSuite(BuiltinStubMethods.class); - suite.addTestSuite(Casts.class); - suite.addTestSuite(Classes.class); - suite.addTest(Closures.innerSuite()); - suite.addTestSuite(Constants.class); - suite.addTestSuite(ControlStructures.class); - suite.addTest(DefaultArguments.innerSuite()); - suite.addTestSuite(DelegatedProperty.class); - suite.addTestSuite(Elvis.class); - suite.addTestSuite(Enum.class); - suite.addTestSuite(ExclExcl.class); - suite.addTestSuite(ExtensionFunctions.class); - suite.addTestSuite(ExtensionProperties.class); - suite.addTestSuite(FakeOverride.class); - suite.addTestSuite(FieldRename.class); - suite.addTestSuite(Finally.class); - suite.addTest(Functions.innerSuite()); - suite.addTestSuite(InnerNested.class); - suite.addTest(Instructions.innerSuite()); - suite.addTestSuite(Intrinsics.class); - suite.addTest(JavaInterop.innerSuite()); - suite.addTestSuite(Labels.class); - suite.addTestSuite(LocalClasses.class); - suite.addTest(MultiDecl.innerSuite()); - suite.addTestSuite(Objects.class); - suite.addTest(OperatorConventions.innerSuite()); - suite.addTestSuite(Package.class); - suite.addTestSuite(PrimitiveTypes.class); - suite.addTestSuite(Properties.class); - suite.addTestSuite(Reflection.class); - suite.addTestSuite(Regressions.class); - suite.addTestSuite(SafeCall.class); - suite.addTestSuite(SamConstructors.class); - suite.addTestSuite(Strings.class); - suite.addTestSuite(Super.class); - suite.addTestSuite(SuperConstructorCall.class); - suite.addTestSuite(ToArray.class); - suite.addTest(Traits.innerSuite()); - suite.addTestSuite(TypeInfo.class); - suite.addTestSuite(TypeMapping.class); - suite.addTestSuite(UnaryOp.class); - suite.addTestSuite(Unit.class); - suite.addTestSuite(Vararg.class); - suite.addTestSuite(When.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java index f011f5de93e..902beede005 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxInlineCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.generated; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/boxInline") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({BlackBoxInlineCodegenTestGenerated.AnonymousObject.class, BlackBoxInlineCodegenTestGenerated.Builders.class, BlackBoxInlineCodegenTestGenerated.Capture.class, BlackBoxInlineCodegenTestGenerated.Complex.class, BlackBoxInlineCodegenTestGenerated.DefaultValues.class, BlackBoxInlineCodegenTestGenerated.LambdaClassClash.class, BlackBoxInlineCodegenTestGenerated.LambdaTransformation.class, BlackBoxInlineCodegenTestGenerated.LocalFunInLambda.class, BlackBoxInlineCodegenTestGenerated.NoInline.class, BlackBoxInlineCodegenTestGenerated.NonLocalReturns.class, BlackBoxInlineCodegenTestGenerated.Simple.class, BlackBoxInlineCodegenTestGenerated.Special.class, BlackBoxInlineCodegenTestGenerated.Trait.class, BlackBoxInlineCodegenTestGenerated.TryCatchFinally.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -38,6 +41,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnonymousObject extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnonymousObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -71,6 +75,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/builders") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Builders extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBuilders() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -92,6 +97,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/capture") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Capture extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCapture() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -137,6 +143,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/complex") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Complex extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInComplex() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -176,6 +183,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/defaultValues") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultValues extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultValues() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -215,6 +223,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LambdaClassClash extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLambdaClassClash() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -236,6 +245,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LambdaTransformation extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLambdaTransformation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -275,6 +285,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LocalFunInLambda extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocalFunInLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -290,6 +301,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/noInline") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NoInline extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNoInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -324,6 +336,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({NonLocalReturns.Deparenthesize.class, NonLocalReturns.TryFinally.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -373,6 +386,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Deparenthesize extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDeparenthesize() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -394,6 +408,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTryFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -407,17 +422,11 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT } - public static Test innerSuite() { - TestSuite suite = new TestSuite("NonLocalReturns"); - suite.addTestSuite(NonLocalReturns.class); - suite.addTestSuite(Deparenthesize.class); - suite.addTestSuite(TryFinally.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxInline/simple") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Simple extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSimple() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -505,6 +514,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/special") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Special extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSpecial() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -550,6 +560,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/trait") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Trait extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTrait() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -565,6 +576,7 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryCatchFinally extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTryCatchFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -590,23 +602,4 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxCodegenT } - public static Test suite() { - TestSuite suite = new TestSuite("BlackBoxInlineCodegenTestGenerated"); - suite.addTestSuite(BlackBoxInlineCodegenTestGenerated.class); - suite.addTestSuite(AnonymousObject.class); - suite.addTestSuite(Builders.class); - suite.addTestSuite(Capture.class); - suite.addTestSuite(Complex.class); - suite.addTestSuite(DefaultValues.class); - suite.addTestSuite(LambdaClassClash.class); - suite.addTestSuite(LambdaTransformation.class); - suite.addTestSuite(LocalFunInLambda.class); - suite.addTestSuite(NoInline.class); - suite.addTest(NonLocalReturns.innerSuite()); - suite.addTestSuite(Simple.class); - suite.addTestSuite(Special.class); - suite.addTestSuite(Trait.class); - suite.addTestSuite(TryCatchFinally.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java index 9b19f63a9d4..dec4b9b878d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.generated; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxMultiFile") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BlackBoxMultiFileCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("accessorForProtected") public void testAccessorForProtected() throws Exception { diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index dcc90c500b2..ef3493bd0e1 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.generated; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxWithJava") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^([^\\.]+)$"), false); diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 3ffdd8c83a7..fe729251ac6 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.codegen.generated; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/boxWithStdlib") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.Annotations.class, BlackBoxWithStdlibCodegenTestGenerated.Arrays.class, BlackBoxWithStdlibCodegenTestGenerated.BoxingOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.CallableReference.class, BlackBoxWithStdlibCodegenTestGenerated.Casts.class, BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.DefaultArguments.class, BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.HashPMap.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.PlatformNames.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Reflection.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, BlackBoxWithStdlibCodegenTestGenerated.Strings.class, BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, BlackBoxWithStdlibCodegenTestGenerated.When.class, BlackBoxWithStdlibCodegenTestGenerated.WhenEnumOptimization.class, BlackBoxWithStdlibCodegenTestGenerated.WhenStringOptimization.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithStdlib() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/annotations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -101,6 +105,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/arrays") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Arrays extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInArrays() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/arrays"), Pattern.compile("^(.+)\\.kt$"), true); @@ -128,6 +133,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/boxingOptimization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BoxingOptimization extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxingOptimization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/boxingOptimization"), Pattern.compile("^(.+)\\.kt$"), true); @@ -204,6 +210,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CallableReference.Function.class, CallableReference.Property.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); @@ -212,6 +219,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Function.Local.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractClassMember.kt") public void testAbstractClassMember() throws Exception { @@ -459,6 +467,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function/local") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Local extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLocal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/callableReference/function/local"), Pattern.compile("^(.+)\\.kt$"), true); @@ -574,16 +583,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Function"); - suite.addTestSuite(Function.class); - suite.addTestSuite(Local.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/property") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractBlackBoxCodegenTest { @TestMetadata("accessViaSubclass.kt") public void testAccessViaSubclass() throws Exception { @@ -693,17 +697,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CallableReference"); - suite.addTestSuite(CallableReference.class); - suite.addTest(Function.innerSuite()); - suite.addTestSuite(Property.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/casts") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Casts extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCasts() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/casts"), Pattern.compile("^(.+)\\.kt$"), true); @@ -720,6 +718,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DataClasses.Copy.class, DataClasses.Equals.class, DataClasses.Hashcode.class, DataClasses.Tostring.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDataClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -799,6 +798,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/copy") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Copy extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCopy() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/copy"), Pattern.compile("^(.+)\\.kt$"), true); @@ -856,6 +856,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/equals") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Equals extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEquals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/equals"), Pattern.compile("^(.+)\\.kt$"), true); @@ -907,6 +908,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Hashcode extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInHashcode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/hashcode"), Pattern.compile("^(.+)\\.kt$"), true); @@ -994,6 +996,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Tostring extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTostring() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/dataClasses/tostring"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1055,20 +1058,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DataClasses"); - suite.addTestSuite(DataClasses.class); - suite.addTestSuite(Copy.class); - suite.addTestSuite(Equals.class); - suite.addTestSuite(Hashcode.class); - suite.addTestSuite(Tostring.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DefaultArguments.Constructor.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1076,6 +1071,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/defaultArguments/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1089,16 +1085,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DefaultArguments"); - suite.addTestSuite(DefaultArguments.class); - suite.addTestSuite(Constructor.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/evaluate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Evaluate extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEvaluate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/evaluate"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1199,6 +1190,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FullJdk.Synchronized.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FullJdk extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFullJdk() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1254,6 +1246,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Synchronized extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSynchronized() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/fullJdk/synchronized"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1321,16 +1314,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FullJdk"); - suite.addTestSuite(FullJdk.class); - suite.addTestSuite(Synchronized.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/hashPMap") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class HashPMap extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInHashPMap() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/hashPMap"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1376,6 +1364,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JdkAnnotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJdkAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/jdkAnnotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1409,6 +1398,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/platformNames") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PlatformNames extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPlatformNames() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1443,6 +1433,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Ranges.Expression.class, Ranges.Literal.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Ranges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRanges() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1462,6 +1453,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges/expression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expression extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/expression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1645,6 +1637,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges/literal") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Literal extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLiteral() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/ranges/literal"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1826,18 +1819,12 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Ranges"); - suite.addTestSuite(Ranges.class); - suite.addTestSuite(Expression.class); - suite.addTestSuite(Literal.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Reflection.Enclosing.class, Reflection.GenericSignature.class, Reflection.Mapping.class, Reflection.MethodsFromAny.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1846,6 +1833,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Enclosing.InsideLambda.class, Enclosing.Lambda.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enclosing extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnclosing() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1853,6 +1841,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InsideLambda extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInsideLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/insideLambda"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1874,6 +1863,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Lambda extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambda"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1953,17 +1943,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Enclosing"); - suite.addTestSuite(Enclosing.class); - suite.addTestSuite(InsideLambda.class); - suite.addTestSuite(Lambda.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericSignature extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInGenericSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/genericSignature"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1979,6 +1963,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/mapping") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Mapping extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMapping() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/mapping"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2012,6 +1997,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MethodsFromAny extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMethodsFromAny() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/reflection/methodsFromAny"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2061,19 +2047,11 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Reflection"); - suite.addTestSuite(Reflection.class); - suite.addTest(Enclosing.innerSuite()); - suite.addTestSuite(GenericSignature.class); - suite.addTestSuite(Mapping.class); - suite.addTestSuite(MethodsFromAny.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxWithStdlib/regressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regressions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRegressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/regressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2257,6 +2235,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/strings") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Strings extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStrings() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/strings"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2278,6 +2257,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/toArray") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ToArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInToArray() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/toArray"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2305,6 +2285,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2320,6 +2301,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2371,6 +2353,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenEnumOptimization extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhenEnumOptimization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenEnumOptimization"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2440,6 +2423,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/whenStringOptimization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenStringOptimization extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInWhenStringOptimization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxWithStdlib/whenStringOptimization"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2483,30 +2467,4 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode } - public static Test suite() { - TestSuite suite = new TestSuite("BlackBoxWithStdlibCodegenTestGenerated"); - suite.addTestSuite(BlackBoxWithStdlibCodegenTestGenerated.class); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(Arrays.class); - suite.addTestSuite(BoxingOptimization.class); - suite.addTest(CallableReference.innerSuite()); - suite.addTestSuite(Casts.class); - suite.addTest(DataClasses.innerSuite()); - suite.addTest(DefaultArguments.innerSuite()); - suite.addTestSuite(Evaluate.class); - suite.addTest(FullJdk.innerSuite()); - suite.addTestSuite(HashPMap.class); - suite.addTestSuite(JdkAnnotations.class); - suite.addTestSuite(PlatformNames.class); - suite.addTest(Ranges.innerSuite()); - suite.addTest(Reflection.innerSuite()); - suite.addTestSuite(Regressions.class); - suite.addTestSuite(Strings.class); - suite.addTestSuite(ToArray.class); - suite.addTestSuite(Vararg.class); - suite.addTestSuite(When.class); - suite.addTestSuite(WhenEnumOptimization.class); - suite.addTestSuite(WhenStringOptimization.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java b/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java index 3c5722c7dc4..a18f9ef2ebe 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.evaluate; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({EvaluateExpressionTestGenerated.Constant.class, EvaluateExpressionTestGenerated.IsPure.class, EvaluateExpressionTestGenerated.UsesVariableAsConstant.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest { @TestMetadata("compiler/testData/evaluate/constant") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constant extends AbstractEvaluateExpressionTest { public void testAllFilesPresentInConstant() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/constant"), Pattern.compile("^(.+)\\.kt$"), true); @@ -155,6 +159,7 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT @TestMetadata("compiler/testData/evaluate/isPure") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IsPure extends AbstractEvaluateExpressionTest { public void testAllFilesPresentInIsPure() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/isPure"), Pattern.compile("^(.+)\\.kt$"), true); @@ -194,6 +199,7 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT @TestMetadata("compiler/testData/evaluate/usesVariableAsConstant") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UsesVariableAsConstant extends AbstractEvaluateExpressionTest { public void testAllFilesPresentInUsesVariableAsConstant() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/evaluate/usesVariableAsConstant"), Pattern.compile("^(.+)\\.kt$"), true); @@ -225,11 +231,4 @@ public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionT } - public static Test suite() { - TestSuite suite = new TestSuite("EvaluateExpressionTestGenerated"); - suite.addTestSuite(Constant.class); - suite.addTestSuite(IsPure.class); - suite.addTestSuite(UsesVariableAsConstant.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java index b154da3993d..defa5a3a518 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/compileJavaAgainstKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CompileJavaAgainstKotlinTestGenerated.Class.class, CompileJavaAgainstKotlinTestGenerated.Method.class, CompileJavaAgainstKotlinTestGenerated.Property.class, CompileJavaAgainstKotlinTestGenerated.StaticFields.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/class") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -120,6 +124,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Method.PlatformName.class, Method.PrimitiveOverride.class, Method.Throws.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Method extends AbstractCompileJavaAgainstKotlinTest { @TestMetadata("AccessorGenericSignature.kt") public void testAccessorGenericSignature() throws Exception { @@ -271,6 +276,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/platformName") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPlatformName() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/platformName"), Pattern.compile("^(.+)\\.kt$"), true); @@ -286,6 +292,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PrimitiveOverride extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPrimitiveOverride() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/primitiveOverride"), Pattern.compile("^(.+)\\.kt$"), true); @@ -361,6 +368,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method/throws") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Throws extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInThrows() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/method/throws"), Pattern.compile("^(.+)\\.kt$"), true); @@ -410,19 +418,12 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Method"); - suite.addTestSuite(Method.class); - suite.addTestSuite(PlatformName.class); - suite.addTestSuite(PrimitiveOverride.class); - suite.addTestSuite(Throws.class); - return suite; - } } @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Property.PlatformName.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property"), Pattern.compile("^(.+)\\.kt$"), true); @@ -442,6 +443,7 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property/platformName") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PlatformName extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInPlatformName() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/property/platformName"), Pattern.compile("^(.+)\\.kt$"), true); @@ -455,16 +457,11 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Property"); - suite.addTestSuite(Property.class); - suite.addTestSuite(PlatformName.class); - return suite; - } } @TestMetadata("compiler/testData/compileJavaAgainstKotlin/staticFields") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StaticFields extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInStaticFields() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileJavaAgainstKotlin/staticFields"), Pattern.compile("^(.+)\\.kt$"), true); @@ -502,13 +499,4 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg } - public static Test suite() { - TestSuite suite = new TestSuite("CompileJavaAgainstKotlinTestGenerated"); - suite.addTestSuite(CompileJavaAgainstKotlinTestGenerated.class); - suite.addTestSuite(Class.class); - suite.addTest(Method.innerSuite()); - suite.addTest(Property.innerSuite()); - suite.addTestSuite(StaticFields.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java index 562578bf894..0c97c0012cb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/codegen/boxInline") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CompileKotlinAgainstInlineKotlinTestGenerated.AnonymousObject.class, CompileKotlinAgainstInlineKotlinTestGenerated.Builders.class, CompileKotlinAgainstInlineKotlinTestGenerated.Capture.class, CompileKotlinAgainstInlineKotlinTestGenerated.Complex.class, CompileKotlinAgainstInlineKotlinTestGenerated.DefaultValues.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaClassClash.class, CompileKotlinAgainstInlineKotlinTestGenerated.LambdaTransformation.class, CompileKotlinAgainstInlineKotlinTestGenerated.LocalFunInLambda.class, CompileKotlinAgainstInlineKotlinTestGenerated.NoInline.class, CompileKotlinAgainstInlineKotlinTestGenerated.NonLocalReturns.class, CompileKotlinAgainstInlineKotlinTestGenerated.Simple.class, CompileKotlinAgainstInlineKotlinTestGenerated.Special.class, CompileKotlinAgainstInlineKotlinTestGenerated.Trait.class, CompileKotlinAgainstInlineKotlinTestGenerated.TryCatchFinally.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInBoxInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -38,6 +41,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/anonymousObject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnonymousObject extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInAnonymousObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/anonymousObject"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -71,6 +75,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/builders") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Builders extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInBuilders() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/builders"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -92,6 +97,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/capture") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Capture extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInCapture() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/capture"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -137,6 +143,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/complex") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Complex extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInComplex() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/complex"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -176,6 +183,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/defaultValues") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultValues extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInDefaultValues() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/defaultValues"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -215,6 +223,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/lambdaClassClash") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LambdaClassClash extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInLambdaClassClash() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaClassClash"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -236,6 +245,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/lambdaTransformation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LambdaTransformation extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInLambdaTransformation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/lambdaTransformation"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -275,6 +285,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/localFunInLambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LocalFunInLambda extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInLocalFunInLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/localFunInLambda"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -290,6 +301,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/noInline") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NoInline extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInNoInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/noInline"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -324,6 +336,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({NonLocalReturns.Deparenthesize.class, NonLocalReturns.TryFinally.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -373,6 +386,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Deparenthesize extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInDeparenthesize() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -394,6 +408,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInTryFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -407,17 +422,11 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } - public static Test innerSuite() { - TestSuite suite = new TestSuite("NonLocalReturns"); - suite.addTestSuite(NonLocalReturns.class); - suite.addTestSuite(Deparenthesize.class); - suite.addTestSuite(TryFinally.class); - return suite; - } } @TestMetadata("compiler/testData/codegen/boxInline/simple") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Simple extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInSimple() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/simple"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -505,6 +514,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/special") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Special extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInSpecial() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/special"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -550,6 +560,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/trait") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Trait extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInTrait() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/trait"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -565,6 +576,7 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/tryCatchFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryCatchFinally extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInTryCatchFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/boxInline/tryCatchFinally"), Pattern.compile("^(.+)\\.1.kt$"), true); @@ -590,23 +602,4 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi } - public static Test suite() { - TestSuite suite = new TestSuite("CompileKotlinAgainstInlineKotlinTestGenerated"); - suite.addTestSuite(CompileKotlinAgainstInlineKotlinTestGenerated.class); - suite.addTestSuite(AnonymousObject.class); - suite.addTestSuite(Builders.class); - suite.addTestSuite(Capture.class); - suite.addTestSuite(Complex.class); - suite.addTestSuite(DefaultValues.class); - suite.addTestSuite(LambdaClassClash.class); - suite.addTestSuite(LambdaTransformation.class); - suite.addTestSuite(LocalFunInLambda.class); - suite.addTestSuite(NoInline.class); - suite.addTest(NonLocalReturns.innerSuite()); - suite.addTestSuite(Simple.class); - suite.addTestSuite(Special.class); - suite.addTestSuite(Trait.class); - suite.addTestSuite(TryCatchFinally.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index dac046a390e..d43e61cec89 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/compileKotlinAgainstKotlin") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CompileKotlinAgainstKotlinTestGenerated extends AbstractCompileKotlinAgainstKotlinTest { public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.A.kt$"), true); diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index c5da610b9f7..e0b7495741d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({LoadJavaTestGenerated.CompiledJava.class, LoadJavaTestGenerated.CompiledJavaAndKotlin.class, LoadJavaTestGenerated.CompiledJavaIncludeObjectMethods.class, LoadJavaTestGenerated.CompiledKotlin.class, LoadJavaTestGenerated.CompiledKotlinWithStdlib.class, LoadJavaTestGenerated.JavaAgainstKotlin.class, LoadJavaTestGenerated.KotlinAgainstCompiledJavaWithKotlin.class, LoadJavaTestGenerated.SourceJava.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.Constructor.class, CompiledJava.JavaBean.class, CompiledJava.KotlinSignature.class, CompiledJava.Library.class, CompiledJava.Modality.class, CompiledJava.Mutability.class, CompiledJava.NotNull.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.Sam.class, CompiledJava.SignaturePropagation.class, CompiledJava.Static.class, CompiledJava.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompiledJava extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true); @@ -292,6 +296,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/annotations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/annotations"), Pattern.compile("^(.+)\\.java$"), true); @@ -415,6 +420,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/constructor") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/constructor"), Pattern.compile("^(.+)\\.java$"), true); @@ -442,6 +448,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/javaBean") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaBean() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/javaBean"), Pattern.compile("^(.+)\\.java$"), true); @@ -488,6 +495,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractLoadJavaTest { @TestMetadata("AllBoundsInWhen.java") public void testAllBoundsInWhen() throws Exception { @@ -591,6 +599,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/error") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Error extends AbstractLoadJavaTest { @TestMetadata("AddingNullability.java") public void testAddingNullability() throws Exception { @@ -763,6 +772,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.java$"), true); @@ -776,6 +786,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLoadJavaTest { public void testAllFilesPresentInParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.java$"), true); @@ -941,6 +952,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Return extends AbstractLoadJavaTest { @TestMetadata("AddNotNullJavaSubtype.java") public void testAddNotNullJavaSubtype() throws Exception { @@ -1154,6 +1166,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLoadJavaTest { public void testAllFilesPresentInTypeParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.java$"), true); @@ -1215,27 +1228,13 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Propagation"); - suite.addTestSuite(Propagation.class); - suite.addTestSuite(Parameter.class); - suite.addTestSuite(Return.class); - suite.addTestSuite(TypeParameter.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("KotlinSignature"); - suite.addTestSuite(KotlinSignature.class); - suite.addTestSuite(Error.class); - suite.addTest(Propagation.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledJava/library") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Library extends AbstractLoadJavaTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/library"), Pattern.compile("^(.+)\\.java$"), true); @@ -1263,6 +1262,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/modality") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Modality extends AbstractLoadJavaTest { public void testAllFilesPresentInModality() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/modality"), Pattern.compile("^(.+)\\.java$"), true); @@ -1278,6 +1278,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/mutability") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Mutability extends AbstractLoadJavaTest { public void testAllFilesPresentInMutability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/mutability"), Pattern.compile("^(.+)\\.java$"), true); @@ -1311,6 +1312,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/notNull") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLoadJavaTest { public void testAllFilesPresentInNotNull() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/notNull"), Pattern.compile("^(.+)\\.java$"), true); @@ -1350,6 +1352,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/protectedPackage") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ProtectedPackage extends AbstractLoadJavaTest { public void testAllFilesPresentInProtectedPackage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedPackage"), Pattern.compile("^(.+)\\.java$"), true); @@ -1377,6 +1380,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/protectedStatic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ProtectedStatic extends AbstractLoadJavaTest { public void testAllFilesPresentInProtectedStatic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/protectedStatic"), Pattern.compile("^(.+)\\.java$"), true); @@ -1393,6 +1397,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/sam") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Sam.Adapters.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Sam extends AbstractLoadJavaTest { public void testAllFilesPresentInSam() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam"), Pattern.compile("^(.+)\\.java$"), true); @@ -1479,6 +1484,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Adapters.Inheritance.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Adapters extends AbstractLoadJavaTest { public void testAllFilesPresentInAdapters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/sam/adapters"), Pattern.compile("^(.+)\\.java$"), true); @@ -1546,6 +1552,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters/inheritance") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inheritance extends AbstractLoadJavaTest { @TestMetadata("AdapterDoesntOverrideDeclaration.java") public void testAdapterDoesntOverrideDeclaration() throws Exception { @@ -1613,24 +1620,13 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Adapters"); - suite.addTestSuite(Adapters.class); - suite.addTestSuite(Inheritance.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Sam"); - suite.addTestSuite(Sam.class); - suite.addTest(Adapters.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SignaturePropagation extends AbstractLoadJavaTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/signaturePropagation"), Pattern.compile("^(.+)\\.java$"), true); @@ -1682,6 +1678,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/static") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Static extends AbstractLoadJavaTest { public void testAllFilesPresentInStatic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/static"), Pattern.compile("^(.+)\\.java$"), true); @@ -1733,6 +1730,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJava/vararg"), Pattern.compile("^(.+)\\.java$"), true); @@ -1752,30 +1750,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CompiledJava"); - suite.addTestSuite(CompiledJava.class); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(JavaBean.class); - suite.addTest(KotlinSignature.innerSuite()); - suite.addTestSuite(Library.class); - suite.addTestSuite(Modality.class); - suite.addTestSuite(Mutability.class); - suite.addTestSuite(NotNull.class); - suite.addTestSuite(ProtectedPackage.class); - suite.addTestSuite(ProtectedStatic.class); - suite.addTest(Sam.innerSuite()); - suite.addTestSuite(SignaturePropagation.class); - suite.addTestSuite(Static.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaAndKotlin"), Pattern.compile("^(.+)\\.txt$"), true); @@ -1787,15 +1767,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTestCompiledJavaAndKotlin(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CompiledJavaAndKotlin"); - suite.addTestSuite(CompiledJavaAndKotlin.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompiledJavaIncludeObjectMethods extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJavaIncludeObjectMethods() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledJavaIncludeObjectMethods"), Pattern.compile("^(.+)\\.java$"), true); @@ -1818,6 +1794,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompiledKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1826,6 +1803,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1851,6 +1829,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractLoadJavaTest { public void testAllFilesPresentInClassMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1902,6 +1881,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Classes extends AbstractLoadJavaTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1995,6 +1975,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractLoadJavaTest { public void testAllFilesPresentInPackageMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2052,6 +2033,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameters extends AbstractLoadJavaTest { public void testAllFilesPresentInParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2127,6 +2109,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractLoadJavaTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2182,21 +2165,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Annotations"); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(ClassMembers.class); - suite.addTestSuite(Classes.class); - suite.addTestSuite(PackageMembers.class); - suite.addTestSuite(Parameters.class); - suite.addTestSuite(PropertiesWithoutBackingFields.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Class.JavaBean.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractLoadJavaTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2402,6 +2376,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaBean() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2445,16 +2420,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Class"); - suite.addTestSuite(Class.class); - suite.addTestSuite(JavaBean.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractLoadJavaTest { public void testAllFilesPresentInClassFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2500,6 +2470,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractLoadJavaTest { public void testAllFilesPresentInClassObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2582,6 +2553,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Constructor.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2685,6 +2657,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2704,16 +2677,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Constructor"); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataClass extends AbstractLoadJavaTest { public void testAllFilesPresentInDataClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2765,6 +2733,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractLoadJavaTest { public void testAllFilesPresentInEnum() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2805,6 +2774,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractLoadJavaTest { public void testAllFilesPresentInFromLoadJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3017,6 +2987,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractLoadJavaTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { @@ -3120,6 +3091,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Error extends AbstractLoadJavaTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { @@ -3292,6 +3264,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3305,6 +3278,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLoadJavaTest { public void testAllFilesPresentInParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3470,6 +3444,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Return extends AbstractLoadJavaTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { @@ -3683,6 +3658,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLoadJavaTest { public void testAllFilesPresentInTypeParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3744,27 +3720,13 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Propagation"); - suite.addTestSuite(Propagation.class); - suite.addTestSuite(Parameter.class); - suite.addTestSuite(Return.class); - suite.addTestSuite(TypeParameter.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("KotlinSignature"); - suite.addTestSuite(KotlinSignature.class); - suite.addTestSuite(Error.class); - suite.addTest(Propagation.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Library extends AbstractLoadJavaTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3792,6 +3754,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Modality extends AbstractLoadJavaTest { public void testAllFilesPresentInModality() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3807,6 +3770,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLoadJavaTest { public void testAllFilesPresentInNotNull() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3844,20 +3808,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FromLoadJava"); - suite.addTestSuite(FromLoadJava.class); - suite.addTest(KotlinSignature.innerSuite()); - suite.addTestSuite(Library.class); - suite.addTestSuite(Modality.class); - suite.addTestSuite(NotNull.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Fun extends AbstractLoadJavaTest { public void testAllFilesPresentInFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3925,6 +3881,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractLoadJavaTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3994,6 +3951,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractLoadJavaTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4033,6 +3991,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractLoadJavaTest { public void testAllFilesPresentInNonGeneric() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4138,6 +4097,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLoadJavaTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4163,19 +4123,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Fun"); - suite.addTestSuite(Fun.class); - suite.addTestSuite(GenericWithTypeVariables.class); - suite.addTestSuite(GenericWithoutTypeVariables.class); - suite.addTestSuite(NonGeneric.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inline extends AbstractLoadJavaTest { public void testAllFilesPresentInInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4192,6 +4144,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Prop.DefaultAccessors.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Prop extends AbstractLoadJavaTest { public void testAllFilesPresentInProp() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4391,6 +4344,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractLoadJavaTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4458,16 +4412,11 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Prop"); - suite.addTestSuite(Prop.class); - suite.addTestSuite(DefaultAccessors.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/type") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Type extends AbstractLoadJavaTest { public void testAllFilesPresentInType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4651,6 +4600,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLoadJavaTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4736,29 +4686,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CompiledKotlin"); - suite.addTestSuite(CompiledKotlin.class); - suite.addTest(Annotations.innerSuite()); - suite.addTest(Class.innerSuite()); - suite.addTestSuite(ClassFun.class); - suite.addTestSuite(ClassObject.class); - suite.addTest(Constructor.innerSuite()); - suite.addTestSuite(DataClass.class); - suite.addTestSuite(Enum.class); - suite.addTest(FromLoadJava.innerSuite()); - suite.addTest(Fun.innerSuite()); - suite.addTestSuite(Inline.class); - suite.addTest(Prop.innerSuite()); - suite.addTestSuite(Type.class); - suite.addTestSuite(Visibility.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CompiledKotlinWithStdlib.Mutability.class, CompiledKotlinWithStdlib.PlatformNames.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompiledKotlinWithStdlib extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledKotlinWithStdlib() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4766,6 +4699,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Mutability extends AbstractLoadJavaTest { public void testAllFilesPresentInMutability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/mutability"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4799,6 +4733,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PlatformNames extends AbstractLoadJavaTest { public void testAllFilesPresentInPlatformNames() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlinWithStdlib/platformNames"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4812,18 +4747,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CompiledKotlinWithStdlib"); - suite.addTestSuite(CompiledKotlinWithStdlib.class); - suite.addTestSuite(Mutability.class); - suite.addTestSuite(PlatformNames.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({JavaAgainstKotlin.SamAdapters.class, JavaAgainstKotlin.SignaturePropagation.class, JavaAgainstKotlin.Visibility.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaAgainstKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaAgainstKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin"), Pattern.compile("^(.+)\\.txt$"), true); @@ -4832,6 +4761,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SamAdapters extends AbstractLoadJavaTest { public void testAllFilesPresentInSamAdapters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/samAdapters"), Pattern.compile("^(.+)\\.txt$"), true); @@ -4867,16 +4797,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTestJavaAgainstKotlin(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("SamAdapters"); - suite.addTestSuite(SamAdapters.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SignaturePropagation extends AbstractLoadJavaTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation"), Pattern.compile("^(.+)\\.txt$"), true); @@ -4912,16 +4838,12 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTestJavaAgainstKotlin(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("SignaturePropagation"); - suite.addTestSuite(SignaturePropagation.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLoadJavaTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/javaAgainstKotlin/visibility"), Pattern.compile("^(.+)\\.txt$"), true); @@ -4939,25 +4861,13 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { doTestJavaAgainstKotlin(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Visibility"); - suite.addTestSuite(Visibility.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("JavaAgainstKotlin"); - suite.addTestSuite(JavaAgainstKotlin.class); - suite.addTest(SamAdapters.innerSuite()); - suite.addTest(SignaturePropagation.innerSuite()); - suite.addTest(Visibility.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinAgainstCompiledJavaWithKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInKotlinAgainstCompiledJavaWithKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/kotlinAgainstCompiledJavaWithKotlin"), Pattern.compile("^(.+)\\.kt$"), false); @@ -4991,6 +4901,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/sourceJava") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SourceJava extends AbstractLoadJavaTest { public void testAllFilesPresentInSourceJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/sourceJava"), Pattern.compile("^(.+)\\.java$"), true); @@ -5034,16 +4945,4 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - public static Test suite() { - TestSuite suite = new TestSuite("LoadJavaTestGenerated"); - suite.addTest(CompiledJava.innerSuite()); - suite.addTest(CompiledJavaAndKotlin.innerSuite()); - suite.addTestSuite(CompiledJavaIncludeObjectMethods.class); - suite.addTest(CompiledKotlin.innerSuite()); - suite.addTest(CompiledKotlinWithStdlib.innerSuite()); - suite.addTest(JavaAgainstKotlin.innerSuite()); - suite.addTestSuite(KotlinAgainstCompiledJavaWithKotlin.class); - suite.addTestSuite(SourceJava.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java index 6d55aa518f8..256e880a3c9 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/writeSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({WriteSignatureTestGenerated.Constructor.class, WriteSignatureTestGenerated.DeclarationSiteVariance.class, WriteSignatureTestGenerated.Nothing.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { public void testAllFilesPresentInWriteSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature"), Pattern.compile("^(.+)\\.kt$"), true); @@ -122,6 +125,7 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @TestMetadata("compiler/testData/writeSignature/constructor") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractWriteSignatureTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -155,6 +159,7 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @TestMetadata("compiler/testData/writeSignature/declarationSiteVariance") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeclarationSiteVariance extends AbstractWriteSignatureTest { public void testAllFilesPresentInDeclarationSiteVariance() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/declarationSiteVariance"), Pattern.compile("^(.+)\\.kt$"), true); @@ -296,6 +301,7 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { @TestMetadata("compiler/testData/writeSignature/nothing") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Nothing extends AbstractWriteSignatureTest { public void testAllFilesPresentInNothing() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/writeSignature/nothing"), Pattern.compile("^(.+)\\.kt$"), true); @@ -315,12 +321,4 @@ public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { } - public static Test suite() { - TestSuite suite = new TestSuite("WriteSignatureTestGenerated"); - suite.addTestSuite(WriteSignatureTestGenerated.class); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(DeclarationSiteVariance.class); - suite.addTestSuite(Nothing.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java index 5d1ee9a560b..71fbbf5568f 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/renderer") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest { public void testAllFilesPresentInRenderer() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/renderer"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java index 5ae77b1215f..06f64483e0b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveRecursiveComparingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({LazyResolveRecursiveComparingTestGenerated.CompiledKotlin.class, LazyResolveRecursiveComparingTestGenerated.RecursiveComparator.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CompiledKotlin.Annotations.class, CompiledKotlin.Class.class, CompiledKotlin.ClassFun.class, CompiledKotlin.ClassObject.class, CompiledKotlin.Constructor.class, CompiledKotlin.DataClass.class, CompiledKotlin.Enum.class, CompiledKotlin.FromLoadJava.class, CompiledKotlin.Fun.class, CompiledKotlin.Inline.class, CompiledKotlin.Prop.class, CompiledKotlin.Type.class, CompiledKotlin.Visibility.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CompiledKotlin extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); @@ -41,6 +45,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -66,6 +71,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClassMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -117,6 +123,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Classes extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -210,6 +217,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInPackageMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -267,6 +275,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameters extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -342,6 +351,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); @@ -397,21 +407,12 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Annotations"); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(ClassMembers.class); - suite.addTestSuite(Classes.class); - suite.addTestSuite(PackageMembers.class); - suite.addTestSuite(Parameters.class); - suite.addTestSuite(PropertiesWithoutBackingFields.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Class.JavaBean.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -617,6 +618,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInJavaBean() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); @@ -660,16 +662,11 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Class"); - suite.addTestSuite(Class.class); - suite.addTestSuite(JavaBean.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClassFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -715,6 +712,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInClassObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -797,6 +795,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Constructor.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -900,6 +899,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -919,16 +919,11 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Constructor"); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataClass extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInDataClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -980,6 +975,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInEnum() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1020,6 +1016,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInFromLoadJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1232,6 +1229,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { @@ -1335,6 +1333,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Error extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { @@ -1507,6 +1506,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInPropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1520,6 +1520,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1685,6 +1686,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Return extends AbstractLazyResolveRecursiveComparingTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { @@ -1898,6 +1900,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInTypeParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1959,27 +1962,13 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Propagation"); - suite.addTestSuite(Propagation.class); - suite.addTestSuite(Parameter.class); - suite.addTestSuite(Return.class); - suite.addTestSuite(TypeParameter.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("KotlinSignature"); - suite.addTestSuite(KotlinSignature.class); - suite.addTestSuite(Error.class); - suite.addTest(Propagation.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Library extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2007,6 +1996,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Modality extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInModality() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2022,6 +2012,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInNotNull() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2059,20 +2050,12 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FromLoadJava"); - suite.addTestSuite(FromLoadJava.class); - suite.addTest(KotlinSignature.innerSuite()); - suite.addTestSuite(Library.class); - suite.addTestSuite(Modality.class); - suite.addTestSuite(NotNull.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Fun extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2140,6 +2123,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2209,6 +2193,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2248,6 +2233,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInNonGeneric() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2353,6 +2339,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2378,19 +2365,11 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Fun"); - suite.addTestSuite(Fun.class); - suite.addTestSuite(GenericWithTypeVariables.class); - suite.addTestSuite(GenericWithoutTypeVariables.class); - suite.addTestSuite(NonGeneric.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inline extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2407,6 +2386,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Prop.DefaultAccessors.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Prop extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInProp() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2606,6 +2586,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2673,16 +2654,11 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Prop"); - suite.addTestSuite(Prop.class); - suite.addTestSuite(DefaultAccessors.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/type") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Type extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2866,6 +2842,7 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2951,28 +2928,11 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CompiledKotlin"); - suite.addTestSuite(CompiledKotlin.class); - suite.addTest(Annotations.innerSuite()); - suite.addTest(Class.innerSuite()); - suite.addTestSuite(ClassFun.class); - suite.addTestSuite(ClassObject.class); - suite.addTest(Constructor.innerSuite()); - suite.addTestSuite(DataClass.class); - suite.addTestSuite(Enum.class); - suite.addTest(FromLoadJava.innerSuite()); - suite.addTest(Fun.innerSuite()); - suite.addTestSuite(Inline.class); - suite.addTest(Prop.innerSuite()); - suite.addTestSuite(Type.class); - suite.addTestSuite(Visibility.class); - return suite; - } } @TestMetadata("compiler/testData/lazyResolve/recursiveComparator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RecursiveComparator extends AbstractLazyResolveRecursiveComparingTest { public void testAllFilesPresentInRecursiveComparator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/lazyResolve/recursiveComparator"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3070,10 +3030,4 @@ public class LazyResolveRecursiveComparingTestGenerated extends AbstractLazyReso } - public static Test suite() { - TestSuite suite = new TestSuite("LazyResolveRecursiveComparingTestGenerated"); - suite.addTest(CompiledKotlin.innerSuite()); - suite.addTestSuite(RecursiveComparator.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java index 0624df17355..58c412955e6 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/resolve/imports") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class LazyResolveTestGenerated extends AbstractLazyResolveTest { public void testAllFilesPresentInImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), false); diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java b/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java index 629efb4d241..088f59a2c0c 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.modules.xml; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/modules.xml") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ModuleXmlParserTestGenerated extends AbstractModuleXmlParserTest { public void testAllFilesPresentInModules_xml() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/modules.xml"), Pattern.compile("^(.+)\\.xml$"), true); diff --git a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java index 0bfc8129be3..48167c90de5 100644 --- a/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/parsing/JetParsingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.parsing; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetParsingTestGenerated.Psi.class, JetParsingTestGenerated.Expression.class, JetParsingTestGenerated.Block.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Psi.Examples.class, Psi.FunctionReceivers.class, Psi.GreatSyntacticShift.class, Psi.Kdoc.class, Psi.PropertyDelegate.class, Psi.Recovery.class, Psi.Script.class, Psi.StringTemplates.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Psi extends AbstractJetParsingTest { @TestMetadata("AbsentInnerType.kt") public void testAbsentInnerType() throws Exception { @@ -545,6 +549,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Examples.Array.class, Examples.Collections.class, Examples.Io.class, Examples.Map.class, Examples.Priorityqueues.class, Examples.Util.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Examples extends AbstractJetParsingTest { public void testAllFilesPresentInExamples() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -642,6 +647,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/array") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Array extends AbstractJetParsingTest { public void testAllFilesPresentInArray() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/array"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -657,6 +663,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/collections") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Collections extends AbstractJetParsingTest { public void testAllFilesPresentInCollections() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/collections"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -738,6 +745,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/io") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Io extends AbstractJetParsingTest { public void testAllFilesPresentInIo() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/io"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -753,6 +761,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/map") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Map extends AbstractJetParsingTest { public void testAllFilesPresentInMap() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/map"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -768,6 +777,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/priorityqueues") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Priorityqueues extends AbstractJetParsingTest { public void testAllFilesPresentInPriorityqueues() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/priorityqueues"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -795,6 +805,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/examples/util") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Util extends AbstractJetParsingTest { public void testAllFilesPresentInUtil() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/examples/util"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -814,21 +825,11 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Examples"); - suite.addTestSuite(Examples.class); - suite.addTestSuite(Array.class); - suite.addTestSuite(Collections.class); - suite.addTestSuite(Io.class); - suite.addTestSuite(Map.class); - suite.addTestSuite(Priorityqueues.class); - suite.addTestSuite(Util.class); - return suite; - } } @TestMetadata("compiler/testData/psi/functionReceivers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionReceivers extends AbstractJetParsingTest { public void testAllFilesPresentInFunctionReceivers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/functionReceivers"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -856,6 +857,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/greatSyntacticShift") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GreatSyntacticShift extends AbstractJetParsingTest { public void testAllFilesPresentInGreatSyntacticShift() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/greatSyntacticShift"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -883,6 +885,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/kdoc") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Kdoc extends AbstractJetParsingTest { public void testAllFilesPresentInKdoc() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/kdoc"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -958,6 +961,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/propertyDelegate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertyDelegate extends AbstractJetParsingTest { public void testAllFilesPresentInPropertyDelegate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/propertyDelegate"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -1033,6 +1037,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Recovery extends AbstractJetParsingTest { @TestMetadata("AbsentLeftHandSide.kt") public void testAbsentLeftHandSide() throws Exception { @@ -1228,6 +1233,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/script") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Script extends AbstractJetParsingTest { public void testAllFilesPresentInScript() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/script"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -1273,6 +1279,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/stringTemplates") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StringTemplates extends AbstractJetParsingTest { public void testAllFilesPresentInStringTemplates() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/psi/stringTemplates"), Pattern.compile("^(.*)\\.kts?$"), true); @@ -1286,23 +1293,11 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Psi"); - suite.addTestSuite(Psi.class); - suite.addTest(Examples.innerSuite()); - suite.addTestSuite(FunctionReceivers.class); - suite.addTestSuite(GreatSyntacticShift.class); - suite.addTestSuite(Kdoc.class); - suite.addTestSuite(PropertyDelegate.class); - suite.addTestSuite(Recovery.class); - suite.addTestSuite(Script.class); - suite.addTestSuite(StringTemplates.class); - return suite; - } } @TestMetadata("compiler/testData/parseCodeFragment/expression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expression extends AbstractJetParsingTest { public void testAllFilesPresentInExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/expression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1324,6 +1319,7 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/parseCodeFragment/block") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Block extends AbstractJetParsingTest { public void testAllFilesPresentInBlock() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/parseCodeFragment/block"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1391,11 +1387,4 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { } - public static Test suite() { - TestSuite suite = new TestSuite("JetParsingTestGenerated"); - suite.addTest(Psi.innerSuite()); - suite.addTestSuite(Expression.class); - suite.addTestSuite(Block.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java index 2f86a3fc5a3..e0628fa8eaf 100644 --- a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.repl; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/repl") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ReplInterpreterTestGenerated.Classes.class, ReplInterpreterTestGenerated.Multiline.class, ReplInterpreterTestGenerated.Objects.class, ReplInterpreterTestGenerated.PrimitiveTypes.class, ReplInterpreterTestGenerated.Reflection.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { public void testAllFilesPresentInRepl() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl"), Pattern.compile("^(.+)\\.repl$"), true); @@ -110,6 +113,7 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @TestMetadata("compiler/testData/repl/classes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Classes extends AbstractReplInterpreterTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/classes"), Pattern.compile("^(.+)\\.repl$"), true); @@ -173,6 +177,7 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @TestMetadata("compiler/testData/repl/multiline") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Multiline extends AbstractReplInterpreterTest { public void testAllFilesPresentInMultiline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/multiline"), Pattern.compile("^(.+)\\.repl$"), true); @@ -206,6 +211,7 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @TestMetadata("compiler/testData/repl/objects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Objects extends AbstractReplInterpreterTest { public void testAllFilesPresentInObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/objects"), Pattern.compile("^(.+)\\.repl$"), true); @@ -233,6 +239,7 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @TestMetadata("compiler/testData/repl/primitiveTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PrimitiveTypes extends AbstractReplInterpreterTest { public void testAllFilesPresentInPrimitiveTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/primitiveTypes"), Pattern.compile("^(.+)\\.repl$"), true); @@ -254,6 +261,7 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { @TestMetadata("compiler/testData/repl/reflection") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Reflection extends AbstractReplInterpreterTest { public void testAllFilesPresentInReflection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/repl/reflection"), Pattern.compile("^(.+)\\.repl$"), true); @@ -267,14 +275,4 @@ public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { } - public static Test suite() { - TestSuite suite = new TestSuite("ReplInterpreterTestGenerated"); - suite.addTestSuite(ReplInterpreterTestGenerated.class); - suite.addTestSuite(Classes.class); - suite.addTestSuite(Multiline.class); - suite.addTestSuite(Objects.class); - suite.addTestSuite(PrimitiveTypes.class); - suite.addTestSuite(Reflection.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java index aa27e004861..e4b240292ab 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/resolve") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ResolveTestGenerated.CandidatesPriority.class, ResolveTestGenerated.DelegatedProperty.class, ResolveTestGenerated.Imports.class, ResolveTestGenerated.Labels.class, ResolveTestGenerated.Regressions.class, ResolveTestGenerated.Varargs.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ResolveTestGenerated extends AbstractResolveTest { public void testAllFilesPresentInResolve() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -206,6 +209,7 @@ public class ResolveTestGenerated extends AbstractResolveTest { @TestMetadata("compiler/testData/resolve/candidatesPriority") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CandidatesPriority extends AbstractResolveTest { public void testAllFilesPresentInCandidatesPriority() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/candidatesPriority"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -317,6 +321,7 @@ public class ResolveTestGenerated extends AbstractResolveTest { @TestMetadata("compiler/testData/resolve/delegatedProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractResolveTest { public void testAllFilesPresentInDelegatedProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/delegatedProperty"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -368,6 +373,7 @@ public class ResolveTestGenerated extends AbstractResolveTest { @TestMetadata("compiler/testData/resolve/imports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Imports extends AbstractResolveTest { public void testAllFilesPresentInImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/imports"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -449,6 +455,7 @@ public class ResolveTestGenerated extends AbstractResolveTest { @TestMetadata("compiler/testData/resolve/labels") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Labels extends AbstractResolveTest { public void testAllFilesPresentInLabels() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/labels"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -470,6 +477,7 @@ public class ResolveTestGenerated extends AbstractResolveTest { @TestMetadata("compiler/testData/resolve/regressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regressions extends AbstractResolveTest { public void testAllFilesPresentInRegressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/regressions"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -485,6 +493,7 @@ public class ResolveTestGenerated extends AbstractResolveTest { @TestMetadata("compiler/testData/resolve/varargs") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Varargs extends AbstractResolveTest { public void testAllFilesPresentInVarargs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolve/varargs"), Pattern.compile("^(.+)\\.resolve$"), true); @@ -510,15 +519,4 @@ public class ResolveTestGenerated extends AbstractResolveTest { } - public static Test suite() { - TestSuite suite = new TestSuite("ResolveTestGenerated"); - suite.addTestSuite(ResolveTestGenerated.class); - suite.addTestSuite(CandidatesPriority.class); - suite.addTestSuite(DelegatedProperty.class); - suite.addTestSuite(Imports.class); - suite.addTestSuite(Labels.class); - suite.addTestSuite(Regressions.class); - suite.addTestSuite(Varargs.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java index 77db7962f19..4833bf72e92 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve.annotation; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/resolveAnnotations/parameters") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({AnnotationParameterTestGenerated.Expressions.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class AnnotationParameterTestGenerated extends AbstractAnnotationParameterTest { public void testAllFilesPresentInParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -80,6 +83,7 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete @TestMetadata("compiler/testData/resolveAnnotations/parameters/expressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expressions extends AbstractAnnotationParameterTest { public void testAllFilesPresentInExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolveAnnotations/parameters/expressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -297,10 +301,4 @@ public class AnnotationParameterTestGenerated extends AbstractAnnotationParamete } - public static Test suite() { - TestSuite suite = new TestSuite("AnnotationParameterTestGenerated"); - suite.addTestSuite(AnnotationParameterTestGenerated.class); - suite.addTestSuite(Expressions.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java index f3673abfa34..566adf9be11 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve.calls; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/resolvedCalls") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ResolvedCallsTestGenerated.Arguments.class, ResolvedCallsTestGenerated.DifferentCallElements.class, ResolvedCallsTestGenerated.FunctionTypes.class, ResolvedCallsTestGenerated.Invoke.class, ResolvedCallsTestGenerated.ObjectsAndClassObjects.class, ResolvedCallsTestGenerated.RealExamples.class, ResolvedCallsTestGenerated.Resolve.class, ResolvedCallsTestGenerated.ThisOrSuper.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { public void testAllFilesPresentInResolvedCalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls"), Pattern.compile("^(.+)\\.kt$"), true); @@ -87,6 +90,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Arguments.FunctionLiterals.class, Arguments.GenericCalls.class, Arguments.NamedArguments.class, Arguments.OneArgument.class, Arguments.RealExamples.class, Arguments.SeveralCandidates.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Arguments extends AbstractResolvedCallsTest { public void testAllFilesPresentInArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -94,6 +98,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments/functionLiterals") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractResolvedCallsTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/functionLiterals"), Pattern.compile("^(.+)\\.kt$"), true); @@ -139,6 +144,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments/genericCalls") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericCalls extends AbstractResolvedCallsTest { public void testAllFilesPresentInGenericCalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/genericCalls"), Pattern.compile("^(.+)\\.kt$"), true); @@ -172,6 +178,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments/namedArguments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NamedArguments extends AbstractResolvedCallsTest { public void testAllFilesPresentInNamedArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/namedArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -193,6 +200,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments/oneArgument") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OneArgument extends AbstractResolvedCallsTest { public void testAllFilesPresentInOneArgument() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/oneArgument"), Pattern.compile("^(.+)\\.kt$"), true); @@ -226,6 +234,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments/realExamples") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RealExamples extends AbstractResolvedCallsTest { public void testAllFilesPresentInRealExamples() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/realExamples"), Pattern.compile("^(.+)\\.kt$"), true); @@ -247,6 +256,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/arguments/severalCandidates") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SeveralCandidates extends AbstractResolvedCallsTest { public void testAllFilesPresentInSeveralCandidates() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/arguments/severalCandidates"), Pattern.compile("^(.+)\\.kt$"), true); @@ -260,21 +270,11 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Arguments"); - suite.addTestSuite(Arguments.class); - suite.addTestSuite(FunctionLiterals.class); - suite.addTestSuite(GenericCalls.class); - suite.addTestSuite(NamedArguments.class); - suite.addTestSuite(OneArgument.class); - suite.addTestSuite(RealExamples.class); - suite.addTestSuite(SeveralCandidates.class); - return suite; - } } @TestMetadata("compiler/testData/resolvedCalls/differentCallElements") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DifferentCallElements extends AbstractResolvedCallsTest { public void testAllFilesPresentInDifferentCallElements() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/differentCallElements"), Pattern.compile("^(.+)\\.kt$"), true); @@ -302,6 +302,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/functionTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionTypes extends AbstractResolvedCallsTest { public void testAllFilesPresentInFunctionTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/functionTypes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -347,6 +348,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/invoke") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Invoke extends AbstractResolvedCallsTest { public void testAllFilesPresentInInvoke() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/invoke"), Pattern.compile("^(.+)\\.kt$"), true); @@ -416,6 +418,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/objectsAndClassObjects") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ObjectsAndClassObjects extends AbstractResolvedCallsTest { public void testAllFilesPresentInObjectsAndClassObjects() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/objectsAndClassObjects"), Pattern.compile("^(.+)\\.kt$"), true); @@ -443,6 +446,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/realExamples") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RealExamples extends AbstractResolvedCallsTest { public void testAllFilesPresentInRealExamples() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/realExamples"), Pattern.compile("^(.+)\\.kt$"), true); @@ -458,6 +462,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/resolve") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Resolve extends AbstractResolvedCallsTest { public void testAllFilesPresentInResolve() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/resolve"), Pattern.compile("^(.+)\\.kt$"), true); @@ -479,6 +484,7 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { @TestMetadata("compiler/testData/resolvedCalls/thisOrSuper") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ThisOrSuper extends AbstractResolvedCallsTest { public void testAllFilesPresentInThisOrSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/resolvedCalls/thisOrSuper"), Pattern.compile("^(.+)\\.kt$"), true); @@ -516,17 +522,4 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { } - public static Test suite() { - TestSuite suite = new TestSuite("ResolvedCallsTestGenerated"); - suite.addTestSuite(ResolvedCallsTestGenerated.class); - suite.addTest(Arguments.innerSuite()); - suite.addTestSuite(DifferentCallElements.class); - suite.addTestSuite(FunctionTypes.class); - suite.addTestSuite(Invoke.class); - suite.addTestSuite(ObjectsAndClassObjects.class); - suite.addTestSuite(RealExamples.class); - suite.addTestSuite(Resolve.class); - suite.addTestSuite(ThisOrSuper.class); - return suite; - } } diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java index cb3bd8a72c2..cb719c73301 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve.constraintSystem; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/constraintSystem") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ConstraintSystemTestGenerated.CheckStatus.class, ConstraintSystemTestGenerated.ComputeValues.class, ConstraintSystemTestGenerated.IntegerValueTypes.class, ConstraintSystemTestGenerated.SeveralVariables.class, ConstraintSystemTestGenerated.Variance.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest { public void testAllFilesPresentInConstraintSystem() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem"), Pattern.compile("^(.+)\\.bounds$"), true); @@ -38,6 +41,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @TestMetadata("compiler/testData/constraintSystem/checkStatus") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CheckStatus extends AbstractConstraintSystemTest { public void testAllFilesPresentInCheckStatus() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/checkStatus"), Pattern.compile("^(.+)\\.bounds$"), true); @@ -77,6 +81,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @TestMetadata("compiler/testData/constraintSystem/computeValues") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ComputeValues extends AbstractConstraintSystemTest { public void testAllFilesPresentInComputeValues() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/computeValues"), Pattern.compile("^(.+)\\.bounds$"), true); @@ -110,6 +115,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @TestMetadata("compiler/testData/constraintSystem/integerValueTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IntegerValueTypes extends AbstractConstraintSystemTest { public void testAllFilesPresentInIntegerValueTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/integerValueTypes"), Pattern.compile("^(.+)\\.bounds$"), true); @@ -167,6 +173,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @TestMetadata("compiler/testData/constraintSystem/severalVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SeveralVariables extends AbstractConstraintSystemTest { public void testAllFilesPresentInSeveralVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/severalVariables"), Pattern.compile("^(.+)\\.bounds$"), true); @@ -182,6 +189,7 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest @TestMetadata("compiler/testData/constraintSystem/variance") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Variance extends AbstractConstraintSystemTest { public void testAllFilesPresentInVariance() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/constraintSystem/variance"), Pattern.compile("^(.+)\\.bounds$"), true); @@ -207,14 +215,4 @@ public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest } - public static Test suite() { - TestSuite suite = new TestSuite("ConstraintSystemTestGenerated"); - suite.addTestSuite(ConstraintSystemTestGenerated.class); - suite.addTestSuite(CheckStatus.class); - suite.addTestSuite(ComputeValues.class); - suite.addTestSuite(IntegerValueTypes.class); - suite.addTestSuite(SeveralVariables.class); - suite.addTestSuite(Variance.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java index 424d76320f7..33329d7c412 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.checkers; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/checker/js") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetJsCheckerTestGenerated extends AbstractJetJsCheckerTest { public void testAllFilesPresentInJs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/js"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java index c1df81681df..7abc7aa6785 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.checkers; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetPsiCheckerTestGenerated.Checker.class, JetPsiCheckerTestGenerated.Regression.class, JetPsiCheckerTestGenerated.Recovery.class, JetPsiCheckerTestGenerated.Rendering.class, JetPsiCheckerTestGenerated.DuplicateJvmSignature.class, JetPsiCheckerTestGenerated.Infos.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Checker extends AbstractJetPsiCheckerTest { @TestMetadata("Abstract.kt") public void testAbstract() throws Exception { @@ -341,6 +345,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/regression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Regression extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInRegression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/regression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -494,6 +499,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/recovery") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Recovery extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInRecovery() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/recovery"), Pattern.compile("^(.+)\\.kt$"), true); @@ -515,6 +521,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/rendering") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Rendering extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInRendering() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/rendering"), Pattern.compile("^(.+)\\.kt$"), true); @@ -531,6 +538,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DuplicateJvmSignature.Fields.class, DuplicateJvmSignature.FunctionAndProperty.class, DuplicateJvmSignature.TraitImpl.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature"), Pattern.compile("^(.+)\\.kt$"), true); @@ -538,6 +546,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature/fields") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Fields extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInFields() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/fields"), Pattern.compile("^(.+)\\.kt$"), true); @@ -553,6 +562,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature/functionAndProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionAndProperty extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInFunctionAndProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/functionAndProperty"), Pattern.compile("^(.+)\\.kt$"), true); @@ -610,6 +620,7 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature/traitImpl") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TraitImpl extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInTraitImpl() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), true); @@ -623,18 +634,11 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DuplicateJvmSignature"); - suite.addTestSuite(DuplicateJvmSignature.class); - suite.addTestSuite(Fields.class); - suite.addTestSuite(FunctionAndProperty.class); - suite.addTestSuite(TraitImpl.class); - return suite; - } } @TestMetadata("idea/testData/checker/infos") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Infos extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInInfos() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/infos"), Pattern.compile("^(.+)\\.kt$"), true); @@ -678,14 +682,4 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { } - public static Test suite() { - TestSuite suite = new TestSuite("JetPsiCheckerTestGenerated"); - suite.addTestSuite(Checker.class); - suite.addTestSuite(Regression.class); - suite.addTestSuite(Recovery.class); - suite.addTestSuite(Rendering.class); - suite.addTest(DuplicateJvmSignature.innerSuite()); - suite.addTestSuite(Infos.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java index 2beeaab7ba1..799b6959460 100644 --- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/completion/injava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest { public void testAllFilesPresentInInjava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true); @@ -102,9 +105,4 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile doTest(fileName); } - public static Test suite() { - TestSuite suite = new TestSuite("CompiledKotlinInJavaCompletionTestGenerated"); - suite.addTestSuite(CompiledKotlinInJavaCompletionTestGenerated.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java index b71102ca90b..a8adb09c5f2 100644 --- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/dataFlowValueRendering") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class DataFlowValueRenderingTestGenerated extends AbstractDataFlowValueRenderingTest { public void testAllFilesPresentInDataFlowValueRendering() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/dataFlowValueRendering"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java index f28926efeda..922aca61652 100644 --- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JSBasicCompletionTestGenerated.Common.class, JSBasicCompletionTestGenerated.Js.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTest { @TestMetadata("idea/testData/completion/basic/common") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Common.Extensions.class, Common.NamedParameters.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Common extends AbstractJSBasicCompletionTest { @TestMetadata("AfterFloatOnNewLine.kt") public void testAfterFloatOnNewLine() throws Exception { @@ -544,6 +548,7 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @TestMetadata("idea/testData/completion/basic/common/extensions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Extensions extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInExtensions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -607,6 +612,7 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes @TestMetadata("idea/testData/completion/basic/common/namedParameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NamedParameters extends AbstractJSBasicCompletionTest { @TestMetadata("AfterBrace.kt") public void testAfterBrace() throws Exception { @@ -692,17 +698,11 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Common"); - suite.addTestSuite(Common.class); - suite.addTestSuite(Extensions.class); - suite.addTestSuite(NamedParameters.class); - return suite; - } } @TestMetadata("idea/testData/completion/basic/js") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Js extends AbstractJSBasicCompletionTest { public void testAllFilesPresentInJs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/js"), Pattern.compile("^(.+)\\.kt$"), true); @@ -728,10 +728,4 @@ public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTes } - public static Test suite() { - TestSuite suite = new TestSuite("JSBasicCompletionTestGenerated"); - suite.addTest(Common.innerSuite()); - suite.addTestSuite(Js.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java index 60fecd5c2c1..71771926e03 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JvmBasicCompletionTestGenerated.Common.class, JvmBasicCompletionTestGenerated.Java.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionTest { @TestMetadata("idea/testData/completion/basic/common") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Common.Extensions.class, Common.NamedParameters.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Common extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterFloatOnNewLine.kt") public void testAfterFloatOnNewLine() throws Exception { @@ -544,6 +548,7 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @TestMetadata("idea/testData/completion/basic/common/extensions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Extensions extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInExtensions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/common/extensions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -607,6 +612,7 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT @TestMetadata("idea/testData/completion/basic/common/namedParameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NamedParameters extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterBrace.kt") public void testAfterBrace() throws Exception { @@ -692,17 +698,11 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Common"); - suite.addTestSuite(Common.class); - suite.addTestSuite(Extensions.class); - suite.addTestSuite(NamedParameters.class); - return suite; - } } @TestMetadata("idea/testData/completion/basic/java") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Java extends AbstractJvmBasicCompletionTest { public void testAllFilesPresentInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/java"), Pattern.compile("^(.+)\\.kt$"), true); @@ -764,10 +764,4 @@ public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionT } - public static Test suite() { - TestSuite suite = new TestSuite("JvmBasicCompletionTestGenerated"); - suite.addTest(Common.innerSuite()); - suite.addTestSuite(Java.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java index a630cef9c16..9ee51535017 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/smart") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest { @TestMetadata("AfterAs.kt") public void testAfterAs() throws Exception { diff --git a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java index 70449d0edd3..ceb4c25d257 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/basic/custom") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JvmWithLibBasicCompletionTestGenerated extends AbstractJvmWithLibBasicCompletionTest { public void testAllFilesPresentInCustom() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/custom"), Pattern.compile("^(.+)\\.kt$"), false); diff --git a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java index 5d9669ed742..503598bce6f 100644 --- a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/keywords") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KeywordCompletionTestGenerated extends AbstractKeywordCompletionTest { @TestMetadata("AfterClassProperty.kt") public void testAfterClassProperty() throws Exception { diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java index fba45058500..b1fca79a09d 100644 --- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/completion/injava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest { public void testAllFilesPresentInInjava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/injava"), Pattern.compile("^(.+)\\.java$"), true); @@ -102,9 +105,4 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou doTest(fileName); } - public static Test suite() { - TestSuite suite = new TestSuite("KotlinSourceInJavaCompletionTestGenerated"); - suite.addTestSuite(KotlinSourceInJavaCompletionTestGenerated.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java index 384f7edd6d4..a13b2a52b83 100644 --- a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/basic/multifile") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class MultiFileJvmBasicCompletionTestGenerated extends AbstractMultiFileJvmBasicCompletionTest { public void testAllFilesPresentInMultifile() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/multifile"), Pattern.compile("^([^\\.]+)$"), false); diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java index f4f1b9ee2f6..c9c239fd594 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion.handlers; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/handlers/smart") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletionHandlerTest { @TestMetadata("AfterAs.kt") public void testAfterAs() throws Exception { diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java index 138eb8b62f0..078f2487528 100644 --- a/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/weighers/CompletionWeigherTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.completion.weighers; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/weighers") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CompletionWeigherTestGenerated extends AbstractCompletionWeigherTest { public void testAllFilesPresentInWeighers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/weighers"), Pattern.compile("^([^\\.]+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java index 85d29224d65..8f7e342fd52 100644 --- a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.editor.quickDoc; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/editor/quickDoc") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetQuickDocProviderTestGenerated extends AbstractJetQuickDocProviderTest { public void testAllFilesPresentInQuickDoc() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/quickDoc"), Pattern.compile("^([^_]+)\\.[^\\.]*$"), true); diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java index d37f177fd77..f33111494b6 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.findUsages; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetFindUsagesTestGenerated.Kotlin.class, JetFindUsagesTestGenerated.Java.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Kotlin.Conventions.class, Kotlin.FindClassUsages.class, Kotlin.FindFunctionUsages.class, Kotlin.FindObjectUsages.class, Kotlin.FindPackageUsages.class, Kotlin.FindParameterUsages.class, Kotlin.FindPropertyUsages.class, Kotlin.FindTypeParameterUsages.class, Kotlin.FindWithFilteringImports.class, Kotlin.FindWithStructuralGrouping.class, Kotlin.UnresolvedAnnotation.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Kotlin extends AbstractJetFindUsagesTest { public void testAllFilesPresentInKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -40,6 +44,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/conventions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Conventions extends AbstractJetFindUsagesTest { public void testAllFilesPresentInConventions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/conventions"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -133,6 +138,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findClassUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindClassUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindClassUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findClassUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -430,6 +436,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findFunctionUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindFunctionUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindFunctionUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findFunctionUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -511,6 +518,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findObjectUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindObjectUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindObjectUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findObjectUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -556,6 +564,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findPackageUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindPackageUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindPackageUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPackageUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -571,6 +580,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findParameterUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindParameterUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindParameterUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -592,6 +602,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findPropertyUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindPropertyUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindPropertyUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findPropertyUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -721,6 +732,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findTypeParameterUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindTypeParameterUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindTypeParameterUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findTypeParameterUsages"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -742,6 +754,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findWithFilteringImports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindWithFilteringImports extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindWithFilteringImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithFilteringImports"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -757,6 +770,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/findWithStructuralGrouping") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindWithStructuralGrouping extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindWithStructuralGrouping() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/findWithStructuralGrouping"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -784,6 +798,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin/unresolvedAnnotation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnresolvedAnnotation extends AbstractJetFindUsagesTest { public void testAllFilesPresentInUnresolvedAnnotation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/kotlin/unresolvedAnnotation"), Pattern.compile("^(.+)\\.0\\.kt$"), true); @@ -797,27 +812,12 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Kotlin"); - suite.addTestSuite(Kotlin.class); - suite.addTestSuite(Conventions.class); - suite.addTestSuite(FindClassUsages.class); - suite.addTestSuite(FindFunctionUsages.class); - suite.addTestSuite(FindObjectUsages.class); - suite.addTestSuite(FindPackageUsages.class); - suite.addTestSuite(FindParameterUsages.class); - suite.addTestSuite(FindPropertyUsages.class); - suite.addTestSuite(FindTypeParameterUsages.class); - suite.addTestSuite(FindWithFilteringImports.class); - suite.addTestSuite(FindWithStructuralGrouping.class); - suite.addTestSuite(UnresolvedAnnotation.class); - return suite; - } } @TestMetadata("idea/testData/findUsages/java") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Java.FindJavaClassUsages.class, Java.FindJavaFieldUsages.class, Java.FindJavaMethodUsages.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Java extends AbstractJetFindUsagesTest { public void testAllFilesPresentInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java"), Pattern.compile("^(.+)\\.0\\.java$"), true); @@ -825,6 +825,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaClassUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindJavaClassUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindJavaClassUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaClassUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); @@ -966,6 +967,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaFieldUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindJavaFieldUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindJavaFieldUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaFieldUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); @@ -981,6 +983,7 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java/findJavaMethodUsages") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FindJavaMethodUsages extends AbstractJetFindUsagesTest { public void testAllFilesPresentInFindJavaMethodUsages() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/java/findJavaMethodUsages"), Pattern.compile("^(.+)\\.0\\.java$"), true); @@ -1000,20 +1003,6 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Java"); - suite.addTestSuite(Java.class); - suite.addTestSuite(FindJavaClassUsages.class); - suite.addTestSuite(FindJavaFieldUsages.class); - suite.addTestSuite(FindJavaMethodUsages.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("JetFindUsagesTestGenerated"); - suite.addTest(Kotlin.innerSuite()); - suite.addTest(Java.innerSuite()); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java index 2b69fba19a2..cd76e5150bd 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.formatter; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetFormatterTestGenerated.Formatter.class, JetFormatterTestGenerated.FormatterInverted.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Formatter.ModifierList.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Formatter extends AbstractJetFormatterTest { public void testAllFilesPresentInFormatter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); @@ -442,6 +446,7 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter/modifierList") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ModifierList extends AbstractJetFormatterTest { public void testAllFilesPresentInModifierList() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter/modifierList"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); @@ -545,17 +550,12 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Formatter"); - suite.addTestSuite(Formatter.class); - suite.addTestSuite(ModifierList.class); - return suite; - } } @TestMetadata("idea/testData/formatter") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FormatterInverted extends AbstractJetFormatterTest { public void testAllFilesPresentInFormatterInverted() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/formatter"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), true); @@ -747,17 +747,6 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { doTestInverted(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FormatterInverted"); - suite.addTestSuite(FormatterInverted.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("JetFormatterTestGenerated"); - suite.addTest(Formatter.innerSuite()); - suite.addTest(FormatterInverted.innerSuite()); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java index 09ae63f2b65..f1cd37b957f 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.formatter; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetTypingIndentationTestBaseGenerated.DirectSettings.class, JetTypingIndentationTestBaseGenerated.InvertedSettings.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingIndentationTestBase { @TestMetadata("idea/testData/indentationOnNewline") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DirectSettings.Script.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DirectSettings extends AbstractJetTypingIndentationTestBase { @TestMetadata("AfterCatch.after.kt") public void testAfterCatch() throws Exception { @@ -298,6 +302,7 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde @TestMetadata("idea/testData/indentationOnNewline/script") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Script extends AbstractJetTypingIndentationTestBase { public void testAllFilesPresentInScript() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline/script"), Pattern.compile("^([^\\.]+)\\.after\\.kt.*$"), true); @@ -329,17 +334,12 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DirectSettings"); - suite.addTestSuite(DirectSettings.class); - suite.addTestSuite(Script.class); - return suite; - } } @TestMetadata("idea/testData/indentationOnNewline") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InvertedSettings extends AbstractJetTypingIndentationTestBase { public void testAllFilesPresentInInvertedSettings() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/indentationOnNewline"), Pattern.compile("^([^\\.]+)\\.after\\.inv\\.kt.*$"), true); @@ -435,17 +435,6 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde doNewlineTestWithInvert(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("InvertedSettings"); - suite.addTestSuite(InvertedSettings.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("JetTypingIndentationTestBaseGenerated"); - suite.addTest(DirectSettings.innerSuite()); - suite.addTest(InvertedSettings.innerSuite()); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java b/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java index 7af23f94ac5..0d1a7cb9afb 100644 --- a/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/lang/resolve/java/JavaTypeSubstitutorTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.lang.resolve.java; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/typeSubstitution") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JavaTypeSubstitutorTestGenerated extends AbstractJavaTypeSubstitutorTest { public void testAllFilesPresentInTypeSubstitution() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/typeSubstitution"), Pattern.compile("^(.+)\\.java$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java index ea02591e9b1..6b62ac16efc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/expressionSelection") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ExpressionSelectionTestGenerated extends AbstractExpressionSelectionTest { public void testAllFilesPresentInExpressionSelection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/expressionSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java index b46ffc2a2c5..2981612b85b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/smartSelection") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class SmartSelectionTestGenerated extends AbstractSmartSelectionTest { public void testAllFilesPresentInSmartSelection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/smartSelection"), Pattern.compile("^([^\\.]+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java index 80469da04b4..79ef412d8df 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({InsertImportOnPasteTestGenerated.Copy.class, InsertImportOnPasteTestGenerated.Cut.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPasteTest { @TestMetadata("idea/testData/copyPaste/imports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Copy extends AbstractInsertImportOnPasteTest { public void testAllFilesPresentInCopy() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false); @@ -371,6 +375,7 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast @TestMetadata("idea/testData/copyPaste/imports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Cut extends AbstractInsertImportOnPasteTest { public void testAllFilesPresentInCut() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), false); @@ -708,10 +713,4 @@ public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPast } - public static Test suite() { - TestSuite suite = new TestSuite("InsertImportOnPasteTestGenerated"); - suite.addTestSuite(Copy.class); - suite.addTestSuite(Cut.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java index 51468ad7f88..5e20e954ca7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/intentions") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetInspectionTestGenerated extends AbstractJetInspectionTest { public void testAllFilesPresentInIntentions() throws Exception { JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(inspections\\.test)$")); diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java index 1008e7505ea..11058b49e66 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/codeInsight/outOfBlock") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class OutOfBlockModificationTestGenerated extends AbstractOutOfBlockModificationTest { public void testAllFilesPresentInOutOfBlock() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/outOfBlock"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java index d4c45ee79ca..727bd5a0773 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.moveUpDown; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({CodeMoverTestGenerated.ClassBodyDeclarations.class, CodeMoverTestGenerated.ClosingBraces.class, CodeMoverTestGenerated.Expressions.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ClassBodyDeclarations.Accessors.class, ClassBodyDeclarations.Class.class, ClassBodyDeclarations.ClassInitializer.class, ClassBodyDeclarations.Enums.class, ClassBodyDeclarations.Function.class, ClassBodyDeclarations.FunctionAnchors.class, ClassBodyDeclarations.Property.class, ClassBodyDeclarations.PropertyAnchors.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassBodyDeclarations extends AbstractCodeMoverTest { public void testAllFilesPresentInClassBodyDeclarations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -40,6 +44,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/accessors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Accessors extends AbstractCodeMoverTest { @TestMetadata("accessor1.kt") public void testAccessor1() throws Exception { @@ -73,6 +78,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractCodeMoverTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -202,6 +208,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassInitializer extends AbstractCodeMoverTest { public void testAllFilesPresentInClassInitializer() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/classInitializer"), Pattern.compile("^(.+)\\.kt$"), true); @@ -283,6 +290,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enums extends AbstractCodeMoverTest { public void testAllFilesPresentInEnums() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/enums"), Pattern.compile("^(.+)\\.kt$"), true); @@ -328,6 +336,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractCodeMoverTest { public void testAllFilesPresentInFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/function"), Pattern.compile("^(.+)\\.kt$"), true); @@ -433,6 +442,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionAnchors extends AbstractCodeMoverTest { public void testAllFilesPresentInFunctionAnchors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/functionAnchors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -550,6 +560,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractCodeMoverTest { public void testAllFilesPresentInProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/property"), Pattern.compile("^(.+)\\.kt$"), true); @@ -655,6 +666,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertyAnchors extends AbstractCodeMoverTest { public void testAllFilesPresentInPropertyAnchors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/classBodyDeclarations/propertyAnchors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -680,24 +692,12 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ClassBodyDeclarations"); - suite.addTestSuite(ClassBodyDeclarations.class); - suite.addTestSuite(Accessors.class); - suite.addTestSuite(Class.class); - suite.addTestSuite(ClassInitializer.class); - suite.addTestSuite(Enums.class); - suite.addTestSuite(Function.class); - suite.addTestSuite(FunctionAnchors.class); - suite.addTestSuite(Property.class); - suite.addTestSuite(PropertyAnchors.class); - return suite; - } } @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ClosingBraces.For.class, ClosingBraces.Function.class, ClosingBraces.If.class, ClosingBraces.Nested.class, ClosingBraces.When.class, ClosingBraces.While.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClosingBraces extends AbstractCodeMoverTest { public void testAllFilesPresentInClosingBraces() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces"), Pattern.compile("^(.+)\\.kt$"), true); @@ -705,6 +705,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/for") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class For extends AbstractCodeMoverTest { public void testAllFilesPresentInFor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/for"), Pattern.compile("^(.+)\\.kt$"), true); @@ -726,6 +727,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/function") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractCodeMoverTest { public void testAllFilesPresentInFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/function"), Pattern.compile("^(.+)\\.kt$"), true); @@ -759,6 +761,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/if") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class If extends AbstractCodeMoverTest { public void testAllFilesPresentInIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/if"), Pattern.compile("^(.+)\\.kt$"), true); @@ -792,6 +795,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/nested") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Nested extends AbstractCodeMoverTest { public void testAllFilesPresentInNested() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/nested"), Pattern.compile("^(.+)\\.kt$"), true); @@ -813,6 +817,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractCodeMoverTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -858,6 +863,7 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces/while") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class While extends AbstractCodeMoverTest { public void testAllFilesPresentInWhile() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/closingBraces/while"), Pattern.compile("^(.+)\\.kt$"), true); @@ -889,21 +895,11 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ClosingBraces"); - suite.addTestSuite(ClosingBraces.class); - suite.addTestSuite(For.class); - suite.addTestSuite(Function.class); - suite.addTestSuite(If.class); - suite.addTestSuite(Nested.class); - suite.addTestSuite(When.class); - suite.addTestSuite(While.class); - return suite; - } } @TestMetadata("idea/testData/codeInsight/moveUpDown/expressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expressions extends AbstractCodeMoverTest { public void testAllFilesPresentInExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/moveUpDown/expressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1313,11 +1309,4 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { } - public static Test suite() { - TestSuite suite = new TestSuite("CodeMoverTestGenerated"); - suite.addTest(ClassBodyDeclarations.innerSuite()); - suite.addTest(ClosingBraces.innerSuite()); - suite.addTestSuite(Expressions.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java index fb4a4c3c252..2f046a4845c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.surroundWith; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({SurroundWithTestGenerated.If.class, SurroundWithTestGenerated.IfElse.class, SurroundWithTestGenerated.Not.class, SurroundWithTestGenerated.Parentheses.class, SurroundWithTestGenerated.StringTemplate.class, SurroundWithTestGenerated.When.class, SurroundWithTestGenerated.TryCatch.class, SurroundWithTestGenerated.TryCatchFinally.class, SurroundWithTestGenerated.TryFinally.class, SurroundWithTestGenerated.FunctionLiteral.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({If.MoveDeclarationsOut.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class If extends AbstractSurroundWithTest { public void testAllFilesPresentInIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if"), Pattern.compile("^(.+)\\.kt$"), true); @@ -71,6 +75,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({MoveDeclarationsOut.Class.class, MoveDeclarationsOut.Function.class, MoveDeclarationsOut.Object.class, MoveDeclarationsOut.Order.class, MoveDeclarationsOut.Val.class, MoveDeclarationsOut.Var.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MoveDeclarationsOut extends AbstractSurroundWithTest { public void testAllFilesPresentInMoveDeclarationsOut() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut"), Pattern.compile("^(.+)\\.kt$"), true); @@ -78,6 +83,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractSurroundWithTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -99,6 +105,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractSurroundWithTest { public void testAllFilesPresentInFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/function"), Pattern.compile("^(.+)\\.kt$"), true); @@ -126,6 +133,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Object extends AbstractSurroundWithTest { public void testAllFilesPresentInObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/object"), Pattern.compile("^(.+)\\.kt$"), true); @@ -141,6 +149,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Order extends AbstractSurroundWithTest { public void testAllFilesPresentInOrder() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/order"), Pattern.compile("^(.+)\\.kt$"), true); @@ -168,6 +177,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Val extends AbstractSurroundWithTest { public void testAllFilesPresentInVal() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/val"), Pattern.compile("^(.+)\\.kt$"), true); @@ -208,6 +218,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Var.DefaultValue.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Var extends AbstractSurroundWithTest { public void testAllFilesPresentInVar() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var"), Pattern.compile("^(.+)\\.kt$"), true); @@ -233,6 +244,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultValue extends AbstractSurroundWithTest { public void testAllFilesPresentInDefaultValue() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var/defaultValue"), Pattern.compile("^(.+)\\.kt$"), true); @@ -258,37 +270,15 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Var"); - suite.addTestSuite(Var.class); - suite.addTestSuite(DefaultValue.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("MoveDeclarationsOut"); - suite.addTestSuite(MoveDeclarationsOut.class); - suite.addTestSuite(Class.class); - suite.addTestSuite(Function.class); - suite.addTestSuite(Object.class); - suite.addTestSuite(Order.class); - suite.addTestSuite(Val.class); - suite.addTest(Var.innerSuite()); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("If"); - suite.addTestSuite(If.class); - suite.addTest(MoveDeclarationsOut.innerSuite()); - return suite; - } } @TestMetadata("idea/testData/codeInsight/surroundWith/ifElse") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfElse extends AbstractSurroundWithTest { public void testAllFilesPresentInIfElse() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/ifElse"), Pattern.compile("^(.+)\\.kt$"), true); @@ -340,6 +330,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/not") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Not extends AbstractSurroundWithTest { public void testAllFilesPresentInNot() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/not"), Pattern.compile("^(.+)\\.kt$"), true); @@ -392,6 +383,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Parentheses.NotApplicable.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parentheses extends AbstractSurroundWithTest { public void testAllFilesPresentInParentheses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -417,6 +409,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses/notApplicable") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NotApplicable extends AbstractSurroundWithTest { public void testAllFilesPresentInNotApplicable() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/parentheses/notApplicable"), Pattern.compile("^(.+)\\.kt$"), true); @@ -478,16 +471,11 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Parentheses"); - suite.addTestSuite(Parentheses.class); - suite.addTestSuite(NotApplicable.class); - return suite; - } } @TestMetadata("idea/testData/codeInsight/surroundWith/stringTemplate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StringTemplate extends AbstractSurroundWithTest { public void testAllFilesPresentInStringTemplate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/stringTemplate"), Pattern.compile("^(.+)\\.kt$"), true); @@ -521,6 +509,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractSurroundWithTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -548,6 +537,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatch") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryCatch extends AbstractSurroundWithTest { public void testAllFilesPresentInTryCatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatch"), Pattern.compile("^(.+)\\.kt$"), true); @@ -575,6 +565,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/tryCatchFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryCatchFinally extends AbstractSurroundWithTest { public void testAllFilesPresentInTryCatchFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryCatchFinally"), Pattern.compile("^(.+)\\.kt$"), true); @@ -596,6 +587,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/tryFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractSurroundWithTest { public void testAllFilesPresentInTryFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/tryFinally"), Pattern.compile("^(.+)\\.kt$"), true); @@ -617,6 +609,7 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/functionLiteral") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FunctionLiteral extends AbstractSurroundWithTest { public void testAllFilesPresentInFunctionLiteral() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/surroundWith/functionLiteral"), Pattern.compile("^(.+)\\.kt$"), true); @@ -642,18 +635,4 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { } - public static Test suite() { - TestSuite suite = new TestSuite("SurroundWithTestGenerated"); - suite.addTest(If.innerSuite()); - suite.addTestSuite(IfElse.class); - suite.addTestSuite(Not.class); - suite.addTest(Parentheses.innerSuite()); - suite.addTestSuite(StringTemplate.class); - suite.addTestSuite(When.class); - suite.addTestSuite(TryCatch.class); - suite.addTestSuite(TryCatchFinally.class); - suite.addTestSuite(TryFinally.class); - suite.addTestSuite(FunctionLiteral.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java index 7457af66ac9..16ce2cdb48d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.codeInsight.unwrap; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({UnwrapRemoveTestGenerated.RemoveExpression.class, UnwrapRemoveTestGenerated.UnwrapThen.class, UnwrapRemoveTestGenerated.UnwrapElse.class, UnwrapRemoveTestGenerated.RemoveElse.class, UnwrapRemoveTestGenerated.UnwrapLoop.class, UnwrapRemoveTestGenerated.UnwrapTry.class, UnwrapRemoveTestGenerated.UnwrapCatch.class, UnwrapRemoveTestGenerated.RemoveCatch.class, UnwrapRemoveTestGenerated.UnwrapFinally.class, UnwrapRemoveTestGenerated.RemoveFinally.class, UnwrapRemoveTestGenerated.UnwrapLambda.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveExpression extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeExpression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -71,6 +75,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapThen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapThen extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapThen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapThen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -98,6 +103,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapElse") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapElse extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapElse() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapElse"), Pattern.compile("^(.+)\\.kt$"), true); @@ -125,6 +131,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeElse") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveElse extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveElse() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeElse"), Pattern.compile("^(.+)\\.kt$"), true); @@ -140,6 +147,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapLoop extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapLoop() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLoop"), Pattern.compile("^(.+)\\.kt$"), true); @@ -167,6 +175,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapTry") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapTry extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapTry() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapTry"), Pattern.compile("^(.+)\\.kt$"), true); @@ -194,6 +203,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapCatch extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapCatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapCatch"), Pattern.compile("^(.+)\\.kt$"), true); @@ -221,6 +231,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeCatch") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveCatch extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveCatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeCatch"), Pattern.compile("^(.+)\\.kt$"), true); @@ -236,6 +247,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapFinally extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapFinally"), Pattern.compile("^(.+)\\.kt$"), true); @@ -263,6 +275,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeFinally") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveFinally extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInRemoveFinally() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/removeFinally"), Pattern.compile("^(.+)\\.kt$"), true); @@ -284,6 +297,7 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnwrapLambda extends AbstractUnwrapRemoveTest { public void testAllFilesPresentInUnwrapLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/codeInsight/unwrapAndRemove/unwrapLambda"), Pattern.compile("^(.+)\\.kt$"), true); @@ -351,19 +365,4 @@ public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { } - public static Test suite() { - TestSuite suite = new TestSuite("UnwrapRemoveTestGenerated"); - suite.addTestSuite(RemoveExpression.class); - suite.addTestSuite(UnwrapThen.class); - suite.addTestSuite(UnwrapElse.class); - suite.addTestSuite(RemoveElse.class); - suite.addTestSuite(UnwrapLoop.class); - suite.addTestSuite(UnwrapTry.class); - suite.addTestSuite(UnwrapCatch.class); - suite.addTestSuite(RemoveCatch.class); - suite.addTestSuite(UnwrapFinally.class); - suite.addTestSuite(RemoveFinally.class); - suite.addTestSuite(UnwrapLambda.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java index 175485bf230..3c9aba1ace6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.configuration; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({ConfigureProjectByChangingFileTestGenerated.Android_gradle.class, ConfigureProjectByChangingFileTestGenerated.Gradle.class, ConfigureProjectByChangingFileTestGenerated.Maven.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigureProjectByChangingFileTest { @TestMetadata("idea/testData/configuration/android-gradle") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Android_gradle.GradleExamples.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInAndroid_gradle() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); @@ -106,6 +110,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @TestMetadata("idea/testData/configuration/android-gradle/gradleExamples") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GradleExamples extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInGradleExamples() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/android-gradle/gradleExamples"), Pattern.compile("(\\w+)_before\\.gradle$"), true); @@ -167,16 +172,11 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Android_gradle"); - suite.addTestSuite(Android_gradle.class); - suite.addTestSuite(GradleExamples.class); - return suite; - } } @TestMetadata("idea/testData/configuration/gradle") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Gradle extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInGradle() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/gradle"), Pattern.compile("(\\w+)_before\\.gradle$"), true); @@ -198,6 +198,7 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu @TestMetadata("idea/testData/configuration/maven") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Maven extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInMaven() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/configuration/maven"), Pattern.compile("^([^\\.]+)$"), false); @@ -229,11 +230,4 @@ public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigu } - public static Test suite() { - TestSuite suite = new TestSuite("ConfigureProjectByChangingFileTestGenerated"); - suite.addTest(Android_gradle.innerSuite()); - suite.addTestSuite(Gradle.class); - suite.addTestSuite(Maven.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java index 57f9048dd9b..d159979cd87 100644 --- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.conversion.copy; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/copyPaste/conversion") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JavaToKotlinCopyPasteConversionTestGenerated extends AbstractJavaToKotlinCopyPasteConversionTest { public void testAllFilesPresentInConversion() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/copyPaste/conversion"), Pattern.compile("^(.+)\\.java$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java index 7eac75e35ac..f528036491a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({KotlinSteppingTestGenerated.StepInto.class, KotlinSteppingTestGenerated.SmartStepInto.class, KotlinSteppingTestGenerated.Filters.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StepInto extends AbstractKotlinSteppingTest { public void testAllFilesPresentInStepInto() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true); @@ -119,6 +123,7 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SmartStepInto extends AbstractKotlinSteppingTest { public void testAllFilesPresentInSmartStepInto() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/stepInto"), Pattern.compile("^(.+)\\.kt$"), true); @@ -206,6 +211,7 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @TestMetadata("idea/testData/debugger/tinyApp/src/filters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Filters extends AbstractKotlinSteppingTest { public void testAllFilesPresentInFilters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/filters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -273,11 +279,4 @@ public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { } - public static Test suite() { - TestSuite suite = new TestSuite("KotlinSteppingTestGenerated"); - suite.addTestSuite(StepInto.class); - suite.addTestSuite(SmartStepInto.class); - suite.addTestSuite(Filters.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java index 03cff5fdf0f..202be8559fc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/debugger/smartStepInto") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class SmartStepIntoTestGenerated extends AbstractSmartStepIntoTest { public void testAllFilesPresentInSmartStepInto() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/smartStepInto"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java index 09f1427d233..e5a392a15b4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/basic/codeFragments") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest { public void testAllFilesPresentInCodeFragments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/completion/basic/codeFragments"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java index cb6c28723d5..d7cd5783253 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({CodeFragmentHighlightingTestGenerated.CodeFragments.class, CodeFragmentHighlightingTestGenerated.Imports.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentHighlightingTest { @TestMetadata("idea/testData/checker/codeFragments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CodeFragments extends AbstractCodeFragmentHighlightingTest { public void testAllFilesPresentInCodeFragments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments"), Pattern.compile("^(.+)\\.kt$"), false); @@ -101,6 +105,7 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH @TestMetadata("idea/testData/checker/codeFragments/imports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Imports extends AbstractCodeFragmentHighlightingTest { public void testAllFilesPresentInImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/checker/codeFragments/imports"), Pattern.compile("^(.+)\\.kt$"), true); @@ -114,10 +119,4 @@ public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentH } - public static Test suite() { - TestSuite suite = new TestSuite("CodeFragmentHighlightingTestGenerated"); - suite.addTestSuite(CodeFragments.class); - suite.addTestSuite(Imports.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java index cdafd4cf4c0..2abc9322733 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class, KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluateExpressionTest { @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({SingleBreakpoint.Frame.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest { @TestMetadata("abstractFunCall.kt") public void testAbstractFunCall() throws Exception { @@ -166,6 +170,7 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Frame extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInFrame() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/frame"), Pattern.compile("^(.+)\\.kt$"), true); @@ -257,17 +262,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat } - public static Test innerSuite() { - TestSuite suite = new TestSuite("SingleBreakpoint"); - suite.addTestSuite(SingleBreakpoint.class); - suite.addTestSuite(Frame.class); - return suite; - } } @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({MultipleBreakpoints.Library.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInMultipleBreakpoints() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints"), Pattern.compile("^(.+)\\.kt$"), true); @@ -311,6 +311,7 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Library extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/library"), Pattern.compile("^(.+)\\.kt$"), true); @@ -342,18 +343,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat } - public static Test innerSuite() { - TestSuite suite = new TestSuite("MultipleBreakpoints"); - suite.addTestSuite(MultipleBreakpoints.class); - suite.addTestSuite(Library.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("KotlinEvaluateExpressionTestGenerated"); - suite.addTest(SingleBreakpoint.innerSuite()); - suite.addTest(MultipleBreakpoints.innerSuite()); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java index 4998002e8c5..8d65c52fe14 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/debugger/selectExpression") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpressionForDebuggerTest { public void testAllFilesPresentInSelectExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/debugger/selectExpression"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java index 53bbf29338e..45ea52bb3e0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.folding; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({KotlinFoldingTestGenerated.NoCollapse.class, KotlinFoldingTestGenerated.CheckCollapse.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { @TestMetadata("idea/testData/folding/noCollapse") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NoCollapse extends AbstractKotlinFoldingTest { public void testAllFilesPresentInNoCollapse() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/noCollapse"), Pattern.compile("^(.+)\\.kt$"), true); @@ -83,6 +87,7 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { @TestMetadata("idea/testData/folding/checkCollapse") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CheckCollapse extends AbstractKotlinFoldingTest { public void testAllFilesPresentInCheckCollapse() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/folding/checkCollapse"), Pattern.compile("^(.+)\\.kt$"), true); @@ -108,10 +113,4 @@ public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { } - public static Test suite() { - TestSuite suite = new TestSuite("KotlinFoldingTestGenerated"); - suite.addTestSuite(NoCollapse.class); - suite.addTestSuite(CheckCollapse.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java index f55e1c73cff..c34e9e9d4f7 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.hierarchy; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({HierarchyTestGenerated.Type.class, HierarchyTestGenerated.Super.class, HierarchyTestGenerated.Sub.class, HierarchyTestGenerated.Callers.class, HierarchyTestGenerated.Callees.class, HierarchyTestGenerated.Overrides.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/type") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Type extends AbstractHierarchyTest { public void testAllFilesPresentInType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/type"), Pattern.compile("^([^\\.]+)$"), false); @@ -203,6 +207,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/super") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Super extends AbstractHierarchyTest { public void testAllFilesPresentInSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/super"), Pattern.compile("^([^\\.]+)$"), false); @@ -224,6 +229,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/sub") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Sub extends AbstractHierarchyTest { public void testAllFilesPresentInSub() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/class/sub"), Pattern.compile("^([^\\.]+)$"), false); @@ -281,6 +287,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/calls/callers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Callers extends AbstractHierarchyTest { public void testAllFilesPresentInCallers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callers"), Pattern.compile("^([^\\.]+)$"), false); @@ -374,6 +381,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/calls/callees") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Callees extends AbstractHierarchyTest { public void testAllFilesPresentInCallees() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/calls/callees"), Pattern.compile("^([^\\.]+)$"), false); @@ -467,6 +475,7 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/overrides") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Overrides extends AbstractHierarchyTest { public void testAllFilesPresentInOverrides() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/hierarchy/overrides"), Pattern.compile("^([^\\.]+)$"), false); @@ -510,14 +519,4 @@ public class HierarchyTestGenerated extends AbstractHierarchyTest { } - public static Test suite() { - TestSuite suite = new TestSuite("HierarchyTestGenerated"); - suite.addTestSuite(Type.class); - suite.addTestSuite(Super.class); - suite.addTestSuite(Sub.class); - suite.addTestSuite(Callers.class); - suite.addTestSuite(Callees.class); - suite.addTestSuite(Overrides.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java index d3c89173301..fbd261361a8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/diagnosticMessage") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTest { public void testAllFilesPresentInDiagnosticMessage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/diagnosticMessage"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java index eb65832b90d..eaf936f444f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/highlighter") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({HighlightingTestGenerated.Deprecated.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class HighlightingTestGenerated extends AbstractHighlightingTest { public void testAllFilesPresentInHighlighter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -80,6 +83,7 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest { @TestMetadata("idea/testData/highlighter/deprecated") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Deprecated extends AbstractHighlightingTest { public void testAllFilesPresentInDeprecated() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/highlighter/deprecated"), Pattern.compile("^(.+)\\.kt$"), true); @@ -171,10 +175,4 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest { } - public static Test suite() { - TestSuite suite = new TestSuite("HighlightingTestGenerated"); - suite.addTestSuite(HighlightingTestGenerated.class); - suite.addTestSuite(Deprecated.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java index 1c67b254d49..933960abb80 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.imports; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/editor/optimizeImports") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest { public void testAllFilesPresentInOptimizeImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/editor/optimizeImports"), Pattern.compile("^([^\\.]+)$"), false); diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java index 35839835f7c..15ffc3b45e5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.intentions; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/intentions") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IntentionTestGenerated.AddBraces.class, IntentionTestGenerated.AttributeCallReplacements.class, IntentionTestGenerated.Branched.class, IntentionTestGenerated.ConvertAssertToIf.class, IntentionTestGenerated.ConvertIfToAssert.class, IntentionTestGenerated.ConvertNegatedBooleanSequence.class, IntentionTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, IntentionTestGenerated.ConvertToBlockBody.class, IntentionTestGenerated.ConvertToConcatenatedStringIntention.class, IntentionTestGenerated.ConvertToExpressionBody.class, IntentionTestGenerated.ConvertToForEachFunctionCall.class, IntentionTestGenerated.ConvertToForEachLoop.class, IntentionTestGenerated.ConvertToStringTemplateIntention.class, IntentionTestGenerated.Declarations.class, IntentionTestGenerated.InsertCurlyBracesToTemplate.class, IntentionTestGenerated.InsertExplicitTypeArguments.class, IntentionTestGenerated.InvertIfCondition.class, IntentionTestGenerated.MakeTypeExplicitInLambda.class, IntentionTestGenerated.MakeTypeImplicitInLambda.class, IntentionTestGenerated.MoveLambdaInsideParentheses.class, IntentionTestGenerated.MoveLambdaOutsideParentheses.class, IntentionTestGenerated.OperatorToFunction.class, IntentionTestGenerated.ReconstructedType.class, IntentionTestGenerated.RemoveBraces.class, IntentionTestGenerated.RemoveCurlyBracesFromTemplate.class, IntentionTestGenerated.RemoveExplicitTypeArguments.class, IntentionTestGenerated.RemoveUnnecessaryParentheses.class, IntentionTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class, IntentionTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class, IntentionTestGenerated.ReplaceWithDotQualifiedMethodCall.class, IntentionTestGenerated.ReplaceWithInfixFunctionCall.class, IntentionTestGenerated.ReplaceWithOperatorAssign.class, IntentionTestGenerated.ReplaceWithTraditionalAssignment.class, IntentionTestGenerated.SimplifyBooleanWithConstants.class, IntentionTestGenerated.SimplifyNegatedBinaryExpressionIntention.class, IntentionTestGenerated.SpecifyType.class, IntentionTestGenerated.SplitIf.class, IntentionTestGenerated.SwapBinaryExpression.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class IntentionTestGenerated extends AbstractIntentionTest { public void testAllFilesPresentInIntentions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/addBraces") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AddBraces extends AbstractIntentionTest { @TestMetadata("addBracesForDoWhile.kt") public void testAddBracesForDoWhile() throws Exception { @@ -96,6 +100,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/attributeCallReplacements") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({AttributeCallReplacements.ReplaceBinaryInfixIntention.class, AttributeCallReplacements.ReplaceContainsIntention.class, AttributeCallReplacements.ReplaceGetIntention.class, AttributeCallReplacements.ReplaceInvokeIntention.class, AttributeCallReplacements.ReplaceUnaryPrefixIntention.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AttributeCallReplacements extends AbstractIntentionTest { public void testAllFilesPresentInAttributeCallReplacements() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/attributeCallReplacements"), Pattern.compile("^(.+)\\.kt$"), true); @@ -103,6 +108,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceBinaryInfixIntention") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceBinaryInfixIntention extends AbstractIntentionTest { @TestMetadata("acceptableVararg1.kt") public void testAcceptableVararg1() throws Exception { @@ -214,6 +220,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceContainsIntention") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceContainsIntention extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { @@ -332,6 +339,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceGetIntention extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { @@ -433,15 +441,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ReplaceGetIntention"); - suite.addTestSuite(ReplaceGetIntention.class); - return suite; - } } @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceInvokeIntention extends AbstractIntentionTest { public void testAllFilesPresentInReplaceInvokeIntention() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/attributeCallReplacements/replaceInvokeIntention"), Pattern.compile("^(.+)\\.kt$"), true); @@ -511,6 +515,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceUnaryPrefixIntention") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceUnaryPrefixIntention extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") public void testAcceptableVararg() throws Exception { @@ -596,21 +601,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("AttributeCallReplacements"); - suite.addTestSuite(AttributeCallReplacements.class); - suite.addTestSuite(ReplaceBinaryInfixIntention.class); - suite.addTestSuite(ReplaceContainsIntention.class); - suite.addTest(ReplaceGetIntention.innerSuite()); - suite.addTestSuite(ReplaceInvokeIntention.class); - suite.addTestSuite(ReplaceUnaryPrefixIntention.class); - return suite; - } } @TestMetadata("idea/testData/intentions/branched") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Branched.DoubleBangToIfThen.class, Branched.ElvisToIfThen.class, Branched.Folding.class, Branched.IfThenToDoubleBang.class, Branched.IfThenToElvis.class, Branched.IfThenToSafeAccess.class, Branched.IfWhen.class, Branched.SafeAccessToIfThen.class, Branched.Unfolding.class, Branched.When.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Branched extends AbstractIntentionTest { public void testAllFilesPresentInBranched() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched"), Pattern.compile("^(.+)\\.kt$"), true); @@ -618,6 +614,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/doubleBangToIfThen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DoubleBangToIfThen extends AbstractIntentionTest { public void testAllFilesPresentInDoubleBangToIfThen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/doubleBangToIfThen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -699,6 +696,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/elvisToIfThen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ElvisToIfThen extends AbstractIntentionTest { public void testAllFilesPresentInElvisToIfThen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/elvisToIfThen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -775,6 +773,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/folding") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Folding.IfToAssignment.class, Folding.IfToReturn.class, Folding.IfToReturnAsymmetrically.class, Folding.WhenToAssignment.class, Folding.WhenToReturn.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Folding extends AbstractIntentionTest { public void testAllFilesPresentInFolding() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding"), Pattern.compile("^(.+)\\.kt$"), true); @@ -782,6 +781,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/folding/ifToAssignment") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfToAssignment extends AbstractIntentionTest { public void testAllFilesPresentInIfToAssignment() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToAssignment"), Pattern.compile("^(.+)\\.kt$"), true); @@ -845,6 +845,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/folding/ifToReturn") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfToReturn extends AbstractIntentionTest { public void testAllFilesPresentInIfToReturn() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturn"), Pattern.compile("^(.+)\\.kt$"), true); @@ -872,6 +873,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfToReturnAsymmetrically extends AbstractIntentionTest { public void testAllFilesPresentInIfToReturnAsymmetrically() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/ifToReturnAsymmetrically"), Pattern.compile("^(.+)\\.kt$"), true); @@ -899,6 +901,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/folding/whenToAssignment") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenToAssignment extends AbstractIntentionTest { public void testAllFilesPresentInWhenToAssignment() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToAssignment"), Pattern.compile("^(.+)\\.kt$"), true); @@ -944,6 +947,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/folding/whenToReturn") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenToReturn extends AbstractIntentionTest { public void testAllFilesPresentInWhenToReturn() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/folding/whenToReturn"), Pattern.compile("^(.+)\\.kt$"), true); @@ -969,20 +973,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Folding"); - suite.addTestSuite(Folding.class); - suite.addTestSuite(IfToAssignment.class); - suite.addTestSuite(IfToReturn.class); - suite.addTestSuite(IfToReturnAsymmetrically.class); - suite.addTestSuite(WhenToAssignment.class); - suite.addTestSuite(WhenToReturn.class); - return suite; - } } @TestMetadata("idea/testData/intentions/branched/ifThenToDoubleBang") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfThenToDoubleBang extends AbstractIntentionTest { @TestMetadata("acceptableEmptyElseBlockForStatement.kt") public void testAcceptableEmptyElseBlockForStatement() throws Exception { @@ -1197,6 +1192,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/ifThenToElvis") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfThenToElvis extends AbstractIntentionTest { public void testAllFilesPresentInIfThenToElvis() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToElvis"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1388,16 +1384,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("IfThenToElvis"); - suite.addTestSuite(IfThenToElvis.class); - return suite; - } } @TestMetadata("idea/testData/intentions/branched/ifThenToSafeAccess") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfThenToSafeAccess extends AbstractIntentionTest { public void testAllFilesPresentInIfThenToSafeAccess() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifThenToSafeAccess"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1607,16 +1599,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("IfThenToSafeAccess"); - suite.addTestSuite(IfThenToSafeAccess.class); - return suite; - } } @TestMetadata("idea/testData/intentions/branched/ifWhen") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IfWhen.IfToWhen.class, IfWhen.WhenToIf.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfWhen extends AbstractIntentionTest { public void testAllFilesPresentInIfWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1624,6 +1612,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/ifWhen/ifToWhen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfToWhen extends AbstractIntentionTest { public void testAllFilesPresentInIfToWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/ifToWhen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1693,6 +1682,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/ifWhen/whenToIf") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhenToIf extends AbstractIntentionTest { public void testAllFilesPresentInWhenToIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/ifWhen/whenToIf"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1766,17 +1756,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("IfWhen"); - suite.addTestSuite(IfWhen.class); - suite.addTestSuite(IfToWhen.class); - suite.addTestSuite(WhenToIf.class); - return suite; - } } @TestMetadata("idea/testData/intentions/branched/safeAccessToIfThen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SafeAccessToIfThen extends AbstractIntentionTest { public void testAllFilesPresentInSafeAccessToIfThen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/safeAccessToIfThen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1919,6 +1903,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Unfolding.AssignmentToIf.class, Unfolding.AssignmentToWhen.class, Unfolding.PropertyToIf.class, Unfolding.PropertyToWhen.class, Unfolding.ReturnToIf.class, Unfolding.ReturnToWhen.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Unfolding extends AbstractIntentionTest { public void testAllFilesPresentInUnfolding() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1926,6 +1911,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToIf") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AssignmentToIf extends AbstractIntentionTest { public void testAllFilesPresentInAssignmentToIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToIf"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1977,6 +1963,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding/assignmentToWhen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AssignmentToWhen extends AbstractIntentionTest { public void testAllFilesPresentInAssignmentToWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/assignmentToWhen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2010,6 +1997,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToIf") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertyToIf extends AbstractIntentionTest { public void testAllFilesPresentInPropertyToIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToIf"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2073,6 +2061,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding/propertyToWhen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertyToWhen extends AbstractIntentionTest { public void testAllFilesPresentInPropertyToWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/propertyToWhen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2124,6 +2113,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding/returnToIf") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReturnToIf extends AbstractIntentionTest { public void testAllFilesPresentInReturnToIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToIf"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2151,6 +2141,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/unfolding/returnToWhen") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReturnToWhen extends AbstractIntentionTest { public void testAllFilesPresentInReturnToWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/unfolding/returnToWhen"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2176,22 +2167,12 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Unfolding"); - suite.addTestSuite(Unfolding.class); - suite.addTestSuite(AssignmentToIf.class); - suite.addTestSuite(AssignmentToWhen.class); - suite.addTestSuite(PropertyToIf.class); - suite.addTestSuite(PropertyToWhen.class); - suite.addTestSuite(ReturnToIf.class); - suite.addTestSuite(ReturnToWhen.class); - return suite; - } } @TestMetadata("idea/testData/intentions/branched/when") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({When.EliminateSubject.class, When.Flatten.class, When.IntroduceSubject.class, When.Merge.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractIntentionTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2199,6 +2180,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/when/eliminateSubject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class EliminateSubject extends AbstractIntentionTest { public void testAllFilesPresentInEliminateSubject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/eliminateSubject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2256,6 +2238,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/when/flatten") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Flatten extends AbstractIntentionTest { public void testAllFilesPresentInFlatten() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/flatten"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2283,6 +2266,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/when/introduceSubject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IntroduceSubject extends AbstractIntentionTest { public void testAllFilesPresentInIntroduceSubject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/introduceSubject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2358,6 +2342,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/when/merge") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Merge extends AbstractIntentionTest { public void testAllFilesPresentInMerge() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/branched/when/merge"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2467,36 +2452,13 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("When"); - suite.addTestSuite(When.class); - suite.addTestSuite(EliminateSubject.class); - suite.addTestSuite(Flatten.class); - suite.addTestSuite(IntroduceSubject.class); - suite.addTestSuite(Merge.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Branched"); - suite.addTestSuite(Branched.class); - suite.addTestSuite(DoubleBangToIfThen.class); - suite.addTestSuite(ElvisToIfThen.class); - suite.addTest(Folding.innerSuite()); - suite.addTestSuite(IfThenToDoubleBang.class); - suite.addTest(IfThenToElvis.innerSuite()); - suite.addTest(IfThenToSafeAccess.innerSuite()); - suite.addTest(IfWhen.innerSuite()); - suite.addTestSuite(SafeAccessToIfThen.class); - suite.addTest(Unfolding.innerSuite()); - suite.addTest(When.innerSuite()); - return suite; - } } @TestMetadata("idea/testData/intentions/convertAssertToIf") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertAssertToIf extends AbstractIntentionTest { public void testAllFilesPresentInConvertAssertToIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertAssertToIf"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2620,6 +2582,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertIfToAssert") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertIfToAssert extends AbstractIntentionTest { public void testAllFilesPresentInConvertIfToAssert() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertIfToAssert"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2707,6 +2670,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertNegatedBooleanSequence") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertNegatedBooleanSequence extends AbstractIntentionTest { public void testAllFilesPresentInConvertNegatedBooleanSequence() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedBooleanSequence"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2776,6 +2740,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertNegatedExpressionWithDemorgansLaw extends AbstractIntentionTest { public void testAllFilesPresentInConvertNegatedExpressionWithDemorgansLaw() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertNegatedExpressionWithDemorgansLaw"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2869,6 +2834,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertToBlockBody") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertToBlockBody extends AbstractIntentionTest { public void testAllFilesPresentInConvertToBlockBody() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToBlockBody"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2956,6 +2922,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertToConcatenatedStringIntention") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertToConcatenatedStringIntention extends AbstractIntentionTest { public void testAllFilesPresentInConvertToConcatenatedStringIntention() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToConcatenatedStringIntention"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3109,6 +3076,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertToExpressionBody") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertToExpressionBody extends AbstractIntentionTest { public void testAllFilesPresentInConvertToExpressionBody() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToExpressionBody"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3220,6 +3188,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertToForEachFunctionCall") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertToForEachFunctionCall extends AbstractIntentionTest { public void testAllFilesPresentInConvertToForEachFunctionCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachFunctionCall"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3271,6 +3240,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertToForEachLoop") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertToForEachLoop extends AbstractIntentionTest { public void testAllFilesPresentInConvertToForEachLoop() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToForEachLoop"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3340,6 +3310,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/convertToStringTemplateIntention") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertToStringTemplateIntention extends AbstractIntentionTest { public void testAllFilesPresentInConvertToStringTemplateIntention() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/convertToStringTemplateIntention"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3512,6 +3483,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/declarations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Declarations.ConvertMemberToExtension.class, Declarations.Split.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Declarations extends AbstractIntentionTest { public void testAllFilesPresentInDeclarations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3519,6 +3491,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/declarations/convertMemberToExtension") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConvertMemberToExtension extends AbstractIntentionTest { @TestMetadata("abstract.kt") public void testAbstract() throws Exception { @@ -3738,6 +3711,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/declarations/split") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Split extends AbstractIntentionTest { public void testAllFilesPresentInSplit() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/declarations/split"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3817,17 +3791,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Declarations"); - suite.addTestSuite(Declarations.class); - suite.addTestSuite(ConvertMemberToExtension.class); - suite.addTestSuite(Split.class); - return suite; - } } @TestMetadata("idea/testData/intentions/insertCurlyBracesToTemplate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InsertCurlyBracesToTemplate extends AbstractIntentionTest { public void testAllFilesPresentInInsertCurlyBracesToTemplate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertCurlyBracesToTemplate"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3873,6 +3841,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/insertExplicitTypeArguments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InsertExplicitTypeArguments extends AbstractIntentionTest { public void testAllFilesPresentInInsertExplicitTypeArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/insertExplicitTypeArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3996,6 +3965,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/invertIfCondition") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InvertIfCondition extends AbstractIntentionTest { public void testAllFilesPresentInInvertIfCondition() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/invertIfCondition"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4083,6 +4053,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/makeTypeExplicitInLambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MakeTypeExplicitInLambda extends AbstractIntentionTest { public void testAllFilesPresentInMakeTypeExplicitInLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeExplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4200,6 +4171,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/makeTypeImplicitInLambda") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MakeTypeImplicitInLambda extends AbstractIntentionTest { public void testAllFilesPresentInMakeTypeImplicitInLambda() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/makeTypeImplicitInLambda"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4263,6 +4235,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/moveLambdaInsideParentheses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MoveLambdaInsideParentheses extends AbstractIntentionTest { public void testAllFilesPresentInMoveLambdaInsideParentheses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaInsideParentheses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4368,6 +4341,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/moveLambdaOutsideParentheses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MoveLambdaOutsideParentheses extends AbstractIntentionTest { public void testAllFilesPresentInMoveLambdaOutsideParentheses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveLambdaOutsideParentheses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4455,6 +4429,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/operatorToFunction") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OperatorToFunction extends AbstractIntentionTest { public void testAllFilesPresentInOperatorToFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/operatorToFunction"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4584,6 +4559,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/reconstructedType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReconstructedType extends AbstractIntentionTest { public void testAllFilesPresentInReconstructedType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/reconstructedType"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4623,6 +4599,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/removeBraces") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveBraces extends AbstractIntentionTest { public void testAllFilesPresentInRemoveBraces() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeBraces"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4704,6 +4681,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/removeCurlyBracesFromTemplate") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveCurlyBracesFromTemplate extends AbstractIntentionTest { public void testAllFilesPresentInRemoveCurlyBracesFromTemplate() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeCurlyBracesFromTemplate"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4780,6 +4758,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/removeExplicitTypeArguments") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveExplicitTypeArguments extends AbstractIntentionTest { public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeExplicitTypeArguments"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4899,15 +4878,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("RemoveExplicitTypeArguments"); - suite.addTestSuite(RemoveExplicitTypeArguments.class); - return suite; - } } @TestMetadata("idea/testData/intentions/removeUnnecessaryParentheses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RemoveUnnecessaryParentheses extends AbstractIntentionTest { public void testAllFilesPresentInRemoveUnnecessaryParentheses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/removeUnnecessaryParentheses"), Pattern.compile("^(.+)\\.kt$"), true); @@ -4995,6 +4970,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceExplicitFunctionLiteralParamWithIt extends AbstractIntentionTest { public void testAllFilesPresentInReplaceExplicitFunctionLiteralParamWithIt() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceExplicitFunctionLiteralParamWithIt"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5052,6 +5028,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceItWithExplicitFunctionLiteralParam extends AbstractIntentionTest { public void testAllFilesPresentInReplaceItWithExplicitFunctionLiteralParam() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceItWithExplicitFunctionLiteralParam"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5091,6 +5068,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/replaceWithDotQualifiedMethodCall") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceWithDotQualifiedMethodCall extends AbstractIntentionTest { public void testAllFilesPresentInReplaceWithDotQualifiedMethodCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithDotQualifiedMethodCall"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5136,6 +5114,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/replaceWithInfixFunctionCall") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceWithInfixFunctionCall extends AbstractIntentionTest { public void testAllFilesPresentInReplaceWithInfixFunctionCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithInfixFunctionCall"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5259,6 +5238,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/replaceWithOperatorAssign") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceWithOperatorAssign extends AbstractIntentionTest { public void testAllFilesPresentInReplaceWithOperatorAssign() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithOperatorAssign"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5322,6 +5302,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/replaceWithTraditionalAssignment") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReplaceWithTraditionalAssignment extends AbstractIntentionTest { public void testAllFilesPresentInReplaceWithTraditionalAssignment() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/replaceWithTraditionalAssignment"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5355,6 +5336,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/simplifyBooleanWithConstants") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SimplifyBooleanWithConstants extends AbstractIntentionTest { public void testAllFilesPresentInSimplifyBooleanWithConstants() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyBooleanWithConstants"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5485,6 +5467,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SimplifyNegatedBinaryExpressionIntention extends AbstractIntentionTest { public void testAllFilesPresentInSimplifyNegatedBinaryExpressionIntention() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5562,15 +5545,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("SimplifyNegatedBinaryExpressionIntention"); - suite.addTestSuite(SimplifyNegatedBinaryExpressionIntention.class); - return suite; - } } @TestMetadata("idea/testData/intentions/specifyType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SpecifyType extends AbstractIntentionTest { public void testAllFilesPresentInSpecifyType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/specifyType"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5652,6 +5631,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/splitIf") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SplitIf extends AbstractIntentionTest { public void testAllFilesPresentInSplitIf() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/splitIf"), Pattern.compile("^(.+)\\.kt$"), true); @@ -5805,6 +5785,7 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/swapBinaryExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SwapBinaryExpression extends AbstractIntentionTest { public void testAllFilesPresentInSwapBinaryExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/swapBinaryExpression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -6118,47 +6099,4 @@ public class IntentionTestGenerated extends AbstractIntentionTest { } - public static Test suite() { - TestSuite suite = new TestSuite("IntentionTestGenerated"); - suite.addTestSuite(IntentionTestGenerated.class); - suite.addTestSuite(AddBraces.class); - suite.addTest(AttributeCallReplacements.innerSuite()); - suite.addTest(Branched.innerSuite()); - suite.addTestSuite(ConvertAssertToIf.class); - suite.addTestSuite(ConvertIfToAssert.class); - suite.addTestSuite(ConvertNegatedBooleanSequence.class); - suite.addTestSuite(ConvertNegatedExpressionWithDemorgansLaw.class); - suite.addTestSuite(ConvertToBlockBody.class); - suite.addTestSuite(ConvertToConcatenatedStringIntention.class); - suite.addTestSuite(ConvertToExpressionBody.class); - suite.addTestSuite(ConvertToForEachFunctionCall.class); - suite.addTestSuite(ConvertToForEachLoop.class); - suite.addTestSuite(ConvertToStringTemplateIntention.class); - suite.addTest(Declarations.innerSuite()); - suite.addTestSuite(InsertCurlyBracesToTemplate.class); - suite.addTestSuite(InsertExplicitTypeArguments.class); - suite.addTestSuite(InvertIfCondition.class); - suite.addTestSuite(MakeTypeExplicitInLambda.class); - suite.addTestSuite(MakeTypeImplicitInLambda.class); - suite.addTestSuite(MoveLambdaInsideParentheses.class); - suite.addTestSuite(MoveLambdaOutsideParentheses.class); - suite.addTestSuite(OperatorToFunction.class); - suite.addTestSuite(ReconstructedType.class); - suite.addTestSuite(RemoveBraces.class); - suite.addTestSuite(RemoveCurlyBracesFromTemplate.class); - suite.addTest(RemoveExplicitTypeArguments.innerSuite()); - suite.addTestSuite(RemoveUnnecessaryParentheses.class); - suite.addTestSuite(ReplaceExplicitFunctionLiteralParamWithIt.class); - suite.addTestSuite(ReplaceItWithExplicitFunctionLiteralParam.class); - suite.addTestSuite(ReplaceWithDotQualifiedMethodCall.class); - suite.addTestSuite(ReplaceWithInfixFunctionCall.class); - suite.addTestSuite(ReplaceWithOperatorAssign.class); - suite.addTestSuite(ReplaceWithTraditionalAssignment.class); - suite.addTestSuite(SimplifyBooleanWithConstants.class); - suite.addTest(SimplifyNegatedBinaryExpressionIntention.innerSuite()); - suite.addTestSuite(SpecifyType.class); - suite.addTestSuite(SplitIf.class); - suite.addTestSuite(SwapBinaryExpression.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java index e86f50b6a8b..b2001980622 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.intentions.declarations; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/joinLines") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JoinLinesTestGenerated extends AbstractJoinLinesTest { public void testAllFilesPresentInJoinLines() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/joinLines"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java index bb934e556db..cade4489746 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/DecompiledTextTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.libraries; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/libraries/decompiledText") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest { public void testAllFilesPresentInDecompiledText() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/libraries/decompiledText"), Pattern.compile("^([^\\.]+)$"), true); @@ -84,9 +87,4 @@ public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest { doTest(fileName); } - public static Test suite() { - TestSuite suite = new TestSuite("DecompiledTextTestGenerated"); - suite.addTestSuite(DecompiledTextTestGenerated.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java index 5dc0ed063ba..0ed66499166 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.navigation; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/navigation/gotoSuper") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class GotoSuperTestGenerated extends AbstractGotoSuperTest { public void testAllFilesPresentInGotoSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSuper"), Pattern.compile("^(.+)\\.test$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java index 7acb31808b6..cdde92eb9bc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.navigation; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({KotlinGotoTestGenerated.GotoClass.class, KotlinGotoTestGenerated.GotoSymbol.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { @TestMetadata("idea/testData/navigation/gotoClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GotoClass extends AbstractKotlinGotoTest { public void testAllFilesPresentInGotoClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -89,6 +93,7 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { @TestMetadata("idea/testData/navigation/gotoSymbol") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GotoSymbol extends AbstractKotlinGotoTest { public void testAllFilesPresentInGotoSymbol() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/navigation/gotoSymbol"), Pattern.compile("^(.+)\\.kt$"), true); @@ -132,10 +137,4 @@ public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { } - public static Test suite() { - TestSuite suite = new TestSuite("KotlinGotoTestGenerated"); - suite.addTestSuite(GotoClass.class); - suite.addTestSuite(GotoSymbol.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java index aabc0e386a9..038f1355479 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.parameterInfo; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/parameterInfo/functionParameterInfo") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class FunctionParameterInfoTestGenerated extends AbstractFunctionParameterInfoTest { public void testAllFilesPresentInFunctionParameterInfo() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/parameterInfo/functionParameterInfo"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java index baa369fcd45..77d606e5da1 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/quickfix") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({QuickFixMultiFileTestGenerated.AddStarProjections.class, QuickFixMultiFileTestGenerated.AutoImports.class, QuickFixMultiFileTestGenerated.CreateFromUsage.class, QuickFixMultiFileTestGenerated.Modifiers.class, QuickFixMultiFileTestGenerated.Nullables.class, QuickFixMultiFileTestGenerated.Override.class, QuickFixMultiFileTestGenerated.Suppress.class, QuickFixMultiFileTestGenerated.TypeImports.class, QuickFixMultiFileTestGenerated.TypeMismatch.class, QuickFixMultiFileTestGenerated.Variables.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInQuickfix() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -39,20 +42,17 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/addStarProjections") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AddStarProjections extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAddStarProjections() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("AddStarProjections"); - suite.addTestSuite(AddStarProjections.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/autoImports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AutoImports extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAutoImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -213,21 +213,18 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CreateFromUsage extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateFromUsage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CreateFromUsage"); - suite.addTestSuite(CreateFromUsage.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/modifiers") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInModifiers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -236,6 +233,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({AddOpenToClassDeclaration.FinalJavaClass.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AddOpenToClassDeclaration extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -244,6 +242,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FinalJavaClass.JavaCode.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FinalJavaClass extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInFinalJavaClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -252,60 +251,35 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaCode extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInJavaCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("JavaCode"); - suite.addTestSuite(JavaCode.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FinalJavaClass"); - suite.addTestSuite(FinalJavaClass.class); - suite.addTest(JavaCode.innerSuite()); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("AddOpenToClassDeclaration"); - suite.addTestSuite(AddOpenToClassDeclaration.class); - suite.addTest(FinalJavaClass.innerSuite()); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Modifiers"); - suite.addTestSuite(Modifiers.class); - suite.addTest(AddOpenToClassDeclaration.innerSuite()); - return suite; - } } @TestMetadata("idea/testData/quickfix/nullables") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Nullables extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInNullables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Nullables"); - suite.addTestSuite(Nullables.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/override") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Override.NothingToOverride.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Override extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInOverride() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -313,6 +287,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/override/nothingToOverride") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NothingToOverride extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInNothingToOverride() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/nothingToOverride"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -332,17 +307,12 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Override"); - suite.addTestSuite(Override.class); - suite.addTestSuite(NothingToOverride.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/suppress") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Suppress.ForStatement.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Suppress extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInSuppress() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -351,28 +321,19 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/suppress/forStatement") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForStatement extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInForStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ForStatement"); - suite.addTestSuite(ForStatement.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Suppress"); - suite.addTestSuite(Suppress.class); - suite.addTest(ForStatement.innerSuite()); - return suite; - } } @TestMetadata("idea/testData/quickfix/typeImports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeImports extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); @@ -389,46 +350,23 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/typeMismatch") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeMismatch extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeMismatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("TypeMismatch"); - suite.addTestSuite(TypeMismatch.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/variables") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Variables extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^(\\w+)\\.before\\.Main\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Variables"); - suite.addTestSuite(Variables.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("QuickFixMultiFileTestGenerated"); - suite.addTestSuite(QuickFixMultiFileTestGenerated.class); - suite.addTest(AddStarProjections.innerSuite()); - suite.addTestSuite(AutoImports.class); - suite.addTest(CreateFromUsage.innerSuite()); - suite.addTest(Modifiers.innerSuite()); - suite.addTest(Nullables.innerSuite()); - suite.addTest(Override.innerSuite()); - suite.addTest(Suppress.innerSuite()); - suite.addTestSuite(TypeImports.class); - suite.addTest(TypeMismatch.innerSuite()); - suite.addTest(Variables.innerSuite()); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java index cc4e9ccb9bb..a6bc092b339 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/quickfix") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({QuickFixTestGenerated.Abstract.class, QuickFixTestGenerated.AddStarProjections.class, QuickFixTestGenerated.AutoImports.class, QuickFixTestGenerated.ChangeSignature.class, QuickFixTestGenerated.CheckArguments.class, QuickFixTestGenerated.CreateFromUsage.class, QuickFixTestGenerated.Expressions.class, QuickFixTestGenerated.Migration.class, QuickFixTestGenerated.Modifiers.class, QuickFixTestGenerated.Nullables.class, QuickFixTestGenerated.Override.class, QuickFixTestGenerated.PlatformClasses.class, QuickFixTestGenerated.Supercalls.class, QuickFixTestGenerated.SupertypeInitialization.class, QuickFixTestGenerated.Suppress.class, QuickFixTestGenerated.TypeAddition.class, QuickFixTestGenerated.TypeImports.class, QuickFixTestGenerated.TypeMismatch.class, QuickFixTestGenerated.TypeProjection.class, QuickFixTestGenerated.UselessImports.class, QuickFixTestGenerated.Variables.class, QuickFixTestGenerated.When.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class QuickFixTestGenerated extends AbstractQuickFixTest { public void testAllFilesPresentInQuickfix() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -38,6 +41,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/abstract") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Abstract extends AbstractQuickFixTest { @TestMetadata("beforeAbstractFunctionInNonAbstractClass.kt") public void testAbstractFunctionInNonAbstractClass() throws Exception { @@ -168,6 +172,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/addStarProjections") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({AddStarProjections.Cast.class, AddStarProjections.CheckType.class, AddStarProjections.JavaClass.class, AddStarProjections.When.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AddStarProjections extends AbstractQuickFixTest { public void testAllFilesPresentInAddStarProjections() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -211,6 +216,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/addStarProjections/cast") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Cast extends AbstractQuickFixTest { public void testAllFilesPresentInCast() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/cast"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -232,6 +238,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/addStarProjections/checkType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CheckType extends AbstractQuickFixTest { public void testAllFilesPresentInCheckType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/checkType"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -259,6 +266,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/addStarProjections/javaClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaClass extends AbstractQuickFixTest { public void testAllFilesPresentInJavaClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/javaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -292,6 +300,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/addStarProjections/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractQuickFixTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections/when"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -335,19 +344,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("AddStarProjections"); - suite.addTestSuite(AddStarProjections.class); - suite.addTestSuite(Cast.class); - suite.addTestSuite(CheckType.class); - suite.addTestSuite(JavaClass.class); - suite.addTestSuite(When.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/autoImports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AutoImports extends AbstractQuickFixTest { public void testAllFilesPresentInAutoImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/autoImports"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -423,6 +424,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/changeSignature") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ChangeSignature extends AbstractQuickFixTest { @TestMetadata("beforeAddConstructorParameter.kt") public void testAddConstructorParameter() throws Exception { @@ -558,6 +560,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/checkArguments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CheckArguments extends AbstractQuickFixTest { public void testAllFilesPresentInCheckArguments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -616,6 +619,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({CreateFromUsage.Component.class, CreateFromUsage.Get.class, CreateFromUsage.HasNext.class, CreateFromUsage.Iterator.class, CreateFromUsage.Next.class, CreateFromUsage.Set.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CreateFromUsage extends AbstractQuickFixTest { public void testAllFilesPresentInCreateFromUsage() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -623,6 +627,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/component") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Component extends AbstractQuickFixTest { public void testAllFilesPresentInComponent() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/component"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -650,6 +655,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/get") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Get extends AbstractQuickFixTest { public void testAllFilesPresentInGet() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/get"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -731,6 +737,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/hasNext") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class HasNext extends AbstractQuickFixTest { public void testAllFilesPresentInHasNext() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/hasNext"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -752,6 +759,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/iterator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Iterator extends AbstractQuickFixTest { public void testAllFilesPresentInIterator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/iterator"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -779,6 +787,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/next") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Next extends AbstractQuickFixTest { public void testAllFilesPresentInNext() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/next"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -800,6 +809,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/set") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Set extends AbstractQuickFixTest { public void testAllFilesPresentInSet() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/set"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -819,21 +829,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CreateFromUsage"); - suite.addTestSuite(CreateFromUsage.class); - suite.addTestSuite(Component.class); - suite.addTestSuite(Get.class); - suite.addTestSuite(HasNext.class); - suite.addTestSuite(Iterator.class); - suite.addTestSuite(Next.class); - suite.addTestSuite(Set.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/expressions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expressions extends AbstractQuickFixTest { public void testAllFilesPresentInExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/expressions"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -909,6 +909,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/migration") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Migration extends AbstractQuickFixTest { @TestMetadata("beforeAddOverrideToEqualsHashCodeToString.kt") public void testAddOverrideToEqualsHashCodeToString() throws Exception { @@ -931,6 +932,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Modifiers.AddOpenToClassDeclaration.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractQuickFixTest { @TestMetadata("beforeAddInnerModifier.kt") public void testAddInnerModifier() throws Exception { @@ -1071,6 +1073,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({AddOpenToClassDeclaration.FinalJavaClass.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AddOpenToClassDeclaration extends AbstractQuickFixTest { public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1133,6 +1136,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FinalJavaClass.JavaCode.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FinalJavaClass extends AbstractQuickFixTest { public void testAllFilesPresentInFinalJavaClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1141,45 +1145,24 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaCode extends AbstractQuickFixTest { public void testAllFilesPresentInJavaCode() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode"), Pattern.compile("^before(\\w+)\\.kt$"), true); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("JavaCode"); - suite.addTestSuite(JavaCode.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FinalJavaClass"); - suite.addTestSuite(FinalJavaClass.class); - suite.addTest(JavaCode.innerSuite()); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("AddOpenToClassDeclaration"); - suite.addTestSuite(AddOpenToClassDeclaration.class); - suite.addTest(FinalJavaClass.innerSuite()); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Modifiers"); - suite.addTestSuite(Modifiers.class); - suite.addTest(AddOpenToClassDeclaration.innerSuite()); - return suite; - } } @TestMetadata("idea/testData/quickfix/nullables") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Nullables.UnsafeInfixCall.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Nullables extends AbstractQuickFixTest { public void testAllFilesPresentInNullables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1211,6 +1194,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/nullables/unsafeInfixCall") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnsafeInfixCall extends AbstractQuickFixTest { public void testAllFilesPresentInUnsafeInfixCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables/unsafeInfixCall"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1224,17 +1208,12 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Nullables"); - suite.addTestSuite(Nullables.class); - suite.addTestSuite(UnsafeInfixCall.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/override") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Override.NothingToOverride.class, Override.TypeMismatchOnOverride.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Override extends AbstractQuickFixTest { public void testAllFilesPresentInOverride() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1320,6 +1299,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/override/nothingToOverride") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NothingToOverride extends AbstractQuickFixTest { @TestMetadata("beforeAddFunction.kt") public void testAddFunction() throws Exception { @@ -1503,6 +1483,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/override/typeMismatchOnOverride") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeMismatchOnOverride extends AbstractQuickFixTest { public void testAllFilesPresentInTypeMismatchOnOverride() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/override/typeMismatchOnOverride"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1612,17 +1593,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Override"); - suite.addTestSuite(Override.class); - suite.addTestSuite(NothingToOverride.class); - suite.addTestSuite(TypeMismatchOnOverride.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/platformClasses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PlatformClasses extends AbstractQuickFixTest { public void testAllFilesPresentInPlatformClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/platformClasses"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1656,6 +1631,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/supercalls") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Supercalls extends AbstractQuickFixTest { public void testAllFilesPresentInSupercalls() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supercalls"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1671,6 +1647,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/supertypeInitialization") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SupertypeInitialization extends AbstractQuickFixTest { public void testAllFilesPresentInSupertypeInitialization() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/supertypeInitialization"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1711,6 +1688,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Suppress.AnnotationPosition.class, Suppress.Availability.class, Suppress.DeclarationKinds.class, Suppress.ErrorRecovery.class, Suppress.ForStatement.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Suppress extends AbstractQuickFixTest { public void testAllFilesPresentInSuppress() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1718,6 +1696,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/annotationPosition") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnnotationPosition extends AbstractQuickFixTest { public void testAllFilesPresentInAnnotationPosition() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/annotationPosition"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1799,6 +1778,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/availability") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Availability extends AbstractQuickFixTest { public void testAllFilesPresentInAvailability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/availability"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1868,6 +1848,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/declarationKinds") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeclarationKinds extends AbstractQuickFixTest { public void testAllFilesPresentInDeclarationKinds() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/declarationKinds"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1943,6 +1924,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/errorRecovery") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ErrorRecovery extends AbstractQuickFixTest { public void testAllFilesPresentInErrorRecovery() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/errorRecovery"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -1965,6 +1947,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/forStatement") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ForStatement.Unavailable.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForStatement extends AbstractQuickFixTest { public void testAllFilesPresentInForStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2206,6 +2189,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/forStatement/unavailable") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Unavailable extends AbstractQuickFixTest { public void testAllFilesPresentInUnavailable() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement/unavailable"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2279,28 +2263,13 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ForStatement"); - suite.addTestSuite(ForStatement.class); - suite.addTestSuite(Unavailable.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Suppress"); - suite.addTestSuite(Suppress.class); - suite.addTestSuite(AnnotationPosition.class); - suite.addTestSuite(Availability.class); - suite.addTestSuite(DeclarationKinds.class); - suite.addTestSuite(ErrorRecovery.class); - suite.addTest(ForStatement.innerSuite()); - return suite; - } } @TestMetadata("idea/testData/quickfix/typeAddition") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeAddition extends AbstractQuickFixTest { public void testAllFilesPresentInTypeAddition() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeAddition"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2382,6 +2351,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeImports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeImports extends AbstractQuickFixTest { public void testAllFilesPresentInTypeImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeImports"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2422,6 +2392,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeMismatch") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({TypeMismatch.Casts.class, TypeMismatch.ComponentFunctionReturnTypeMismatch.class, TypeMismatch.FixOverloadedOperator.class, TypeMismatch.ParameterTypeMismatch.class, TypeMismatch.TypeMismatchOnReturnedExpression.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeMismatch extends AbstractQuickFixTest { public void testAllFilesPresentInTypeMismatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2507,6 +2478,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeMismatch/casts") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Casts extends AbstractQuickFixTest { public void testAllFilesPresentInCasts() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/casts"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2570,6 +2542,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ComponentFunctionReturnTypeMismatch extends AbstractQuickFixTest { public void testAllFilesPresentInComponentFunctionReturnTypeMismatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/componentFunctionReturnTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2609,6 +2582,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeMismatch/fixOverloadedOperator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FixOverloadedOperator extends AbstractQuickFixTest { public void testAllFilesPresentInFixOverloadedOperator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/fixOverloadedOperator"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2636,6 +2610,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeMismatch/parameterTypeMismatch") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ParameterTypeMismatch extends AbstractQuickFixTest { public void testAllFilesPresentInParameterTypeMismatch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/parameterTypeMismatch"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2687,6 +2662,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeMismatchOnReturnedExpression extends AbstractQuickFixTest { public void testAllFilesPresentInTypeMismatchOnReturnedExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeMismatch/typeMismatchOnReturnedExpression"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2790,20 +2766,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("TypeMismatch"); - suite.addTestSuite(TypeMismatch.class); - suite.addTestSuite(Casts.class); - suite.addTestSuite(ComponentFunctionReturnTypeMismatch.class); - suite.addTestSuite(FixOverloadedOperator.class); - suite.addTestSuite(ParameterTypeMismatch.class); - suite.addTestSuite(TypeMismatchOnReturnedExpression.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/typeProjection") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeProjection extends AbstractQuickFixTest { public void testAllFilesPresentInTypeProjection() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/typeProjection"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2855,6 +2822,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/uselessImports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UselessImports extends AbstractQuickFixTest { public void testAllFilesPresentInUselessImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/uselessImports"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2877,6 +2845,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/variables") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Variables.ChangeMutability.class, Variables.ChangeToBackingField.class, Variables.ChangeToFunctionInvocation.class, Variables.ChangeToPropertyName.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Variables extends AbstractQuickFixTest { public void testAllFilesPresentInVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2896,6 +2865,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/variables/changeMutability") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ChangeMutability extends AbstractQuickFixTest { public void testAllFilesPresentInChangeMutability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2935,6 +2905,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/variables/changeToBackingField") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ChangeToBackingField extends AbstractQuickFixTest { public void testAllFilesPresentInChangeToBackingField() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToBackingField"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2956,6 +2927,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/variables/changeToFunctionInvocation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ChangeToFunctionInvocation extends AbstractQuickFixTest { public void testAllFilesPresentInChangeToFunctionInvocation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeToFunctionInvocation"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -2971,6 +2943,7 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/variables/changeToPropertyName") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ChangeToPropertyName extends AbstractQuickFixTest { @TestMetadata("beforeAbstractProperty.kt") public void testAbstractProperty() throws Exception { @@ -3008,19 +2981,11 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Variables"); - suite.addTestSuite(Variables.class); - suite.addTestSuite(ChangeMutability.class); - suite.addTestSuite(ChangeToBackingField.class); - suite.addTestSuite(ChangeToFunctionInvocation.class); - suite.addTestSuite(ChangeToPropertyName.class); - return suite; - } } @TestMetadata("idea/testData/quickfix/when") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class When extends AbstractQuickFixTest { public void testAllFilesPresentInWhen() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/when"), Pattern.compile("^before(\\w+)\\.kt$"), true); @@ -3052,31 +3017,4 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { } - public static Test suite() { - TestSuite suite = new TestSuite("QuickFixTestGenerated"); - suite.addTestSuite(QuickFixTestGenerated.class); - suite.addTestSuite(Abstract.class); - suite.addTest(AddStarProjections.innerSuite()); - suite.addTestSuite(AutoImports.class); - suite.addTestSuite(ChangeSignature.class); - suite.addTestSuite(CheckArguments.class); - suite.addTest(CreateFromUsage.innerSuite()); - suite.addTestSuite(Expressions.class); - suite.addTestSuite(Migration.class); - suite.addTest(Modifiers.innerSuite()); - suite.addTest(Nullables.innerSuite()); - suite.addTest(Override.innerSuite()); - suite.addTestSuite(PlatformClasses.class); - suite.addTestSuite(Supercalls.class); - suite.addTestSuite(SupertypeInitialization.class); - suite.addTest(Suppress.innerSuite()); - suite.addTestSuite(TypeAddition.class); - suite.addTestSuite(TypeImports.class); - suite.addTest(TypeMismatch.innerSuite()); - suite.addTestSuite(TypeProjection.class); - suite.addTestSuite(UselessImports.class); - suite.addTest(Variables.innerSuite()); - suite.addTestSuite(When.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java index b31969d253a..e6fa0f72588 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.inline; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/refactoring/inline") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({InlineTestGenerated.AddParenthesis.class, InlineTestGenerated.ExplicateParameterTypes.class, InlineTestGenerated.ExplicateTypeArgument.class, InlineTestGenerated.Property.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class InlineTestGenerated extends AbstractInlineTest { public void testAllFilesPresentInInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline"), Pattern.compile("^(.+)\\.kt$"), true); @@ -110,6 +113,7 @@ public class InlineTestGenerated extends AbstractInlineTest { @TestMetadata("idea/testData/refactoring/inline/addParenthesis") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AddParenthesis extends AbstractInlineTest { public void testAllFilesPresentInAddParenthesis() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/addParenthesis"), Pattern.compile("^(.+)\\.kt$"), true); @@ -299,6 +303,7 @@ public class InlineTestGenerated extends AbstractInlineTest { @TestMetadata("idea/testData/refactoring/inline/explicateParameterTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExplicateParameterTypes extends AbstractInlineTest { public void testAllFilesPresentInExplicateParameterTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateParameterTypes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -350,6 +355,7 @@ public class InlineTestGenerated extends AbstractInlineTest { @TestMetadata("idea/testData/refactoring/inline/explicateTypeArgument") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExplicateTypeArgument extends AbstractInlineTest { public void testAllFilesPresentInExplicateTypeArgument() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/explicateTypeArgument"), Pattern.compile("^(.+)\\.kt$"), true); @@ -413,6 +419,7 @@ public class InlineTestGenerated extends AbstractInlineTest { @TestMetadata("idea/testData/refactoring/inline/property") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Property extends AbstractInlineTest { public void testAllFilesPresentInProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/inline/property"), Pattern.compile("^(.+)\\.kt$"), true); @@ -468,13 +475,4 @@ public class InlineTestGenerated extends AbstractInlineTest { } - public static Test suite() { - TestSuite suite = new TestSuite("InlineTestGenerated"); - suite.addTestSuite(InlineTestGenerated.class); - suite.addTestSuite(AddParenthesis.class); - suite.addTestSuite(ExplicateParameterTypes.class); - suite.addTestSuite(ExplicateTypeArgument.class); - suite.addTestSuite(Property.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java index 823f25429de..550c6364e71 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetExtractionTestGenerated.IntroduceVariable.class, JetExtractionTestGenerated.ExtractFunction.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/introduceVariable") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IntroduceVariable extends AbstractJetExtractionTest { public void testAllFilesPresentInIntroduceVariable() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/introduceVariable"), Pattern.compile("^(.+)\\.kt$"), true); @@ -246,6 +250,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ExtractFunction.AsProperty.class, ExtractFunction.Basic.class, ExtractFunction.ControlFlow.class, ExtractFunction.DefaultContainer.class, ExtractFunction.Delegation.class, ExtractFunction.Initializers.class, ExtractFunction.Parameters.class, ExtractFunction.TypeParameters.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExtractFunction extends AbstractJetExtractionTest { public void testAllFilesPresentInExtractFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction"), Pattern.compile("^(.+)\\.kt$"), true); @@ -253,6 +258,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/asProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AsProperty extends AbstractJetExtractionTest { public void testAllFilesPresentInAsProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/asProperty"), Pattern.compile("^(.+)\\.kt$"), true); @@ -286,6 +292,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/basic") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Basic extends AbstractJetExtractionTest { public void testAllFilesPresentInBasic() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/basic"), Pattern.compile("^(.+)\\.kt$"), true); @@ -404,6 +411,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ControlFlow.ConditionalJumps.class, ControlFlow.Default.class, ControlFlow.DefiniteReturns.class, ControlFlow.EvaluateExpression.class, ControlFlow.Initializer.class, ControlFlow.OutputValues.class, ControlFlow.Throws.class, ControlFlow.Unextractable.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ControlFlow extends AbstractJetExtractionTest { public void testAllFilesPresentInControlFlow() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow"), Pattern.compile("^(.+)\\.kt$"), true); @@ -411,6 +419,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConditionalJumps extends AbstractJetExtractionTest { public void testAllFilesPresentInConditionalJumps() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/conditionalJumps"), Pattern.compile("^(.+)\\.kt$"), true); @@ -480,6 +489,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/default") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Default extends AbstractJetExtractionTest { public void testAllFilesPresentInDefault() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/default"), Pattern.compile("^(.+)\\.kt$"), true); @@ -531,6 +541,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefiniteReturns extends AbstractJetExtractionTest { public void testAllFilesPresentInDefiniteReturns() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/definiteReturns"), Pattern.compile("^(.+)\\.kt$"), true); @@ -558,6 +569,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class EvaluateExpression extends AbstractJetExtractionTest { public void testAllFilesPresentInEvaluateExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/evaluateExpression"), Pattern.compile("^(.+)\\.kt$"), true); @@ -645,6 +657,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/initializer") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Initializer extends AbstractJetExtractionTest { public void testAllFilesPresentInInitializer() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/initializer"), Pattern.compile("^(.+)\\.kt$"), true); @@ -696,6 +709,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/outputValues") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OutputValues extends AbstractJetExtractionTest { public void testAllFilesPresentInOutputValues() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/outputValues"), Pattern.compile("^(.+)\\.kt$"), true); @@ -765,6 +779,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/throws") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Throws extends AbstractJetExtractionTest { public void testAllFilesPresentInThrows() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/throws"), Pattern.compile("^(.+)\\.kt$"), true); @@ -810,6 +825,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/controlFlow/unextractable") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Unextractable extends AbstractJetExtractionTest { public void testAllFilesPresentInUnextractable() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/controlFlow/unextractable"), Pattern.compile("^(.+)\\.kt$"), true); @@ -871,23 +887,11 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ControlFlow"); - suite.addTestSuite(ControlFlow.class); - suite.addTestSuite(ConditionalJumps.class); - suite.addTestSuite(Default.class); - suite.addTestSuite(DefiniteReturns.class); - suite.addTestSuite(EvaluateExpression.class); - suite.addTestSuite(Initializer.class); - suite.addTestSuite(OutputValues.class); - suite.addTestSuite(Throws.class); - suite.addTestSuite(Unextractable.class); - return suite; - } } @TestMetadata("idea/testData/refactoring/extractFunction/defaultContainer") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultContainer extends AbstractJetExtractionTest { public void testAllFilesPresentInDefaultContainer() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/defaultContainer"), Pattern.compile("^(.+)\\.kt$"), true); @@ -939,6 +943,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/delegation") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Delegation extends AbstractJetExtractionTest { public void testAllFilesPresentInDelegation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/delegation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -967,6 +972,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Initializers.Accessors.class, Initializers.Classes.class, Initializers.Functions.class, Initializers.Properties.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Initializers extends AbstractJetExtractionTest { public void testAllFilesPresentInInitializers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -974,6 +980,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/accessors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Accessors extends AbstractJetExtractionTest { public void testAllFilesPresentInAccessors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/accessors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1007,6 +1014,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/classes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Classes extends AbstractJetExtractionTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/classes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1040,6 +1048,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/functions") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Functions extends AbstractJetExtractionTest { public void testAllFilesPresentInFunctions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/functions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1121,6 +1130,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/initializers/properties") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Properties extends AbstractJetExtractionTest { public void testAllFilesPresentInProperties() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/initializers/properties"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1176,20 +1186,12 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Initializers"); - suite.addTestSuite(Initializers.class); - suite.addTestSuite(Accessors.class); - suite.addTestSuite(Classes.class); - suite.addTestSuite(Functions.class); - suite.addTestSuite(Properties.class); - return suite; - } } @TestMetadata("idea/testData/refactoring/extractFunction/parameters") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Parameters.CandidateTypes.class, Parameters.ExtractSuper.class, Parameters.ExtractThis.class, Parameters.It.class, Parameters.Misc.class, Parameters.NonDenotableTypes.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameters extends AbstractJetExtractionTest { public void testAllFilesPresentInParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1197,6 +1199,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/candidateTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CandidateTypes extends AbstractJetExtractionTest { public void testAllFilesPresentInCandidateTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/candidateTypes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1242,6 +1245,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractSuper") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExtractSuper extends AbstractJetExtractionTest { public void testAllFilesPresentInExtractSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractSuper"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1275,6 +1279,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/extractThis") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ExtractThis extends AbstractJetExtractionTest { public void testAllFilesPresentInExtractThis() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/extractThis"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1326,6 +1331,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/it") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class It extends AbstractJetExtractionTest { public void testAllFilesPresentInIt() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/it"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1359,6 +1365,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/misc") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Misc extends AbstractJetExtractionTest { public void testAllFilesPresentInMisc() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/misc"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1470,6 +1477,7 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonDenotableTypes extends AbstractJetExtractionTest { public void testAllFilesPresentInNonDenotableTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/parameters/nonDenotableTypes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1489,21 +1497,11 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Parameters"); - suite.addTestSuite(Parameters.class); - suite.addTestSuite(CandidateTypes.class); - suite.addTestSuite(ExtractSuper.class); - suite.addTestSuite(ExtractThis.class); - suite.addTestSuite(It.class); - suite.addTestSuite(Misc.class); - suite.addTestSuite(NonDenotableTypes.class); - return suite; - } } @TestMetadata("idea/testData/refactoring/extractFunction/typeParameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeParameters extends AbstractJetExtractionTest { public void testAllFilesPresentInTypeParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/refactoring/extractFunction/typeParameters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1583,25 +1581,6 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ExtractFunction"); - suite.addTestSuite(ExtractFunction.class); - suite.addTestSuite(AsProperty.class); - suite.addTestSuite(Basic.class); - suite.addTest(ControlFlow.innerSuite()); - suite.addTestSuite(DefaultContainer.class); - suite.addTestSuite(Delegation.class); - suite.addTest(Initializers.innerSuite()); - suite.addTest(Parameters.innerSuite()); - suite.addTestSuite(TypeParameters.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("JetExtractionTestGenerated"); - suite.addTestSuite(IntroduceVariable.class); - suite.addTest(ExtractFunction.innerSuite()); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java index 99cee8663ae..8950bd91e7e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.move; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/refactoring/move") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetMoveTestGenerated extends AbstractJetMoveTest { public void testAllFilesPresentInMove() throws Exception { JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/move"), Pattern.compile("^(.+)\\.test$")); diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java index 61872974820..f1d39975c2d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.rename; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/refactoring/rename") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class RenameTestGenerated extends AbstractRenameTest { public void testAllFilesPresentInRename() throws Exception { JetTestUtils.assertAllTestsPresentInSingleGeneratedClass(this.getClass(), new File("idea/testData/refactoring/rename"), Pattern.compile("^(.+)\\.test$")); diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java index 5a879f9a13b..e7cd2428233 100644 --- a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.structureView; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/structureView/fileStructure") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class KotlinFileStructureTestGenerated extends AbstractKotlinFileStructureTest { public void testAllFilesPresentInFileStructure() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/structureView/fileStructure"), Pattern.compile("^([^\\.]+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java index 725993815d8..5980735abde 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/LazyResolveByStubTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.stubs; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("compiler/testData/loadJava/compiledKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({LazyResolveByStubTestGenerated.Annotations.class, LazyResolveByStubTestGenerated.Class.class, LazyResolveByStubTestGenerated.ClassFun.class, LazyResolveByStubTestGenerated.ClassObject.class, LazyResolveByStubTestGenerated.Constructor.class, LazyResolveByStubTestGenerated.DataClass.class, LazyResolveByStubTestGenerated.Enum.class, LazyResolveByStubTestGenerated.FromLoadJava.class, LazyResolveByStubTestGenerated.Fun.class, LazyResolveByStubTestGenerated.Inline.class, LazyResolveByStubTestGenerated.Prop.class, LazyResolveByStubTestGenerated.Type.class, LazyResolveByStubTestGenerated.Visibility.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin"), Pattern.compile("^(.+)\\.kt$"), true); @@ -39,6 +42,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Annotations.ClassMembers.class, Annotations.Classes.class, Annotations.PackageMembers.class, Annotations.Parameters.class, Annotations.PropertiesWithoutBackingFields.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations"), Pattern.compile("^(.+)\\.kt$"), true); @@ -64,6 +68,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassMembers extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInClassMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classMembers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -115,6 +120,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/classes") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Classes extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/classes"), Pattern.compile("^(.+)\\.kt$"), true); @@ -208,6 +214,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInPackageMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/packageMembers"), Pattern.compile("^(.+)\\.kt$"), true); @@ -265,6 +272,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/parameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameters extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/parameters"), Pattern.compile("^(.+)\\.kt$"), true); @@ -340,6 +348,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PropertiesWithoutBackingFields extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInPropertiesWithoutBackingFields() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/annotations/propertiesWithoutBackingFields"), Pattern.compile("^(.+)\\.kt$"), true); @@ -395,21 +404,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Annotations"); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(ClassMembers.class); - suite.addTestSuite(Classes.class); - suite.addTestSuite(PackageMembers.class); - suite.addTestSuite(Parameters.class); - suite.addTestSuite(PropertiesWithoutBackingFields.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Class.JavaBean.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class"), Pattern.compile("^(.+)\\.kt$"), true); @@ -615,6 +615,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/class/javaBean") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaBean extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInJavaBean() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/class/javaBean"), Pattern.compile("^(.+)\\.kt$"), true); @@ -658,16 +659,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Class"); - suite.addTestSuite(Class.class); - suite.addTestSuite(JavaBean.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/classFun") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassFun extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInClassFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classFun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -713,6 +709,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/classObject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInClassObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/classObject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -795,6 +792,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Constructor.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor"), Pattern.compile("^(.+)\\.kt$"), true); @@ -898,6 +896,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/constructor/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -917,16 +916,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Constructor"); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/dataClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DataClass extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInDataClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/dataClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -978,6 +972,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/enum") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInEnum() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/enum"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1018,6 +1013,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({FromLoadJava.KotlinSignature.class, FromLoadJava.Library.class, FromLoadJava.Modality.class, FromLoadJava.NotNull.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInFromLoadJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1230,6 +1226,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({KotlinSignature.Error.class, KotlinSignature.Propagation.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractLazyResolveByStubTest { @TestMetadata("AllBoundsInWhen.kt") public void testAllBoundsInWhen() throws Exception { @@ -1333,6 +1330,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/error") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Error extends AbstractLazyResolveByStubTest { @TestMetadata("AddingNullability.kt") public void testAddingNullability() throws Exception { @@ -1505,6 +1503,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Propagation.Parameter.class, Propagation.Return.class, Propagation.TypeParameter.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInPropagation() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1518,6 +1517,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Parameter extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1683,6 +1683,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/return") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Return extends AbstractLazyResolveByStubTest { @TestMetadata("AddNotNullJavaSubtype.kt") public void testAddNotNullJavaSubtype() throws Exception { @@ -1896,6 +1897,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeParameter extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInTypeParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation/typeParameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1957,27 +1959,13 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Propagation"); - suite.addTestSuite(Propagation.class); - suite.addTestSuite(Parameter.class); - suite.addTestSuite(Return.class); - suite.addTestSuite(TypeParameter.class); - return suite; - } } - public static Test innerSuite() { - TestSuite suite = new TestSuite("KotlinSignature"); - suite.addTestSuite(KotlinSignature.class); - suite.addTestSuite(Error.class); - suite.addTest(Propagation.innerSuite()); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Library extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/library"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2005,6 +1993,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Modality extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInModality() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/modality"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2020,6 +2009,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NotNull extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInNotNull() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fromLoadJava/notNull"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2057,20 +2047,12 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("FromLoadJava"); - suite.addTestSuite(FromLoadJava.class); - suite.addTest(KotlinSignature.innerSuite()); - suite.addTestSuite(Library.class); - suite.addTestSuite(Modality.class); - suite.addTestSuite(NotNull.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Fun.GenericWithTypeVariables.class, Fun.GenericWithoutTypeVariables.class, Fun.NonGeneric.class, Fun.Vararg.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Fun extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInFun() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2138,6 +2120,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericWithTypeVariables extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInGenericWithTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2207,6 +2190,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class GenericWithoutTypeVariables extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInGenericWithoutTypeVariables() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/genericWithoutTypeVariables"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2246,6 +2230,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NonGeneric extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInNonGeneric() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/nonGeneric"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2351,6 +2336,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun/vararg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Vararg extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInVararg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/fun/vararg"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2376,19 +2362,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Fun"); - suite.addTestSuite(Fun.class); - suite.addTestSuite(GenericWithTypeVariables.class); - suite.addTestSuite(GenericWithoutTypeVariables.class); - suite.addTestSuite(NonGeneric.class); - suite.addTestSuite(Vararg.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/inline") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inline extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInInline() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/inline"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2405,6 +2383,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Prop.DefaultAccessors.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Prop extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInProp() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2604,6 +2583,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DefaultAccessors extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInDefaultAccessors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/prop/defaultAccessors"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2671,16 +2651,11 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Prop"); - suite.addTestSuite(Prop.class); - suite.addTestSuite(DefaultAccessors.class); - return suite; - } } @TestMetadata("compiler/testData/loadJava/compiledKotlin/type") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Type extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/type"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2864,6 +2839,7 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes @TestMetadata("compiler/testData/loadJava/compiledKotlin/visibility") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLazyResolveByStubTest { public void testAllFilesPresentInVisibility() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/loadJava/compiledKotlin/visibility"), Pattern.compile("^(.+)\\.kt$"), true); @@ -2949,22 +2925,4 @@ public class LazyResolveByStubTestGenerated extends AbstractLazyResolveByStubTes } - public static Test suite() { - TestSuite suite = new TestSuite("LazyResolveByStubTestGenerated"); - suite.addTestSuite(LazyResolveByStubTestGenerated.class); - suite.addTest(Annotations.innerSuite()); - suite.addTest(Class.innerSuite()); - suite.addTestSuite(ClassFun.class); - suite.addTestSuite(ClassObject.class); - suite.addTest(Constructor.innerSuite()); - suite.addTestSuite(DataClass.class); - suite.addTestSuite(Enum.class); - suite.addTest(FromLoadJava.innerSuite()); - suite.addTest(Fun.innerSuite()); - suite.addTestSuite(Inline.class); - suite.addTest(Prop.innerSuite()); - suite.addTestSuite(Type.class); - suite.addTestSuite(Visibility.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java index 80b5063aa71..701a5552609 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.stubs; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/multiFileHighlighting") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class MultiFileHighlightingTestGenerated extends AbstractMultiFileHighlightingTest { public void testAllFilesPresentInMultiFileHighlighting() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/multiFileHighlighting"), Pattern.compile("^(.+)\\.kt$"), false); diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java index b4c4a5650d9..7babdcbc416 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.plugin.stubs; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/stubs") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class StubBuilderTestGenerated extends AbstractStubBuilderTest { public void testAllFilesPresentInStubs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/stubs"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java b/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java index 1f7797beb9f..4fa25efb7ec 100644 --- a/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/psi/JetPsiMatcherTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.psi; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,10 +31,12 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetPsiMatcherTestGenerated.Expressions.class, JetPsiMatcherTestGenerated.Types.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({Expressions.ArrayAccess.class, Expressions.BinaryExpr.class, Expressions.Call.class, Expressions.Const.class, Expressions.Misc.class, Expressions.SimpleName.class, Expressions.Super.class, Expressions.Throw.class, Expressions.UnaryExpr.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Expressions extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInExpressions() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions"), Pattern.compile("^(.+)\\.kt$"), true); @@ -40,6 +44,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/arrayAccess") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ArrayAccess extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInArrayAccess() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/arrayAccess"), Pattern.compile("^(.+)\\.kt$"), true); @@ -79,6 +84,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/binaryExpr") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BinaryExpr extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInBinaryExpr() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/binaryExpr"), Pattern.compile("^(.+)\\.kt$"), true); @@ -154,6 +160,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/call") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Call extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInCall() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/call"), Pattern.compile("^(.+)\\.kt$"), true); @@ -211,6 +218,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/const") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Const extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInConst() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/const"), Pattern.compile("^(.+)\\.kt$"), true); @@ -232,6 +240,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/misc") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Misc extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInMisc() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/misc"), Pattern.compile("^(.+)\\.kt$"), true); @@ -277,6 +286,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/simpleName") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SimpleName extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInSimpleName() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/simpleName"), Pattern.compile("^(.+)\\.kt$"), true); @@ -304,6 +314,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/super") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Super extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInSuper() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/super"), Pattern.compile("^(.+)\\.kt$"), true); @@ -361,6 +372,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/throw") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Throw extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInThrow() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/throw"), Pattern.compile("^(.+)\\.kt$"), true); @@ -382,6 +394,7 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { @TestMetadata("idea/testData/jetPsiMatcher/expressions/unaryExpr") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class UnaryExpr extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInUnaryExpr() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/expressions/unaryExpr"), Pattern.compile("^(.+)\\.kt$"), true); @@ -419,24 +432,11 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { } - public static Test innerSuite() { - TestSuite suite = new TestSuite("Expressions"); - suite.addTestSuite(Expressions.class); - suite.addTestSuite(ArrayAccess.class); - suite.addTestSuite(BinaryExpr.class); - suite.addTestSuite(Call.class); - suite.addTestSuite(Const.class); - suite.addTestSuite(Misc.class); - suite.addTestSuite(SimpleName.class); - suite.addTestSuite(Super.class); - suite.addTestSuite(Throw.class); - suite.addTestSuite(UnaryExpr.class); - return suite; - } } @TestMetadata("idea/testData/jetPsiMatcher/types") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Types extends AbstractJetPsiMatcherTest { public void testAllFilesPresentInTypes() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/jetPsiMatcher/types"), Pattern.compile("^(.+)\\.kt$"), true); @@ -510,10 +510,4 @@ public class JetPsiMatcherTestGenerated extends AbstractJetPsiMatcherTest { } - public static Test suite() { - TestSuite suite = new TestSuite("JetPsiMatcherTestGenerated"); - suite.addTest(Expressions.innerSuite()); - suite.addTestSuite(Types.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java index 5d2614ec589..69e0cbb3615 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/AdditionalLazyResolveDescriptorRendererTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/resolve/additionalLazyResolve") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class AdditionalLazyResolveDescriptorRendererTestGenerated extends AbstractAdditionalLazyResolveDescriptorRendererTest { public void testAllFilesPresentInAdditionalLazyResolve() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/additionalLazyResolve"), Pattern.compile("^(.+)\\.kt$"), true); diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java index 76a0d7184d5..777a9529a35 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/resolve/referenceInLib") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ReferenceResolveInLibrarySourcesTestGenerated extends AbstractReferenceResolveInLibrarySourcesTest { public void testAllFilesPresentInReferenceInLib() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceInLib"), Pattern.compile("^(.+)\\.kt$"), false); diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java index 55690cce833..e53effd8523 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/resolve/references") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ReferenceResolveTestGenerated.DelegatedPropertyAccessors.class, ReferenceResolveTestGenerated.ForLoopIn.class, ReferenceResolveTestGenerated.Invoke.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest { public void testAllFilesPresentInReferences() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -267,6 +270,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({DelegatedPropertyAccessors.InSource.class, DelegatedPropertyAccessors.InStandardLibrary.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DelegatedPropertyAccessors extends AbstractReferenceResolveTest { public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -280,6 +284,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inSource") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InSource extends AbstractReferenceResolveTest { public void testAllFilesPresentInInSource() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inSource"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -325,6 +330,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InStandardLibrary extends AbstractReferenceResolveTest { public void testAllFilesPresentInInStandardLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/delegatedPropertyAccessors/inStandardLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -344,18 +350,12 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest } - public static Test innerSuite() { - TestSuite suite = new TestSuite("DelegatedPropertyAccessors"); - suite.addTestSuite(DelegatedPropertyAccessors.class); - suite.addTestSuite(InSource.class); - suite.addTestSuite(InStandardLibrary.class); - return suite; - } } @TestMetadata("idea/testData/resolve/references/forLoopIn") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ForLoopIn.InBuiltIns.class, ForLoopIn.InLibrary.class, ForLoopIn.InSource.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForLoopIn extends AbstractReferenceResolveTest { public void testAllFilesPresentInForLoopIn() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -369,6 +369,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/forLoopIn/inBuiltIns") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InBuiltIns extends AbstractReferenceResolveTest { public void testAllFilesPresentInInBuiltIns() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inBuiltIns"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -390,6 +391,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/forLoopIn/inLibrary") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InLibrary extends AbstractReferenceResolveTest { public void testAllFilesPresentInInLibrary() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/forLoopIn/inLibrary"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -405,6 +407,7 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/forLoopIn/inSource") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InSource extends AbstractReferenceResolveTest { @TestMetadata("allExtensions.kt") public void testAllExtensions() throws Exception { @@ -430,18 +433,11 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest } - public static Test innerSuite() { - TestSuite suite = new TestSuite("ForLoopIn"); - suite.addTestSuite(ForLoopIn.class); - suite.addTestSuite(InBuiltIns.class); - suite.addTestSuite(InLibrary.class); - suite.addTestSuite(InSource.class); - return suite; - } } @TestMetadata("idea/testData/resolve/references/invoke") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Invoke extends AbstractReferenceResolveTest { public void testAllFilesPresentInInvoke() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/references/invoke"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -503,12 +499,4 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest } - public static Test suite() { - TestSuite suite = new TestSuite("ReferenceResolveTestGenerated"); - suite.addTestSuite(ReferenceResolveTestGenerated.class); - suite.addTest(DelegatedPropertyAccessors.innerSuite()); - suite.addTest(ForLoopIn.innerSuite()); - suite.addTestSuite(Invoke.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java index 85f648c645d..0889370601d 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/resolve/referenceWithLib") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ReferenceResolveWithLibTestGenerated extends AbstractReferenceResolveWithLibTest { public void testAllFilesPresentInReferenceWithLib() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceWithLib"), Pattern.compile("^(.+)\\.kt$"), false); diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java index 9345bb962c0..0672f4bea4f 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -30,6 +32,7 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/resolve/referenceToJavaWithWrongFileStructure") @TestDataPath("$PROJECT_ROOT") +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ReferenceToJavaWithWrongFileStructureTestGenerated extends AbstractReferenceToJavaWithWrongFileStructureTest { public void testAllFilesPresentInReferenceToJavaWithWrongFileStructure() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/resolve/referenceToJavaWithWrongFileStructure"), Pattern.compile("^(.+)\\.kt$"), false); diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java index 0d92248d132..9c57acfa0d5 100644 --- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.safeDelete; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -29,9 +31,11 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({JetSafeDeleteTestGenerated.KotlinClass.class, JetSafeDeleteTestGenerated.KotlinObject.class, JetSafeDeleteTestGenerated.KotlinFunction.class, JetSafeDeleteTestGenerated.KotlinFunctionWithJava.class, JetSafeDeleteTestGenerated.JavaFunctionWithKotlin.class, JetSafeDeleteTestGenerated.KotlinProperty.class, JetSafeDeleteTestGenerated.KotlinPropertyWithJava.class, JetSafeDeleteTestGenerated.JavaPropertyWithKotlin.class, JetSafeDeleteTestGenerated.KotlinTypeParameter.class, JetSafeDeleteTestGenerated.KotlinTypeParameterWithJava.class, JetSafeDeleteTestGenerated.KotlinValueParameter.class, JetSafeDeleteTestGenerated.KotlinValueParameterWithJava.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinClass extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinClass() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteClass/kotlinClass"), Pattern.compile("^(.+)\\.kt$"), true); @@ -107,6 +111,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteObject/kotlinObject") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinObject extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinObject() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteObject/kotlinObject"), Pattern.compile("^(.+)\\.kt$"), true); @@ -170,6 +175,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunction") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinFunction extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinFunction() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunction"), Pattern.compile("^(.+)\\.kt$"), true); @@ -281,6 +287,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinFunctionWithJava extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinFunctionWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/kotlinFunctionWithJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -350,6 +357,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaFunctionWithKotlin extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInJavaFunctionWithKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteFunction/javaFunctionWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); @@ -371,6 +379,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinProperty") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinProperty extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinProperty() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinProperty"), Pattern.compile("^(.+)\\.kt$"), true); @@ -512,6 +521,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinPropertyWithJava extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinPropertyWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/kotlinPropertyWithJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -587,6 +597,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class JavaPropertyWithKotlin extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInJavaPropertyWithKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteProperty/javaPropertyWithKotlin"), Pattern.compile("^(.+)\\.kt$"), true); @@ -632,6 +643,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinTypeParameter extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinTypeParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -737,6 +749,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinTypeParameterWithJava extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinTypeParameterWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteTypeParameter/kotlinTypeParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -848,6 +861,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinValueParameter extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinValueParameter() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameter"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1043,6 +1057,7 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinValueParameterWithJava extends AbstractJetSafeDeleteTest { public void testAllFilesPresentInKotlinValueParameterWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/safeDelete/deleteValueParameter/kotlinValueParameterWithJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -1212,20 +1227,4 @@ public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { } - public static Test suite() { - TestSuite suite = new TestSuite("JetSafeDeleteTestGenerated"); - suite.addTestSuite(KotlinClass.class); - suite.addTestSuite(KotlinObject.class); - suite.addTestSuite(KotlinFunction.class); - suite.addTestSuite(KotlinFunctionWithJava.class); - suite.addTestSuite(JavaFunctionWithKotlin.class); - suite.addTestSuite(KotlinProperty.class); - suite.addTestSuite(KotlinPropertyWithJava.class); - suite.addTestSuite(JavaPropertyWithKotlin.class); - suite.addTestSuite(KotlinTypeParameter.class); - suite.addTestSuite(KotlinTypeParameterWithJava.class); - suite.addTestSuite(KotlinValueParameter.class); - suite.addTestSuite(KotlinValueParameterWithJava.class); - return suite; - } } diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java index 3ae1e2e4eb9..50a8037c0c7 100644 --- a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.shortenRefs; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("idea/testData/shortenRefs") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({ShortenRefsTestGenerated.Constructor.class, ShortenRefsTestGenerated.Imports.class, ShortenRefsTestGenerated.Java.class, ShortenRefsTestGenerated.Type.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { public void testAllFilesPresentInShortenRefs() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -56,6 +59,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @TestMetadata("idea/testData/shortenRefs/constructor") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructor extends AbstractShortenRefsTest { public void testAllFilesPresentInConstructor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/constructor"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -149,6 +153,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @TestMetadata("idea/testData/shortenRefs/imports") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Imports extends AbstractShortenRefsTest { public void testAllFilesPresentInImports() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/imports"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -176,6 +181,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @TestMetadata("idea/testData/shortenRefs/java") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Java extends AbstractShortenRefsTest { public void testAllFilesPresentInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/java"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -233,6 +239,7 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { @TestMetadata("idea/testData/shortenRefs/type") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Type extends AbstractShortenRefsTest { public void testAllFilesPresentInType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/shortenRefs/type"), Pattern.compile("^([^\\.]+)\\.kt$"), true); @@ -342,13 +349,4 @@ public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { } - public static Test suite() { - TestSuite suite = new TestSuite("ShortenRefsTestGenerated"); - suite.addTestSuite(ShortenRefsTestGenerated.class); - suite.addTestSuite(Constructor.class); - suite.addTestSuite(Imports.class); - suite.addTestSuite(Java.class); - suite.addTestSuite(Type.class); - return suite; - } } diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java index d53ac340b86..e76ced91f30 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.j2k.test; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("j2k/tests/testData/ast") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({JavaToKotlinConverterTestGenerated.Annotations.class, JavaToKotlinConverterTestGenerated.AnonymousBlock.class, JavaToKotlinConverterTestGenerated.ArrayAccessExpression.class, JavaToKotlinConverterTestGenerated.ArrayInitializerExpression.class, JavaToKotlinConverterTestGenerated.ArrayType.class, JavaToKotlinConverterTestGenerated.AssertStatement.class, JavaToKotlinConverterTestGenerated.AssignmentExpression.class, JavaToKotlinConverterTestGenerated.BinaryExpression.class, JavaToKotlinConverterTestGenerated.Blocks.class, JavaToKotlinConverterTestGenerated.BoxedType.class, JavaToKotlinConverterTestGenerated.BreakStatement.class, JavaToKotlinConverterTestGenerated.CallChainExpression.class, JavaToKotlinConverterTestGenerated.Class.class, JavaToKotlinConverterTestGenerated.ClassExpression.class, JavaToKotlinConverterTestGenerated.Comments.class, JavaToKotlinConverterTestGenerated.ConditionalExpression.class, JavaToKotlinConverterTestGenerated.Constructors.class, JavaToKotlinConverterTestGenerated.ContinueStatement.class, JavaToKotlinConverterTestGenerated.DeclarationStatement.class, JavaToKotlinConverterTestGenerated.DoWhileStatement.class, JavaToKotlinConverterTestGenerated.Enum.class, JavaToKotlinConverterTestGenerated.Equals.class, JavaToKotlinConverterTestGenerated.Field.class, JavaToKotlinConverterTestGenerated.For.class, JavaToKotlinConverterTestGenerated.ForeachStatement.class, JavaToKotlinConverterTestGenerated.Formatting.class, JavaToKotlinConverterTestGenerated.Function.class, JavaToKotlinConverterTestGenerated.Identifier.class, JavaToKotlinConverterTestGenerated.IfStatement.class, JavaToKotlinConverterTestGenerated.ImportStatement.class, JavaToKotlinConverterTestGenerated.InProjectionType.class, JavaToKotlinConverterTestGenerated.Inheritance.class, JavaToKotlinConverterTestGenerated.IsOperator.class, JavaToKotlinConverterTestGenerated.Issues.class, JavaToKotlinConverterTestGenerated.KotlinApiAccess.class, JavaToKotlinConverterTestGenerated.LabelStatement.class, JavaToKotlinConverterTestGenerated.List.class, JavaToKotlinConverterTestGenerated.LiteralExpression.class, JavaToKotlinConverterTestGenerated.LocalVariable.class, JavaToKotlinConverterTestGenerated.MethodCallExpression.class, JavaToKotlinConverterTestGenerated.Misc.class, JavaToKotlinConverterTestGenerated.NewClassExpression.class, JavaToKotlinConverterTestGenerated.Nullability.class, JavaToKotlinConverterTestGenerated.ObjectLiteral.class, JavaToKotlinConverterTestGenerated.OutProjectionType.class, JavaToKotlinConverterTestGenerated.PackageStatement.class, JavaToKotlinConverterTestGenerated.ParenthesizedExpression.class, JavaToKotlinConverterTestGenerated.PolyadicExpression.class, JavaToKotlinConverterTestGenerated.PostfixOperator.class, JavaToKotlinConverterTestGenerated.PrefixOperator.class, JavaToKotlinConverterTestGenerated.RawGenerics.class, JavaToKotlinConverterTestGenerated.ReturnStatement.class, JavaToKotlinConverterTestGenerated.Settings.class, JavaToKotlinConverterTestGenerated.StarProjectionType.class, JavaToKotlinConverterTestGenerated.StaticMembers.class, JavaToKotlinConverterTestGenerated.SuperExpression.class, JavaToKotlinConverterTestGenerated.Switch.class, JavaToKotlinConverterTestGenerated.SynchronizedStatement.class, JavaToKotlinConverterTestGenerated.ThisExpression.class, JavaToKotlinConverterTestGenerated.ThrowStatement.class, JavaToKotlinConverterTestGenerated.ToKotlinClasses.class, JavaToKotlinConverterTestGenerated.Trait.class, JavaToKotlinConverterTestGenerated.TryStatement.class, JavaToKotlinConverterTestGenerated.TryWithResource.class, JavaToKotlinConverterTestGenerated.TypeCastExpression.class, JavaToKotlinConverterTestGenerated.TypeParameters.class, JavaToKotlinConverterTestGenerated.VarArg.class, JavaToKotlinConverterTestGenerated.WhileStatement.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInAst() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast"), Pattern.compile("^(.+)\\.java$"), true); @@ -38,6 +41,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/annotations") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInAnnotations() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/annotations"), Pattern.compile("^(.+)\\.java$"), true); @@ -89,6 +93,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/anonymousBlock") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AnonymousBlock extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInAnonymousBlock() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/anonymousBlock"), Pattern.compile("^(.+)\\.java$"), true); @@ -110,6 +115,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/arrayAccessExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ArrayAccessExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInArrayAccessExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayAccessExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -137,6 +143,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/arrayInitializerExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ArrayInitializerExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInArrayInitializerExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayInitializerExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -218,6 +225,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/arrayType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ArrayType extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInArrayType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/arrayType"), Pattern.compile("^(.+)\\.java$"), true); @@ -287,6 +295,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/assertStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AssertStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInAssertStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assertStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -320,6 +329,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/assignmentExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class AssignmentExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInAssignmentExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/assignmentExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -419,6 +429,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/binaryExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BinaryExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInBinaryExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/binaryExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -536,6 +547,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/blocks") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Blocks extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInBlocks() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/blocks"), Pattern.compile("^(.+)\\.java$"), true); @@ -551,6 +563,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/boxedType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BoxedType extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInBoxedType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/boxedType"), Pattern.compile("^(.+)\\.java$"), true); @@ -626,6 +639,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/breakStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class BreakStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInBreakStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/breakStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -647,6 +661,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/callChainExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CallChainExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInCallChainExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/callChainExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -692,6 +707,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/class") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Class extends AbstractJavaToKotlinConverterTest { @TestMetadata("abstractClass.java") public void testAbstractClass() throws Exception { @@ -869,6 +885,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/classExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ClassExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInClassExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/classExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -902,6 +919,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/comments") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Comments extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInComments() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/comments"), Pattern.compile("^(.+)\\.java$"), true); @@ -941,6 +959,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/conditionalExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ConditionalExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInConditionalExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -962,6 +981,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/constructors") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Constructors extends AbstractJavaToKotlinConverterTest { @TestMetadata("allCallsPrimary.java") public void testAllCallsPrimary() throws Exception { @@ -1193,6 +1213,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/continueStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ContinueStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInContinueStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/continueStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -1214,6 +1235,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/declarationStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DeclarationStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInDeclarationStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/declarationStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -1259,6 +1281,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/doWhileStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class DoWhileStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInDoWhileStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/doWhileStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -1292,6 +1315,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/enum") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Enum extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInEnum() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/enum"), Pattern.compile("^(.+)\\.java$"), true); @@ -1391,6 +1415,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/equals") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Equals extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInEquals() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/equals"), Pattern.compile("^(.+)\\.java$"), true); @@ -1430,6 +1455,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/field") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Field extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInField() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/field"), Pattern.compile("^(.+)\\.java$"), true); @@ -1511,6 +1537,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/for") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class For extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInFor() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/for"), Pattern.compile("^(.+)\\.java$"), true); @@ -1628,6 +1655,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/foreachStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ForeachStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInForeachStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/foreachStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -1667,6 +1695,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/formatting") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Formatting extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInFormatting() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/formatting"), Pattern.compile("^(.+)\\.java$"), true); @@ -1700,6 +1729,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/function") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Function extends AbstractJavaToKotlinConverterTest { @TestMetadata("abstractMethod.java") public void testAbstractMethod() throws Exception { @@ -1883,6 +1913,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/identifier") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Identifier extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInIdentifier() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/identifier"), Pattern.compile("^(.+)\\.java$"), true); @@ -1910,6 +1941,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/ifStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IfStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInIfStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -1955,6 +1987,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/importStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ImportStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInImportStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/importStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -1994,6 +2027,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/inProjectionType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class InProjectionType extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInInProjectionType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inProjectionType"), Pattern.compile("^(.+)\\.java$"), true); @@ -2009,6 +2043,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/inheritance") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Inheritance extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInInheritance() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/inheritance"), Pattern.compile("^(.+)\\.java$"), true); @@ -2042,6 +2077,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/isOperator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class IsOperator extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInIsOperator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/isOperator"), Pattern.compile("^(.+)\\.java$"), true); @@ -2063,6 +2099,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/issues") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Issues extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInIssues() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/issues"), Pattern.compile("^(.+)\\.java$"), true); @@ -2294,6 +2331,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/kotlinApiAccess") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class KotlinApiAccess extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInKotlinApiAccess() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/kotlinApiAccess"), Pattern.compile("^(.+)\\.java$"), true); @@ -2381,6 +2419,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/labelStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LabelStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInLabelStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/labelStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -2396,6 +2435,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/list") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class List extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInList() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/list"), Pattern.compile("^(.+)\\.java$"), true); @@ -2417,6 +2457,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/literalExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LiteralExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInLiteralExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/literalExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -2462,6 +2503,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/localVariable") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class LocalVariable extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInLocalVariable() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/localVariable"), Pattern.compile("^(.+)\\.java$"), true); @@ -2525,6 +2567,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/methodCallExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class MethodCallExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInMethodCallExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/methodCallExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -2582,6 +2625,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/misc") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Misc extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInMisc() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/misc"), Pattern.compile("^(.+)\\.java$"), true); @@ -2627,6 +2671,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/newClassExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class NewClassExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInNewClassExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/newClassExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -2714,6 +2759,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/nullability") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Nullability extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInNullability() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/nullability"), Pattern.compile("^(.+)\\.java$"), true); @@ -2903,6 +2949,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/objectLiteral") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ObjectLiteral extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInObjectLiteral() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/objectLiteral"), Pattern.compile("^(.+)\\.java$"), true); @@ -2918,6 +2965,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/outProjectionType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class OutProjectionType extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInOutProjectionType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/outProjectionType"), Pattern.compile("^(.+)\\.java$"), true); @@ -2933,6 +2981,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/packageStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PackageStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInPackageStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/packageStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -2948,6 +2997,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/parenthesizedExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ParenthesizedExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInParenthesizedExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/parenthesizedExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -2969,6 +3019,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/polyadicExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PolyadicExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInPolyadicExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/polyadicExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -3014,6 +3065,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/postfixOperator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PostfixOperator extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInPostfixOperator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/postfixOperator"), Pattern.compile("^(.+)\\.java$"), true); @@ -3035,6 +3087,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/prefixOperator") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PrefixOperator extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInPrefixOperator() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/prefixOperator"), Pattern.compile("^(.+)\\.java$"), true); @@ -3080,6 +3133,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/rawGenerics") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class RawGenerics extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInRawGenerics() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/rawGenerics"), Pattern.compile("^(.+)\\.java$"), true); @@ -3113,6 +3167,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/returnStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ReturnStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInReturnStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/returnStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -3152,6 +3207,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/settings") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Settings extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInSettings() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/settings"), Pattern.compile("^(.+)\\.java$"), true); @@ -3185,6 +3241,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/starProjectionType") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StarProjectionType extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInStarProjectionType() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/starProjectionType"), Pattern.compile("^(.+)\\.java$"), true); @@ -3200,6 +3257,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/staticMembers") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class StaticMembers extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInStaticMembers() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/staticMembers"), Pattern.compile("^(.+)\\.java$"), true); @@ -3239,6 +3297,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/superExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SuperExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInSuperExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/superExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -3266,6 +3325,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/switch") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Switch extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInSwitch() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/switch"), Pattern.compile("^(.+)\\.java$"), true); @@ -3341,6 +3401,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/synchronizedStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class SynchronizedStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInSynchronizedStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/synchronizedStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -3356,6 +3417,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/thisExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ThisExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInThisExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/thisExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -3377,6 +3439,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/throwStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ThrowStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInThrowStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/throwStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -3392,6 +3455,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/toKotlinClasses") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class ToKotlinClasses extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInToKotlinClasses() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/toKotlinClasses"), Pattern.compile("^(.+)\\.java$"), true); @@ -3425,6 +3489,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/trait") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class Trait extends AbstractJavaToKotlinConverterTest { @TestMetadata("abstactInterface.java") public void testAbstactInterface() throws Exception { @@ -3500,6 +3565,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/tryStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInTryStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -3539,6 +3605,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/tryWithResource") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TryWithResource extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInTryWithResource() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/tryWithResource"), Pattern.compile("^(.+)\\.java$"), true); @@ -3608,6 +3675,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/typeCastExpression") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeCastExpression extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInTypeCastExpression() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeCastExpression"), Pattern.compile("^(.+)\\.java$"), true); @@ -3665,6 +3733,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/typeParameters") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class TypeParameters extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInTypeParameters() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/typeParameters"), Pattern.compile("^(.+)\\.java$"), true); @@ -3764,6 +3833,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/varArg") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class VarArg extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInVarArg() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/varArg"), Pattern.compile("^(.+)\\.java$"), true); @@ -3785,6 +3855,7 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv @TestMetadata("j2k/tests/testData/ast/whileStatement") @TestDataPath("$PROJECT_ROOT") + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class WhileStatement extends AbstractJavaToKotlinConverterTest { public void testAllFilesPresentInWhileStatement() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/tests/testData/ast/whileStatement"), Pattern.compile("^(.+)\\.java$"), true); @@ -3816,77 +3887,4 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv } - public static Test suite() { - TestSuite suite = new TestSuite("JavaToKotlinConverterTestGenerated"); - suite.addTestSuite(JavaToKotlinConverterTestGenerated.class); - suite.addTestSuite(Annotations.class); - suite.addTestSuite(AnonymousBlock.class); - suite.addTestSuite(ArrayAccessExpression.class); - suite.addTestSuite(ArrayInitializerExpression.class); - suite.addTestSuite(ArrayType.class); - suite.addTestSuite(AssertStatement.class); - suite.addTestSuite(AssignmentExpression.class); - suite.addTestSuite(BinaryExpression.class); - suite.addTestSuite(Blocks.class); - suite.addTestSuite(BoxedType.class); - suite.addTestSuite(BreakStatement.class); - suite.addTestSuite(CallChainExpression.class); - suite.addTestSuite(Class.class); - suite.addTestSuite(ClassExpression.class); - suite.addTestSuite(Comments.class); - suite.addTestSuite(ConditionalExpression.class); - suite.addTestSuite(Constructors.class); - suite.addTestSuite(ContinueStatement.class); - suite.addTestSuite(DeclarationStatement.class); - suite.addTestSuite(DoWhileStatement.class); - suite.addTestSuite(Enum.class); - suite.addTestSuite(Equals.class); - suite.addTestSuite(Field.class); - suite.addTestSuite(For.class); - suite.addTestSuite(ForeachStatement.class); - suite.addTestSuite(Formatting.class); - suite.addTestSuite(Function.class); - suite.addTestSuite(Identifier.class); - suite.addTestSuite(IfStatement.class); - suite.addTestSuite(ImportStatement.class); - suite.addTestSuite(InProjectionType.class); - suite.addTestSuite(Inheritance.class); - suite.addTestSuite(IsOperator.class); - suite.addTestSuite(Issues.class); - suite.addTestSuite(KotlinApiAccess.class); - suite.addTestSuite(LabelStatement.class); - suite.addTestSuite(List.class); - suite.addTestSuite(LiteralExpression.class); - suite.addTestSuite(LocalVariable.class); - suite.addTestSuite(MethodCallExpression.class); - suite.addTestSuite(Misc.class); - suite.addTestSuite(NewClassExpression.class); - suite.addTestSuite(Nullability.class); - suite.addTestSuite(ObjectLiteral.class); - suite.addTestSuite(OutProjectionType.class); - suite.addTestSuite(PackageStatement.class); - suite.addTestSuite(ParenthesizedExpression.class); - suite.addTestSuite(PolyadicExpression.class); - suite.addTestSuite(PostfixOperator.class); - suite.addTestSuite(PrefixOperator.class); - suite.addTestSuite(RawGenerics.class); - suite.addTestSuite(ReturnStatement.class); - suite.addTestSuite(Settings.class); - suite.addTestSuite(StarProjectionType.class); - suite.addTestSuite(StaticMembers.class); - suite.addTestSuite(SuperExpression.class); - suite.addTestSuite(Switch.class); - suite.addTestSuite(SynchronizedStatement.class); - suite.addTestSuite(ThisExpression.class); - suite.addTestSuite(ThrowStatement.class); - suite.addTestSuite(ToKotlinClasses.class); - suite.addTestSuite(Trait.class); - suite.addTestSuite(TryStatement.class); - suite.addTestSuite(TryWithResource.class); - suite.addTestSuite(TypeCastExpression.class); - suite.addTestSuite(TypeParameters.class); - suite.addTestSuite(VarArg.class); - suite.addTestSuite(WhileStatement.class); - return suite; - } } diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 4e0ca0824ac..8dc9e5b2174 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jps.build; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("jps-plugin/testData/incremental") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testAllFilesPresentInIncremental() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); @@ -39,6 +42,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/circularDependency") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CircularDependency extends AbstractIncrementalJpsTest { public void testAllFilesPresentInCircularDependency() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/circularDependency"), Pattern.compile("^([^\\.]+)$"), true); @@ -50,16 +54,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CircularDependency"); - suite.addTestSuite(CircularDependency.class); - return suite; - } } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { @@ -287,18 +287,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("PureKotlin"); - suite.addTestSuite(PureKotlin.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("IncrementalJpsTestGenerated"); - suite.addTestSuite(IncrementalJpsTestGenerated.class); - suite.addTest(CircularDependency.innerSuite()); - suite.addTest(PureKotlin.innerSuite()); - return suite; - } }