From 94df191f8600332d0aadf9f78683e50054a5ed0e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 10 Apr 2015 02:38:23 +0300 Subject: [PATCH] Regenerate tests --- .../asJava/KotlinLightClassTestGenerated.java | 5 - .../kotlin/cfg/ControlFlowTestGenerated.java | 22 -- .../kotlin/cfg/DataFlowTestGenerated.java | 6 - .../kotlin/cfg/PseudoValueTestGenerated.java | 31 --- .../checkers/JetDiagnosticsTestGenerated.java | 190 ------------------ ...sStdLibAndBackendCompilationGenerated.java | 4 - ...tDiagnosticsTestWithJsStdLibGenerated.java | 14 -- ...JetDiagnosticsTestWithStdLibGenerated.java | 27 --- .../cli/KotlincExecutableTestGenerated.java | 5 - .../codegen/BytecodeTextTestGenerated.java | 19 -- ...CheckLocalVariablesTableTestGenerated.java | 1 - .../codegen/LineNumberTestGenerated.java | 5 - .../codegen/ScriptCodegenTestGenerated.java | 1 - ...opLevelMembersInvocationTestGenerated.java | 1 - ...faultArgumentsReflectionTestGenerated.java | 1 - .../flags/WriteFlagsTestGenerated.java | 39 ---- ...ackBoxAgainstJavaCodegenTestGenerated.java | 33 --- .../BlackBoxCodegenTestGenerated.java | 125 ------------ .../BlackBoxInlineCodegenTestGenerated.java | 32 --- ...BlackBoxMultiFileCodegenTestGenerated.java | 1 - .../BlackBoxWithJavaCodegenTestGenerated.java | 24 --- ...lackBoxWithStdlibCodegenTestGenerated.java | 78 ------- ...CompileJavaAgainstKotlinTestGenerated.java | 16 -- ...otlinAgainstInlineKotlinTestGenerated.java | 32 --- ...mpileKotlinAgainstKotlinTestGenerated.java | 1 - .../jvm/compiler/LoadJavaTestGenerated.java | 116 ----------- .../compiler/WriteSignatureTestGenerated.java | 6 - ...mRuntimeDescriptorLoaderTestGenerated.java | 80 -------- .../xml/ModuleXmlParserTestGenerated.java | 1 - .../parsing/JetParsingTestGenerated.java | 40 ---- .../DescriptorRendererTestGenerated.java | 1 - .../repl/ReplInterpreterTestGenerated.java | 9 - .../kotlin/resolve/ResolveTestGenerated.java | 9 - .../AnnotationParameterTestGenerated.java | 4 - .../calls/ResolvedCallsTestGenerated.java | 21 -- ...structorDelegationCallsTestsGenerated.java | 1 - .../EvaluateExpressionTestGenerated.java | 6 - .../ConstraintSystemTestGenerated.java | 8 - .../LocalClassProtoTestGenerated.java | 1 - .../types/JetTypeBindingTestGenerated.java | 5 - .../addImport/AddImportTestGenerated.java | 1 - .../checkers/JetJsCheckerTestGenerated.java | 1 - .../checkers/JetPsiCheckerTestGenerated.java | 14 -- ...edKotlinInJavaCompletionTestGenerated.java | 3 - .../DataFlowValueRenderingTestGenerated.java | 1 - .../JSBasicCompletionTestGenerated.java | 12 -- .../JvmBasicCompletionTestGenerated.java | 12 -- .../JvmSmartCompletionTestGenerated.java | 19 -- ...vmWithLibBasicCompletionTestGenerated.java | 1 - .../KeywordCompletionTestGenerated.java | 1 - ...inSourceInJavaCompletionTestGenerated.java | 3 - ...tiFileJvmBasicCompletionTestGenerated.java | 1 - ...MultiFileSmartCompletionTestGenerated.java | 1 - .../BasicCompletionHandlerTestGenerated.java | 4 - .../CompletionCharFilterTestGenerated.java | 1 - ...KeywordCompletionHandlerTestGenerated.java | 1 - .../SmartCompletionHandlerTestGenerated.java | 1 - .../BasicCompletionWeigherTestGenerated.java | 1 - .../SmartCompletionWeigherTestGenerated.java | 1 - .../JetFindUsagesTestGenerated.java | 27 --- .../formatter/JetFormatterTestGenerated.java | 11 - ...JetTypingIndentationTestBaseGenerated.java | 10 - .../ExpressionSelectionTestGenerated.java | 1 - .../idea/SmartSelectionTestGenerated.java | 1 - .../InsertImportOnPasteTestGenerated.java | 5 - .../JetInspectionTestGenerated.java | 5 - .../codeInsight/LineMarkersTestGenerated.java | 5 - .../OutOfBlockModificationTestGenerated.java | 1 - .../moveUpDown/CodeMoverTestGenerated.java | 24 --- .../SurroundWithTestGenerated.java | 30 --- .../unwrap/UnwrapRemoveTestGenerated.java | 14 -- ...ureProjectByChangingFileTestGenerated.java | 10 - ...otlinCopyPasteConversionTestGenerated.java | 1 - ...otlinCoverageOutputFilesTestGenerated.java | 1 - .../JetPositionManagerTestGenerated.java | 5 - .../debugger/KotlinSteppingTestGenerated.java | 7 - .../debugger/SmartStepIntoTestGenerated.java | 1 - ...ragmentCompletionHandlerTestGenerated.java | 1 - .../CodeFragmentCompletionTestGenerated.java | 4 - ...CodeFragmentHighlightingTestGenerated.java | 5 - ...KotlinEvaluateExpressionTestGenerated.java | 15 -- ...ectExpressionForDebuggerTestGenerated.java | 5 - .../NavigateToLibrarySourceTestGenerated.java | 5 - .../ClsStubBuilderTestGenerated.java | 1 - .../DecompiledTextTestGenerated.java | 3 - .../JetQuickDocProviderTestGenerated.java | 1 - .../folding/KotlinFoldingTestGenerated.java | 5 - .../hierarchy/HierarchyTestGenerated.java | 9 - .../DiagnosticMessageJsTestGenerated.java | 1 - .../DiagnosticMessageTestGenerated.java | 1 - .../HighlightExitPointsTestGenerated.java | 1 - .../HighlightingTestGenerated.java | 4 - .../imports/OptimizeImportsTestGenerated.java | 4 - .../intentions/IntentionTestGenerated.java | 103 ---------- .../declarations/JoinLinesTestGenerated.java | 6 - .../kdoc/KDocCompletionTestGenerated.java | 1 - .../kdoc/KDocHighlightingTestGenerated.java | 1 - .../idea/kdoc/KdocResolveTestGenerated.java | 1 - .../navigation/GotoSuperTestGenerated.java | 1 - ...KotlinGotoImplementationTestGenerated.java | 1 - .../navigation/KotlinGotoTestGenerated.java | 5 - .../FunctionParameterInfoTestGenerated.java | 1 - .../QuickFixMultiFileTestGenerated.java | 72 ------- .../idea/quickfix/QuickFixTestGenerated.java | 117 ----------- .../inline/InlineTestGenerated.java | 7 - .../introduce/JetExtractionTestGenerated.java | 42 ---- .../move/JetMoveTestGenerated.java | 1 - .../rename/RenameTestGenerated.java | 1 - ...esolveDescriptorRendererTestGenerated.java | 1 - .../PartialBodyResolveTestGenerated.java | 1 - .../ReferenceResolveInJavaTestGenerated.java | 1 - ...eResolveInLibrarySourcesTestGenerated.java | 1 - .../ReferenceResolveTestGenerated.java | 15 -- .../ReferenceResolveWithLibTestGenerated.java | 1 - ...vaWithWrongFileStructureTestGenerated.java | 1 - .../KotlinFileStructureTestGenerated.java | 1 - .../MultiFileHighlightingTestGenerated.java | 1 - .../stubs/ResolveByStubTestGenerated.java | 56 ------ .../idea/stubs/StubBuilderTestGenerated.java | 1 - .../JavaTypeSubstitutorTestGenerated.java | 1 - .../JetPsiUnifierTestGenerated.java | 34 ---- .../JetSafeDeleteTestGenerated.java | 16 -- .../shortenRefs/ShortenRefsTestGenerated.java | 8 - ...otlinConverterForWebDemoTestGenerated.java | 74 ------- ...KotlinConverterMultiFileTestGenerated.java | 1 - ...otlinConverterSingleFileTestGenerated.java | 74 ------- .../build/IncrementalJpsTestGenerated.java | 24 --- .../test/semantics/BridgeTestGenerated.java | 4 - .../CompanionObjectTestGenerated.java | 1 - .../test/semantics/DynamicTestGenerated.java | 1 - .../InlineJsStdlibTestGenerated.java | 1 - .../test/semantics/InlineJsTestGenerated.java | 1 - .../test/semantics/JsCodeTestGenerated.java | 1 - .../js/test/semantics/LabelTestGenerated.java | 1 - .../semantics/MultiModuleTestGenerated.java | 1 - .../semantics/ReservedWordTestGenerated.java | 1 - .../android/test/AndroidBoxTestGenerated.java | 5 - .../AndroidBytecodeShapeTestGenerated.java | 1 - .../AndroidXml2KConversionTestGenerated.java | 5 - .../AndroidCompletionTestGenerated.java | 1 - .../AndroidFindUsagesTestGenerated.java | 1 - .../android/AndroidGotoTestGenerated.java | 1 - .../android/AndroidRenameTestGenerated.java | 1 - .../ParserResultEqualityTestGenerated.java | 1 - .../android/AndroidJpsTestCaseGenerated.java | 1 - 145 files changed, 2025 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java index 27323abf858..ea7210c8ddd 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.asJava; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,10 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/asJava/lightClasses") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - KotlinLightClassTestGenerated.Delegation.class, - KotlinLightClassTestGenerated.NullabilityAnnotations.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest { public void testAllFilesPresentInLightClasses() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java index b64e607b845..0dbe933099c 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,19 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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.SecondaryConstructors.class, - ControlFlowTestGenerated.TailCalls.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ControlFlowTestGenerated extends AbstractControlFlowTest { public void testAllFilesPresentInCfg() throws Exception { @@ -303,14 +289,6 @@ 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(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractControlFlowTest { public void testAllFilesPresentInDeclarations() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java index 2270c5b33ba..5d7f1b73afa 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,11 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/cfg-variables") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - DataFlowTestGenerated.Basic.class, - DataFlowTestGenerated.Bugs.class, - DataFlowTestGenerated.LexicalScopes.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class DataFlowTestGenerated extends AbstractDataFlowTest { public void testAllFilesPresentInCfg_variables() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java index a1fec86701d..3db0b299ea4 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,27 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - PseudoValueTestGenerated.Cfg.class, - PseudoValueTestGenerated.Cfg_variables.class, -}) @RunWith(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.SecondaryConstructors.class, - Cfg.TailCalls.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Cfg extends AbstractPseudoValueTest { public void testAllFilesPresentInCfg() throws Exception { @@ -309,14 +291,6 @@ 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(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractPseudoValueTest { public void testAllFilesPresentInDeclarations() throws Exception { @@ -711,11 +685,6 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { @TestMetadata("compiler/testData/cfg-variables") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Cfg_variables.Basic.class, - Cfg_variables.Bugs.class, - Cfg_variables.LexicalScopes.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Cfg_variables extends AbstractPseudoValueTest { public void testAllFilesPresentInCfg_variables() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java index c6d624af324..9be45be4394 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,80 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetDiagnosticsTestGenerated.Tests.class, - JetDiagnosticsTestGenerated.Script.class, - JetDiagnosticsTestGenerated.Diagnostics.class, -}) @RunWith(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.DynamicTypes.class, - Tests.Enum.class, - Tests.Evaluate.class, - Tests.Extensions.class, - Tests.FunctionAsExpression.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.Modifiers.class, - Tests.Multimodule.class, - Tests.NamedArguments.class, - Tests.NullabilityAndSmartCasts.class, - Tests.NullableTypes.class, - Tests.Numbers.class, - Tests.Objects.class, - Tests.OperatorsOverloading.class, - Tests.Overload.class, - Tests.Override.class, - Tests.PlatformTypes.class, - Tests.Recovery.class, - Tests.Redeclarations.class, - Tests.Regressions.class, - Tests.Resolve.class, - Tests.Scopes.class, - Tests.SecondaryConstructors.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.Variance.class, - Tests.When.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Tests extends AbstractJetDiagnosticsTest { @TestMetadata("Abstract.kt") @@ -650,9 +579,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/annotations") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Annotations.AnnotationParameterMustBeConstant.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInAnnotations() throws Exception { @@ -1046,10 +972,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/cast") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Cast.Bare.class, - Cast.NeverSucceeds.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Cast extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInCast() throws Exception { @@ -1629,10 +1551,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ControlFlowAnalysis.DeadCode.class, - ControlFlowAnalysis.DefiniteReturn.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ControlFlowAnalysis extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInControlFlowAnalysis() throws Exception { @@ -2449,10 +2367,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlow") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DataFlow.Assignment.class, - DataFlow.Local.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DataFlow extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDataFlow() throws Exception { @@ -2606,9 +2520,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DataFlowInfoTraversal.Smartcasts.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DataFlowInfoTraversal extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception { @@ -2951,9 +2862,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DeclarationChecks.MultiDeclarations.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DeclarationChecks extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDeclarationChecks() throws Exception { @@ -3176,9 +3084,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DelegatedProperty.Inference.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractJetDiagnosticsTest { @TestMetadata("absentErrorAboutInitializer.kt") @@ -3593,15 +3498,6 @@ 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.Synthesized.class, - DuplicateJvmSignature.TraitImpl.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { @@ -4127,9 +4023,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/enum") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Enum.Inner.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Enum extends AbstractJetDiagnosticsTest { @TestMetadata("AbstractEnum.kt") @@ -4733,9 +4626,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - FunctionLiterals.Return.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class FunctionLiterals extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInFunctionLiterals() throws Exception { @@ -5024,11 +4914,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/generics") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Generics.StarProjections.class, - Generics.TpAsReified.class, - Generics.VarProjection.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Generics extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInGenerics() throws Exception { @@ -5440,9 +5325,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - IncompleteCode.DiagnosticWithSyntaxError.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class IncompleteCode extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInIncompleteCode() throws Exception { @@ -5647,15 +5529,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inference") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Inference.CapturedTypes.class, - Inference.Constraints.class, - Inference.NestedCalls.class, - Inference.Regressions.class, - Inference.ReportingImprovements.class, - Inference.Substitutions.class, - Inference.UpperBounds.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Inference extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInference() throws Exception { @@ -6475,13 +6348,6 @@ 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(JUnit3RunnerWithInners.class) public static class Inline extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInline() throws Exception { @@ -6908,9 +6774,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/inner") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Inner.QualifiedExpression.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Inner extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInner() throws Exception { @@ -7424,9 +7287,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Jdk_annotations.Sql.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Jdk_annotations extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInJdk_annotations() throws Exception { @@ -7604,11 +7464,6 @@ 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(JUnit3RunnerWithInners.class) public static class Multimodule extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInMultimodule() throws Exception { @@ -8488,9 +8343,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/override") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Override.ParameterNames.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractJetDiagnosticsTest { @TestMetadata("AbstractFunImplemented.kt") @@ -8851,12 +8703,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/platformTypes") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - PlatformTypes.CommonSupertype.class, - PlatformTypes.Intersection.class, - PlatformTypes.MethodCall.class, - PlatformTypes.NullabilityWarnings.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInPlatformTypes() throws Exception { @@ -10087,11 +9933,6 @@ 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(JUnit3RunnerWithInners.class) public static class Resolve extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInResolve() throws Exception { @@ -10160,9 +10001,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Invoke.Errors.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInvoke() throws Exception { @@ -10593,9 +10431,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/secondaryConstructors") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - SecondaryConstructors.HeaderCallChecker.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructors extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { @@ -11040,11 +10875,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/smartCasts") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - SmartCasts.Inference.class, - SmartCasts.Safecalls.class, - SmartCasts.Varnotnull.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class SmartCasts extends AbstractJetDiagnosticsTest { @TestMetadata("afterBinaryExpr.kt") @@ -11555,11 +11385,6 @@ 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(JUnit3RunnerWithInners.class) public static class Suppress extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInSuppress() throws Exception { @@ -12043,9 +11868,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/diagnostics/tests/variance") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Variance.PrivateToThis.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Variance extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInVariance() throws Exception { @@ -12269,10 +12091,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Diagnostics.Functions.class, - Diagnostics.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Diagnostics extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInDiagnostics() throws Exception { @@ -12281,11 +12099,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Functions.Inference.class, - Functions.Invoke.class, - Functions.TailRecursion.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInFunctions() throws Exception { @@ -12309,9 +12122,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Invoke.OnObjects.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractJetDiagnosticsTest { public void testAllFilesPresentInInvoke() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java index 0ba0bd2d9a6..94f1fdff1c8 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.Inline.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated extends AbstractJetDiagnosticsTestWithJsStdLibAndBackendCompilation { public void testAllFilesPresentInTestsWithJsStdLibAndBackendCompilation() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java index 2bb9e353e12..481e0f8586c 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,12 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JetDiagnosticsTestWithJsStdLibGenerated.DynamicTypes.class, - JetDiagnosticsTestWithJsStdLibGenerated.JsCode.class, - JetDiagnosticsTestWithJsStdLibGenerated.Native.class, - JetDiagnosticsTestWithJsStdLibGenerated.UnsupportedFeatures.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInTestsWithJsStdLib() throws Exception { @@ -272,13 +265,6 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Native.NativeGetter.class, - Native.NativeInvoke.class, - Native.NativeSetter.class, - Native.OptionlBody.class, - Native.UnusedParam.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Native extends AbstractJetDiagnosticsTestWithJsStdLib { public void testAllFilesPresentInNative() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java index 6bba7f4ac36..9fb36669d9b 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,19 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/diagnostics/testsWithStdLib") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JetDiagnosticsTestWithStdLibGenerated.Annotations.class, - JetDiagnosticsTestWithStdLibGenerated.CallableReference.class, - JetDiagnosticsTestWithStdLibGenerated.ClassLiteral.class, - JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class, - JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class, - JetDiagnosticsTestWithStdLibGenerated.Inference.class, - JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class, - JetDiagnosticsTestWithStdLibGenerated.Native.class, - JetDiagnosticsTestWithStdLibGenerated.Reified.class, - JetDiagnosticsTestWithStdLibGenerated.Resolve.class, - JetDiagnosticsTestWithStdLibGenerated.Varargs.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInTestsWithStdLib() throws Exception { @@ -51,15 +37,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Annotations.AnnotationApplicability.class, - Annotations.AnnotationParameterMustBeConstant.class, - Annotations.AnnotationParameters.class, - Annotations.AnnotationWithVarargParameter.class, - Annotations.JvmOverloads.class, - Annotations.PlatformStatic.class, - Annotations.ProhibitPositionedArgument.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInAnnotations() throws Exception { @@ -306,10 +283,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CallableReference.Function.class, - CallableReference.Property.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib { public void testAllFilesPresentInCallableReference() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java index 08a4e3b43e3..b9fc6b25e7c 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.cli; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - KotlincExecutableTestGenerated.Jvm.class, - KotlincExecutableTestGenerated.Js.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest { @TestMetadata("compiler/testData/cli/jvm") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java index aad4243c84a..c5fe0edfca6 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,24 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/bytecodeText") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - BytecodeTextTestGenerated.BoxingOptimization.class, - BytecodeTextTestGenerated.Conditions.class, - BytecodeTextTestGenerated.Constants.class, - BytecodeTextTestGenerated.DeadCodeElimination.class, - BytecodeTextTestGenerated.DirectInvoke.class, - BytecodeTextTestGenerated.ForLoop.class, - BytecodeTextTestGenerated.Inline.class, - BytecodeTextTestGenerated.LazyCodegen.class, - BytecodeTextTestGenerated.LineNumbers.class, - BytecodeTextTestGenerated.Statements.class, - BytecodeTextTestGenerated.StaticFields.class, - BytecodeTextTestGenerated.StoreStackBeforeInline.class, - BytecodeTextTestGenerated.StringOperations.class, - BytecodeTextTestGenerated.When.class, - BytecodeTextTestGenerated.WhenEnumOptimization.class, - BytecodeTextTestGenerated.WhenStringOptimization.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest { @TestMetadata("accessorForProtected.kt") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java index 58ee372bc03..6a4d2a54392 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java index 046aec3298b..6c8e4156da9 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - LineNumberTestGenerated.LineNumber.class, - LineNumberTestGenerated.Custom.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class LineNumberTestGenerated extends AbstractLineNumberTest { @TestMetadata("compiler/testData/lineNumber") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java index 6487d18173b..aee1afce3a4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java index 85b57c25d56..6a5b607d9b3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java index 3cd4e946024..bf124d4e9a8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.defaultConstructor; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java index 33fc0a8aae6..e94cfa19831 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.flags; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,13 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/writeFlags") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - WriteFlagsTestGenerated.Class.class, - WriteFlagsTestGenerated.DelegatedProperty.class, - WriteFlagsTestGenerated.Function.class, - WriteFlagsTestGenerated.InnerClass.class, - WriteFlagsTestGenerated.Property.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { public void testAllFilesPresentInWriteFlags() throws Exception { @@ -45,11 +37,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/class") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Class.AccessFlags.class, - Class.DeprecatedFlag.class, - Class.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractWriteFlagsTest { public void testAllFilesPresentInClass() throws Exception { @@ -136,11 +123,6 @@ 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(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractWriteFlagsTest { public void testAllFilesPresentInVisibility() throws Exception { @@ -322,9 +304,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/delegatedProperty") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DelegatedProperty.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractWriteFlagsTest { public void testAllFilesPresentInDelegatedProperty() throws Exception { @@ -349,11 +328,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/function") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Function.ClassObjectPrivate.class, - Function.Constructors.class, - Function.DeprecatedFlag.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractWriteFlagsTest { public void testAllFilesPresentInFunction() throws Exception { @@ -504,9 +478,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/innerClass") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - InnerClass.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class InnerClass extends AbstractWriteFlagsTest { public void testAllFilesPresentInInnerClass() throws Exception { @@ -561,11 +532,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest { @TestMetadata("compiler/testData/writeFlags/property") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Property.ClassObject.class, - Property.DeprecatedFlag.class, - Property.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractWriteFlagsTest { public void testAllFilesPresentInProperty() throws Exception { @@ -574,11 +540,6 @@ 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(JUnit3RunnerWithInners.class) public static class ClassObject extends AbstractWriteFlagsTest { public void testAllFilesPresentInClassObject() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java index 937818d2a83..84502283963 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,22 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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.NotNullAssertions.class, - BlackBoxAgainstJavaCodegenTestGenerated.PlatformTypes.class, - BlackBoxAgainstJavaCodegenTestGenerated.Property.class, - BlackBoxAgainstJavaCodegenTestGenerated.Reflection.class, - BlackBoxAgainstJavaCodegenTestGenerated.Sam.class, - BlackBoxAgainstJavaCodegenTestGenerated.StaticFun.class, - BlackBoxAgainstJavaCodegenTestGenerated.Visibility.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxAgainstJava() throws Exception { @@ -348,11 +331,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Reflection.ClassLiterals.class, - Reflection.Mapping.class, - Reflection.Properties.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { @@ -413,9 +391,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Sam.Adapters.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Sam extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSam() throws Exception { @@ -436,9 +411,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Adapters.Operators.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Adapters extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAdapters() throws Exception { @@ -701,11 +673,6 @@ 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(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVisibility() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java index ec6355b7a01..5035f3944dd 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,60 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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.Diagnostics.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.ObjectIntrinsics.class, - BlackBoxCodegenTestGenerated.Objects.class, - BlackBoxCodegenTestGenerated.OperatorConventions.class, - BlackBoxCodegenTestGenerated.Package.class, - BlackBoxCodegenTestGenerated.PlatformTypes.class, - BlackBoxCodegenTestGenerated.PrimitiveTypes.class, - BlackBoxCodegenTestGenerated.Properties.class, - BlackBoxCodegenTestGenerated.Reflection.class, - BlackBoxCodegenTestGenerated.Regressions.class, - BlackBoxCodegenTestGenerated.SafeCall.class, - BlackBoxCodegenTestGenerated.SamConstructors.class, - BlackBoxCodegenTestGenerated.SecondaryConstructors.class, - BlackBoxCodegenTestGenerated.StaticFields.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(JUnit3RunnerWithInners.class) public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBox() throws Exception { @@ -356,9 +301,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/bridges") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Bridges.SubstitutionInSuperClass.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Bridges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBridges() throws Exception { @@ -701,9 +643,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/builtinStubMethods") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - BuiltinStubMethods.ExtendJavaCollections.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractMember.kt") @@ -1592,10 +1531,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/closures") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Closures.CaptureOuterProperty.class, - Closures.ClosureInsideClosure.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Closures extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInClosures() throws Exception { @@ -2241,10 +2176,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/defaultArguments") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DefaultArguments.Constructor.class, - DefaultArguments.Function.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { @@ -2470,9 +2401,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/delegatedProperty") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DelegatedProperty.PropertyDelegatedMethod.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedProperty extends AbstractBlackBoxCodegenTest { @TestMetadata("accessTopLevelDelegatedPropertyInClinit.kt") @@ -2755,10 +2683,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/diagnostics") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Diagnostics.Functions.class, - Diagnostics.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Diagnostics extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDiagnostics() throws Exception { @@ -2767,11 +2691,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Functions.Inference.class, - Functions.Invoke.class, - Functions.TailRecursion.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { @@ -2795,9 +2714,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Invoke.OnObjects.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Invoke extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInvoke() throws Exception { @@ -3640,10 +3556,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/functions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Functions.Invoke.class, - Functions.LocalFunctions.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { @@ -4196,9 +4108,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/instructions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Instructions.Swap.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Instructions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInstructions() throws Exception { @@ -4286,10 +4195,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/javaInterop") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - JavaInterop.NotNullAssertions.class, - JavaInterop.ObjectMethods.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaInterop extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJavaInterop() throws Exception { @@ -4539,10 +4444,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - MultiDecl.ForIterator.class, - MultiDecl.ForRange.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class MultiDecl extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDecl() throws Exception { @@ -4617,9 +4518,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ForIterator.LongIterator.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ForIterator extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForIterator() throws Exception { @@ -4692,12 +4590,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ForRange.ExplicitRangeTo.class, - ForRange.ExplicitRangeToWithDot.class, - ForRange.Int.class, - ForRange.Long.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ForRange extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInForRange() throws Exception { @@ -4736,10 +4628,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ExplicitRangeTo.Int.class, - ExplicitRangeTo.Long.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ExplicitRangeTo extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeTo() throws Exception { @@ -4845,10 +4733,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ExplicitRangeToWithDot.Int.class, - ExplicitRangeToWithDot.Long.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ExplicitRangeToWithDot extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception { @@ -5274,9 +5158,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/operatorConventions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - OperatorConventions.CompareTo.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class OperatorConventions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperatorConventions() throws Exception { @@ -5442,9 +5323,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/platformTypes") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - PlatformTypes.Primitives.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class PlatformTypes extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPlatformTypes() throws Exception { @@ -6855,9 +6733,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { @TestMetadata("compiler/testData/codegen/box/traits") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Traits.WithRequired.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Traits extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInTraits() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java index c5e10406805..4a894df1773 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,24 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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.Reified.class, - BlackBoxInlineCodegenTestGenerated.Simple.class, - BlackBoxInlineCodegenTestGenerated.Smap.class, - BlackBoxInlineCodegenTestGenerated.Special.class, - BlackBoxInlineCodegenTestGenerated.Trait.class, - BlackBoxInlineCodegenTestGenerated.TryCatchFinally.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInBoxInline() throws Exception { @@ -359,10 +340,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - NonLocalReturns.Deparenthesize.class, - NonLocalReturns.TryFinally.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { @@ -434,11 +411,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - TryFinally.CallSite.class, - TryFinally.DeclSite.class, - TryFinally.ExceptionTable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInTryFinally() throws Exception { @@ -752,10 +724,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo @TestMetadata("compiler/testData/codegen/boxInline/smap") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Smap.Anonymous.class, - Smap.Resolve.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Smap extends AbstractBlackBoxInlineCodegenTest { public void testAllFilesPresentInSmap() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java index 6a38459f69c..86ba26178fc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 7afb0554e84..acc882fde24 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,15 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxWithJava") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - BlackBoxWithJavaCodegenTestGenerated.BuiltinStubMethods.class, - BlackBoxWithJavaCodegenTestGenerated.JvmOverloads.class, - BlackBoxWithJavaCodegenTestGenerated.NotNullAssertions.class, - BlackBoxWithJavaCodegenTestGenerated.PlatformStatic.class, - BlackBoxWithJavaCodegenTestGenerated.Properties.class, - BlackBoxWithJavaCodegenTestGenerated.Reflection.class, - BlackBoxWithJavaCodegenTestGenerated.SecondaryConstructors.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithJava() throws Exception { @@ -71,8 +61,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBuiltinStubMethods() throws Exception { @@ -101,8 +89,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class JvmOverloads extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInJvmOverloads() throws Exception { @@ -125,8 +111,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class NotNullAssertions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInNotNullAssertions() throws Exception { @@ -143,8 +127,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/platformStatic") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class PlatformStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPlatformStatic() throws Exception { @@ -173,8 +155,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/properties") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class Properties extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperties() throws Exception { @@ -191,8 +171,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/reflection") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { @@ -215,8 +193,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege @TestMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructors extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSecondaryConstructors() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index b518bb78c82..3ca6b824dbc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,42 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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.Classes.class, - BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, - BlackBoxWithStdlibCodegenTestGenerated.DeadCodeElimination.class, - BlackBoxWithStdlibCodegenTestGenerated.DefaultArguments.class, - BlackBoxWithStdlibCodegenTestGenerated.Enum.class, - BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class, - BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, - BlackBoxWithStdlibCodegenTestGenerated.HashPMap.class, - BlackBoxWithStdlibCodegenTestGenerated.Intrinsics.class, - BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, - BlackBoxWithStdlibCodegenTestGenerated.JvmOverloads.class, - BlackBoxWithStdlibCodegenTestGenerated.LazyCodegen.class, - BlackBoxWithStdlibCodegenTestGenerated.LocalFunInLambda.class, - BlackBoxWithStdlibCodegenTestGenerated.MultiDeclForArray.class, - BlackBoxWithStdlibCodegenTestGenerated.NonLocalReturns.class, - BlackBoxWithStdlibCodegenTestGenerated.PlatformNames.class, - BlackBoxWithStdlibCodegenTestGenerated.PlatformStatic.class, - BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, - BlackBoxWithStdlibCodegenTestGenerated.Reflection.class, - BlackBoxWithStdlibCodegenTestGenerated.Regressions.class, - BlackBoxWithStdlibCodegenTestGenerated.Reified.class, - BlackBoxWithStdlibCodegenTestGenerated.StoreStackBeforeInline.class, - BlackBoxWithStdlibCodegenTestGenerated.Strings.class, - BlackBoxWithStdlibCodegenTestGenerated.Synthetic.class, - BlackBoxWithStdlibCodegenTestGenerated.ToArray.class, - BlackBoxWithStdlibCodegenTestGenerated.Vararg.class, - BlackBoxWithStdlibCodegenTestGenerated.When.class, - BlackBoxWithStdlibCodegenTestGenerated.WhenEnumOptimization.class, - BlackBoxWithStdlibCodegenTestGenerated.WhenStringOptimization.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBoxWithStdlib() throws Exception { @@ -359,10 +322,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CallableReference.Function.class, - CallableReference.Property.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CallableReference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { @@ -371,9 +330,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Function.Local.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractBlackBoxCodegenTest { @TestMetadata("abstractClassMember.kt") @@ -924,12 +880,6 @@ 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(JUnit3RunnerWithInners.class) public static class DataClasses extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDataClasses() throws Exception { @@ -1296,9 +1246,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DefaultArguments.Constructor.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DefaultArguments extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDefaultArguments() throws Exception { @@ -1437,12 +1384,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - FullJdk.Native.class, - FullJdk.Regressions.class, - FullJdk.Smap.class, - FullJdk.Synchronized.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class FullJdk extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFullJdk() throws Exception { @@ -1896,9 +1837,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - LazyCodegen.Optimizations.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class LazyCodegen extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInLazyCodegen() throws Exception { @@ -2058,10 +1996,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - MultiDeclForArray.Int.class, - MultiDeclForArray.Long.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class MultiDeclForArray extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInMultiDeclForArray() throws Exception { @@ -2314,10 +2248,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Ranges.Expression.class, - Ranges.Literal.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Ranges extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInRanges() throws Exception { @@ -2717,14 +2647,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Reflection.ClassLiterals.class, - Reflection.Enclosing.class, - Reflection.GenericSignature.class, - Reflection.Mapping.class, - Reflection.MethodsFromAny.class, - Reflection.Properties.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Reflection extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInReflection() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java index d6cd50b28f7..439ba6685a5 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,13 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/compileJavaAgainstKotlin") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - CompileJavaAgainstKotlinTestGenerated.Class.class, - CompileJavaAgainstKotlinTestGenerated.Method.class, - CompileJavaAgainstKotlinTestGenerated.PlatformStatic.class, - CompileJavaAgainstKotlinTestGenerated.Property.class, - CompileJavaAgainstKotlinTestGenerated.StaticFields.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception { @@ -132,11 +124,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Method.PlatformName.class, - Method.PrimitiveOverride.class, - Method.Throws.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Method extends AbstractCompileJavaAgainstKotlinTest { @TestMetadata("AccessorGenericSignature.kt") @@ -464,9 +451,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Property.PlatformName.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Property extends AbstractCompileJavaAgainstKotlinTest { public void testAllFilesPresentInProperty() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java index 79b42e1d57a..eca6cd37e88 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,24 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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.Reified.class, - CompileKotlinAgainstInlineKotlinTestGenerated.Simple.class, - CompileKotlinAgainstInlineKotlinTestGenerated.Smap.class, - CompileKotlinAgainstInlineKotlinTestGenerated.Special.class, - CompileKotlinAgainstInlineKotlinTestGenerated.Trait.class, - CompileKotlinAgainstInlineKotlinTestGenerated.TryCatchFinally.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInBoxInline() throws Exception { @@ -359,10 +340,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - NonLocalReturns.Deparenthesize.class, - NonLocalReturns.TryFinally.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class NonLocalReturns extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInNonLocalReturns() throws Exception { @@ -434,11 +411,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - TryFinally.CallSite.class, - TryFinally.DeclSite.class, - TryFinally.ExceptionTable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class TryFinally extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInTryFinally() throws Exception { @@ -752,10 +724,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi @TestMetadata("compiler/testData/codegen/boxInline/smap") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Smap.Anonymous.class, - Smap.Resolve.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Smap extends AbstractCompileKotlinAgainstInlineKotlinTest { public void testAllFilesPresentInSmap() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index 86e5dd88ca2..daa8b7daea7 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java index 7f82b3ba42b..a04808b491b 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,38 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.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(JUnit3RunnerWithInners.class) public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CompiledJava.Annotations.class, - CompiledJava.Constructor.class, - CompiledJava.Enum.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.Rendering.class, - CompiledJava.Sam.class, - CompiledJava.SignaturePropagation.class, - CompiledJava.Static.class, - CompiledJava.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJava extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJava() throws Exception { @@ -566,10 +537,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - KotlinSignature.Error.class, - KotlinSignature.Propagation.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractLoadJavaTest { @TestMetadata("AllBoundsInWhen.java") @@ -845,11 +812,6 @@ 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(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { @@ -1478,9 +1440,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/sam") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Sam.Adapters.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Sam extends AbstractLoadJavaTest { public void testAllFilesPresentInSam() throws Exception { @@ -1567,9 +1526,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Adapters.Inheritance.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Adapters extends AbstractLoadJavaTest { public void testAllFilesPresentInAdapters() throws Exception { @@ -1857,8 +1813,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception { @@ -1902,24 +1856,6 @@ 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.MemberOrder.class, - CompiledKotlin.Nested.class, - CompiledKotlin.PlatformTypes.class, - CompiledKotlin.Prop.class, - CompiledKotlin.Type.class, - CompiledKotlin.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CompiledKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { @@ -1928,13 +1864,6 @@ 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(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractLoadJavaTest { public void testAllFilesPresentInAnnotations() throws Exception { @@ -2319,9 +2248,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Class.JavaBean.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractLoadJavaTest { public void testAllFilesPresentInClass() throws Exception { @@ -2712,9 +2638,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Constructor.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractLoadJavaTest { public void testAllFilesPresentInConstructor() throws Exception { @@ -2943,12 +2866,6 @@ 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(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractLoadJavaTest { public void testAllFilesPresentInFromLoadJava() throws Exception { @@ -3161,10 +3078,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - KotlinSignature.Error.class, - KotlinSignature.Propagation.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractLoadJavaTest { @TestMetadata("AllBoundsInWhen.kt") @@ -3440,11 +3353,6 @@ 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(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractLoadJavaTest { public void testAllFilesPresentInPropagation() throws Exception { @@ -3984,12 +3892,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Fun.GenericWithTypeVariables.class, - Fun.GenericWithoutTypeVariables.class, - Fun.NonGeneric.class, - Fun.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractLoadJavaTest { public void testAllFilesPresentInFun() throws Exception { @@ -4407,9 +4309,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Prop.DefaultAccessors.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractLoadJavaTest { public void testAllFilesPresentInProp() throws Exception { @@ -4963,10 +4862,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CompiledKotlinWithStdlib.Mutability.class, - CompiledKotlinWithStdlib.PlatformNames.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CompiledKotlinWithStdlib extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledKotlinWithStdlib() throws Exception { @@ -5024,11 +4919,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - JavaAgainstKotlin.SamAdapters.class, - JavaAgainstKotlin.SignaturePropagation.class, - JavaAgainstKotlin.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaAgainstKotlin extends AbstractLoadJavaTest { public void testAllFilesPresentInJavaAgainstKotlin() throws Exception { @@ -5037,8 +4927,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class SamAdapters extends AbstractLoadJavaTest { public void testAllFilesPresentInSamAdapters() throws Exception { @@ -5079,8 +4967,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class SignaturePropagation extends AbstractLoadJavaTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { @@ -5121,8 +5007,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class Visibility extends AbstractLoadJavaTest { public void testAllFilesPresentInVisibility() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java index 0bf25dbe2cb..ecba5ad28eb 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,11 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/writeSignature") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - WriteSignatureTestGenerated.Constructor.class, - WriteSignatureTestGenerated.DeclarationSiteVariance.class, - WriteSignatureTestGenerated.Nothing.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest { public void testAllFilesPresentInWriteSignature() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java index 220b5061d3f..730f6039637 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/runtime/JvmRuntimeDescriptorLoaderTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jvm.runtime; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,32 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JvmRuntimeDescriptorLoaderTestGenerated.CompiledKotlin.class, - JvmRuntimeDescriptorLoaderTestGenerated.CompiledJava.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeDescriptorLoaderTest { @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.MemberOrder.class, - CompiledKotlin.Nested.class, - CompiledKotlin.PlatformTypes.class, - CompiledKotlin.Prop.class, - CompiledKotlin.Type.class, - CompiledKotlin.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CompiledKotlin extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { @@ -62,13 +39,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @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(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInAnnotations() throws Exception { @@ -453,9 +423,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Class.JavaBean.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInClass() throws Exception { @@ -846,9 +813,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Constructor.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInConstructor() throws Exception { @@ -1077,12 +1041,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - FromLoadJava.KotlinSignature.class, - FromLoadJava.Library.class, - FromLoadJava.Modality.class, - FromLoadJava.NotNull.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInFromLoadJava() throws Exception { @@ -1295,10 +1253,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - KotlinSignature.Error.class, - KotlinSignature.Propagation.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AllBoundsInWhen.kt") @@ -1574,11 +1528,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Propagation.Parameter.class, - Propagation.Return.class, - Propagation.TypeParameter.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInPropagation() throws Exception { @@ -2118,12 +2067,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Fun.GenericWithTypeVariables.class, - Fun.GenericWithoutTypeVariables.class, - Fun.NonGeneric.class, - Fun.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInFun() throws Exception { @@ -2541,9 +2484,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Prop.DefaultAccessors.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInProp() throws Exception { @@ -3097,23 +3037,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CompiledJava.Annotations.class, - CompiledJava.Constructor.class, - CompiledJava.Enum.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.Rendering.class, - CompiledJava.SignaturePropagation.class, - CompiledJava.Static.class, - CompiledJava.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CompiledJava extends AbstractJvmRuntimeDescriptorLoaderTest { public void testAllFilesPresentInCompiledJava() throws Exception { @@ -3620,9 +3543,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - KotlinSignature.Error.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractJvmRuntimeDescriptorLoaderTest { @TestMetadata("AllBoundsInWhen.java") diff --git a/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java index 0a856e71be8..ba502c2b80d 100644 --- a/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.modules.xml; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java index 0e2d7c54549..37eae242744 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.parsing; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,29 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetParsingTestGenerated.Psi.class, - JetParsingTestGenerated.Expression.class, - JetParsingTestGenerated.Block.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Psi.Annotation.class, - Psi.Examples.class, - Psi.FunctionReceivers.class, - Psi.GreatSyntacticShift.class, - Psi.Kdoc.class, - Psi.Packages.class, - Psi.PlatformTypesRecovery.class, - Psi.PropertyDelegate.class, - Psi.Recovery.class, - Psi.Script.class, - Psi.SecondaryConstructors.class, - Psi.StringTemplates.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Psi extends AbstractJetParsingTest { @TestMetadata("AbsentInnerType.kt") @@ -635,9 +615,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/annotation") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Annotation.OnFile.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Annotation extends AbstractJetParsingTest { public void testAllFilesPresentInAnnotation() throws Exception { @@ -740,14 +717,6 @@ 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(JUnit3RunnerWithInners.class) public static class Examples extends AbstractJetParsingTest { public void testAllFilesPresentInExamples() throws Exception { @@ -1447,11 +1416,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Recovery.Objects.class, - Recovery.QualifiedExpression.class, - Recovery.UnnamedParameter.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Recovery extends AbstractJetParsingTest { @TestMetadata("AbsentLeftHandSide.kt") @@ -1664,10 +1628,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest { @TestMetadata("compiler/testData/psi/recovery/objects") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Objects.Declarations.class, - Objects.Expressions.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Objects extends AbstractJetParsingTest { public void testAllFilesPresentInObjects() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java index 62e379651de..f0d21c03903 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.renderer; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java index 5daf5b63357..8bd0b971b61 100644 --- a/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.repl; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,14 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/repl") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - ReplInterpreterTestGenerated.Classes.class, - ReplInterpreterTestGenerated.Multiline.class, - ReplInterpreterTestGenerated.Objects.class, - ReplInterpreterTestGenerated.PrimitiveTypes.class, - ReplInterpreterTestGenerated.Reflection.class, - ReplInterpreterTestGenerated.Regressions.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest { public void testAllFilesPresentInRepl() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java index 448097c5e7a..94fbbb13c03 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/ResolveTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,14 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @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(JUnit3RunnerWithInners.class) public class ResolveTestGenerated extends AbstractResolveTest { public void testAllFilesPresentInResolve() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java index 0254d97a8db..b04da71be85 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/annotation/AnnotationParameterTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.annotation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/resolveAnnotations/parameters") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - AnnotationParameterTestGenerated.Expressions.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class AnnotationParameterTestGenerated extends AbstractAnnotationParameterTest { public void testAllFilesPresentInParameters() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java index 67b7d15a1ed..375b9314147 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedCallsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.calls; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,18 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/resolvedCalls") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - ResolvedCallsTestGenerated.Arguments.class, - ResolvedCallsTestGenerated.DifferentCallElements.class, - ResolvedCallsTestGenerated.Dynamic.class, - ResolvedCallsTestGenerated.FunctionTypes.class, - ResolvedCallsTestGenerated.Invoke.class, - ResolvedCallsTestGenerated.ObjectsAndClassObjects.class, - ResolvedCallsTestGenerated.RealExamples.class, - ResolvedCallsTestGenerated.Resolve.class, - ResolvedCallsTestGenerated.SecondaryConstructors.class, - ResolvedCallsTestGenerated.ThisOrSuper.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest { public void testAllFilesPresentInResolvedCalls() throws Exception { @@ -98,14 +85,6 @@ 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(JUnit3RunnerWithInners.class) public static class Arguments extends AbstractResolvedCallsTest { public void testAllFilesPresentInArguments() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java index 757770b6f1c..b6f3d3a515a 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/calls/ResolvedConstructorDelegationCallsTestsGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.calls; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java index 8969c097db4..ce2f40f49e2 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.constants.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,11 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - EvaluateExpressionTestGenerated.Constant.class, - EvaluateExpressionTestGenerated.IsPure.class, - EvaluateExpressionTestGenerated.UsesVariableAsConstant.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest { @TestMetadata("compiler/testData/evaluate/constant") diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java index 6d2540a8b46..ad46a55b788 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constraintSystem/ConstraintSystemTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.resolve.constraintSystem; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,13 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/constraintSystem") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - ConstraintSystemTestGenerated.CheckStatus.class, - ConstraintSystemTestGenerated.ComputeValues.class, - ConstraintSystemTestGenerated.IntegerValueTypes.class, - ConstraintSystemTestGenerated.SeveralVariables.class, - ConstraintSystemTestGenerated.Variance.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest { public void testAllFilesPresentInConstraintSystem() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java index 4dffacfb95c..74531ae6329 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/LocalClassProtoTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.serialization; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java index 67f4c109d98..729ec1d8f57 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.types; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,10 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/type/binding") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JetTypeBindingTestGenerated.Explicit.class, - JetTypeBindingTestGenerated.Implicit.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetTypeBindingTestGenerated extends AbstractJetTypeBindingTest { public void testAllFilesPresentInBinding() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java index 23e6fd1f7ef..a06fa9a1a1a 100644 --- a/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/addImport/AddImportTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.addImport; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java index 2b9023eaad0..013fa7ef860 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java index 5188565f932..56802d2ddc8 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,14 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.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(JUnit3RunnerWithInners.class) public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker") @@ -574,11 +565,6 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest { @TestMetadata("idea/testData/checker/duplicateJvmSignature") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DuplicateJvmSignature.Fields.class, - DuplicateJvmSignature.FunctionAndProperty.class, - DuplicateJvmSignature.TraitImpl.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest { public void testAllFilesPresentInDuplicateJvmSignature() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java index 852b32c9625..878df0c8651 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/CompiledKotlinInJavaCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,8 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/injava") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ -}) @RunWith(JUnit3RunnerWithInners.class) public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest { public void testAllFilesPresentInInjava() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java index 5b69545e6f6..3d7941c5c29 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/DataFlowValueRenderingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java index cd2c54e9d1c..bb17312bc68 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JSBasicCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,21 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JSBasicCompletionTestGenerated.Common.class, - JSBasicCompletionTestGenerated.Js.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTest { @TestMetadata("idea/testData/completion/basic/common") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Common.Annotations.class, - Common.Extensions.class, - Common.NamedParameters.class, - Common.TypeArgsOrNot.class, - Common.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Common extends AbstractJSBasicCompletionTest { @TestMetadata("AfterFloatOnNewLine.kt") diff --git a/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java index 4c2de62892c..9884f46e153 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JvmBasicCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,21 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JvmBasicCompletionTestGenerated.Common.class, - JvmBasicCompletionTestGenerated.Java.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionTest { @TestMetadata("idea/testData/completion/basic/common") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Common.Annotations.class, - Common.Extensions.class, - Common.NamedParameters.class, - Common.TypeArgsOrNot.class, - Common.Visibility.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Common extends AbstractJvmBasicCompletionTest { @TestMetadata("AfterFloatOnNewLine.kt") diff --git a/idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java index 0ff5f5b5189..262a09c6a71 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JvmSmartCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,24 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/smart") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JvmSmartCompletionTestGenerated.AfterAs.class, - JvmSmartCompletionTestGenerated.AnonymousObject.class, - JvmSmartCompletionTestGenerated.Constructor.class, - JvmSmartCompletionTestGenerated.ForLoopRange.class, - JvmSmartCompletionTestGenerated.FunctionLiterals.class, - JvmSmartCompletionTestGenerated.FunctionReference.class, - JvmSmartCompletionTestGenerated.Generics.class, - JvmSmartCompletionTestGenerated.HeuristicSignatures.class, - JvmSmartCompletionTestGenerated.IfValue.class, - JvmSmartCompletionTestGenerated.InElvisOperator.class, - JvmSmartCompletionTestGenerated.InOperator.class, - JvmSmartCompletionTestGenerated.Inheritors.class, - JvmSmartCompletionTestGenerated.MultipleArgsItem.class, - JvmSmartCompletionTestGenerated.SmartCasts.class, - JvmSmartCompletionTestGenerated.This.class, - JvmSmartCompletionTestGenerated.WhenEntry.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest { @TestMetadata("AfterExclSign.kt") diff --git a/idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java index 75c4f4431f6..250d47261e5 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/JvmWithLibBasicCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java index 204733648a3..6afe5efe71c 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/KeywordCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java index 75c96b0eaf2..dca476740bc 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/KotlinSourceInJavaCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,8 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/injava") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest { public void testAllFilesPresentInInjava() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java index c9fad95cb34..430ea04c687 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/MultiFileJvmBasicCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java index a6f1b46cb42..165ac09ef06 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/MultiFileSmartCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java index 420588cd828..b7c9805edbb 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/BasicCompletionHandlerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/handlers/basic") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - BasicCompletionHandlerTestGenerated.StringTemplate.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletionHandlerTest { public void testAllFilesPresentInBasic() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java index 1172fa252ae..346633586d9 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/CompletionCharFilterTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java index b3138a00b3f..7619cb46cee 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/KeywordCompletionHandlerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java index 1947b72e9f9..0ff1eea53ca 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/handlers/SmartCompletionHandlerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java index d9d97db797b..fb22be2a116 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/BasicCompletionWeigherTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion.weighers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java index 9c7c9800069..f7a85e1e388 100644 --- a/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/completion/weighers/SmartCompletionWeigherTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.completion.weighers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java index 9d3fab5c629..ffbfec37e0e 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/JetFindUsagesTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.findUsages; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,30 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetFindUsagesTestGenerated.Kotlin.class, - JetFindUsagesTestGenerated.Java.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/kotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Kotlin.Conventions.class, - Kotlin.DefaultObject.class, - Kotlin.FindClassUsages.class, - Kotlin.FindFunctionUsages.class, - Kotlin.FindObjectUsages.class, - Kotlin.FindPackageUsages.class, - Kotlin.FindParameterUsages.class, - Kotlin.FindPropertyUsages.class, - Kotlin.FindSecondaryConstructorUsages.class, - Kotlin.FindTypeParameterUsages.class, - Kotlin.FindWithFilteringImports.class, - Kotlin.FindWithStructuralGrouping.class, - Kotlin.Library.class, - Kotlin.UnresolvedAnnotation.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Kotlin extends AbstractJetFindUsagesTest { public void testAllFilesPresentInKotlin() throws Exception { @@ -1027,12 +1006,6 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest { @TestMetadata("idea/testData/findUsages/java") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Java.FindConstructorUsages.class, - Java.FindJavaClassUsages.class, - Java.FindJavaFieldUsages.class, - Java.FindJavaMethodUsages.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Java extends AbstractJetFindUsagesTest { public void testAllFilesPresentInJava() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java index 300fccffbd0..1508d97cbb6 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/JetFormatterTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.formatter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,18 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetFormatterTestGenerated.Formatter.class, - JetFormatterTestGenerated.FormatterInverted.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Formatter.ModifierList.class, - Formatter.ParameterList.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Formatter extends AbstractJetFormatterTest { public void testAllFilesPresentInFormatter() throws Exception { @@ -721,8 +712,6 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest { @TestMetadata("idea/testData/formatter") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class FormatterInverted extends AbstractJetFormatterTest { public void testAllFilesPresentInFormatterInverted() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java index b8feb488f2f..2e30f8309fc 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/JetTypingIndentationTestBaseGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.formatter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,17 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetTypingIndentationTestBaseGenerated.DirectSettings.class, - JetTypingIndentationTestBaseGenerated.InvertedSettings.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingIndentationTestBase { @TestMetadata("idea/testData/indentationOnNewline") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DirectSettings.Script.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DirectSettings extends AbstractJetTypingIndentationTestBase { @TestMetadata("AfterCatch.after.kt") @@ -339,8 +331,6 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde @TestMetadata("idea/testData/indentationOnNewline") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class InvertedSettings extends AbstractJetTypingIndentationTestBase { public void testAllFilesPresentInInvertedSettings() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java index 00303824cab..5b6327af9d3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/ExpressionSelectionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java index 2dd91a2cb5b..fad7eef3160 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/SmartSelectionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java index 5714042f524..2fefad7bfb0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/InsertImportOnPasteTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - InsertImportOnPasteTestGenerated.Copy.class, - InsertImportOnPasteTestGenerated.Cut.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPasteTest { @TestMetadata("idea/testData/copyPaste/imports") diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java index 583964ec1c7..a0de605e9b5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/JetInspectionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetInspectionTestGenerated.Intentions.class, - JetInspectionTestGenerated.Inspections.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetInspectionTestGenerated extends AbstractJetInspectionTest { @TestMetadata("idea/testData/intentions") diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java index f8e7f6f4ee6..f3680f9a501 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/LineMarkersTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,10 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/codeInsight/lineMarker") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - LineMarkersTestGenerated.OverrideImplement.class, - LineMarkersTestGenerated.RecursiveCall.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class LineMarkersTestGenerated extends AbstractLineMarkersTest { public void testAllFilesPresentInLineMarker() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java index 06fc13a04a9..286fc63f788 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/OutOfBlockModificationTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java index 8a0536c9120..6464a3919c6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/moveUpDown/CodeMoverTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight.moveUpDown; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,25 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - CodeMoverTestGenerated.ClassBodyDeclarations.class, - CodeMoverTestGenerated.ClosingBraces.class, - CodeMoverTestGenerated.Expressions.class, -}) @RunWith(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(JUnit3RunnerWithInners.class) public static class ClassBodyDeclarations extends AbstractCodeMoverTest { public void testAllFilesPresentInClassBodyDeclarations() throws Exception { @@ -626,14 +610,6 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest { @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(JUnit3RunnerWithInners.class) public static class ClosingBraces extends AbstractCodeMoverTest { public void testAllFilesPresentInClosingBraces() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java index 6f3d2de1339..d32eb0ad296 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/surroundWith/SurroundWithTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight.surroundWith; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,25 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.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(JUnit3RunnerWithInners.class) public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - If.MoveDeclarationsOut.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class If extends AbstractSurroundWithTest { public void testAllFilesPresentInIf() throws Exception { @@ -85,14 +69,6 @@ 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(JUnit3RunnerWithInners.class) public static class MoveDeclarationsOut extends AbstractSurroundWithTest { public void testAllFilesPresentInMoveDeclarationsOut() throws Exception { @@ -230,9 +206,6 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Var.DefaultValue.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Var extends AbstractSurroundWithTest { public void testAllFilesPresentInVar() throws Exception { @@ -391,9 +364,6 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest { @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Parentheses.NotApplicable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Parentheses extends AbstractSurroundWithTest { public void testAllFilesPresentInParentheses() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java index 435ea409b61..f507f3ee402 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/unwrap/UnwrapRemoveTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.codeInsight.unwrap; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,19 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.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(JUnit3RunnerWithInners.class) public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest { @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression") diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java index 1f708064541..d5918abad40 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.configuration; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,19 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - ConfigureProjectByChangingFileTestGenerated.Android_gradle.class, - ConfigureProjectByChangingFileTestGenerated.Gradle.class, - ConfigureProjectByChangingFileTestGenerated.Maven.class, - ConfigureProjectByChangingFileTestGenerated.Js_maven.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigureProjectByChangingFileTest { @TestMetadata("idea/testData/configuration/android-gradle") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Android_gradle.GradleExamples.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest { public void testAllFilesPresentInAndroid_gradle() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java index 863e9417dd7..618f174b2f2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.conversion.copy; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java index e6c4ca5707b..95c484348f7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/coverage/KotlinCoverageOutputFilesTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.coverage; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java index f4270df9614..8c23d6fab13 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/JetPositionManagerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetPositionManagerTestGenerated.SingleFile.class, - JetPositionManagerTestGenerated.MultiFile.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetPositionManagerTestGenerated extends AbstractJetPositionManagerTest { @TestMetadata("idea/testData/debugger/positionManager") diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java index 1545a9305b1..53728ddd1b4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinSteppingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,12 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - KotlinSteppingTestGenerated.StepInto.class, - KotlinSteppingTestGenerated.SmartStepInto.class, - KotlinSteppingTestGenerated.StepIntoOnly.class, - KotlinSteppingTestGenerated.Filters.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest { @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto") diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java index f2ea9b57f00..f591c4dedb1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/SmartStepIntoTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java index 6883348ae46..cc6fa633e90 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java index 5b647d568aa..48819d121c9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/completion/basic/codeFragments") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - CodeFragmentCompletionTestGenerated.RuntimeType.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest { public void testAllFilesPresentInCodeFragments() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java index e4998aa0ee0..234d00c3012 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - CodeFragmentHighlightingTestGenerated.CodeFragments.class, - CodeFragmentHighlightingTestGenerated.Imports.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentHighlightingTest { @TestMetadata("idea/testData/checker/codeFragments") diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java index 30ad3a3b8f8..1bf1e014a3b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,21 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class, - KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluateExpressionTest { @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - SingleBreakpoint.CompilingEvaluator.class, - SingleBreakpoint.ExtraVariables.class, - SingleBreakpoint.Frame.class, - SingleBreakpoint.Lambdas.class, - SingleBreakpoint.Renderer.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest { @TestMetadata("abstractFunCall.kt") @@ -565,9 +553,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - MultipleBreakpoints.Library.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionTest { public void testAllFilesPresentInMultipleBreakpoints() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java index 2a7c9084720..e6d01bbb410 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - SelectExpressionForDebuggerTestGenerated.SelectExpression.class, - SelectExpressionForDebuggerTestGenerated.DisallowMethodCalls.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpressionForDebuggerTest { @TestMetadata("idea/testData/debugger/selectExpression") diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java index 7cff0522c37..f54257b5683 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToLibrarySourceTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.decompiler.navigation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - NavigateToLibrarySourceTestGenerated.Usercode.class, - NavigateToLibrarySourceTestGenerated.UsercodeWithJSModule.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibrarySourceTest { @TestMetadata("idea/testData/decompiler/navigation/usercode") diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java index 6bb55c70967..736c38bbb49 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java index c08bbd15db1..02ee60060e8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,8 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/decompiler/decompiledText") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ -}) @RunWith(JUnit3RunnerWithInners.class) public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest { public void testAllFilesPresentInDecompiledText() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java index c984eb02e15..1432881e7b4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/quickDoc/JetQuickDocProviderTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.editor.quickDoc; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java index 78b05937f8c..7e7071e4c9f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/folding/KotlinFoldingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.folding; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - KotlinFoldingTestGenerated.NoCollapse.class, - KotlinFoldingTestGenerated.CheckCollapse.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest { @TestMetadata("idea/testData/folding/noCollapse") diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java index 7bbccb729d8..5ee8df26e60 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/HierarchyTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.hierarchy; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,14 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.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(JUnit3RunnerWithInners.class) public class HierarchyTestGenerated extends AbstractHierarchyTest { @TestMetadata("idea/testData/hierarchy/class/type") diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java index 2ccfe13f830..f442a849d82 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageJsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java index 1e746d6ac18..6ef4ffa5448 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java index e1c03fd92ea..9282a1271c7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightExitPointsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java index c153837c3ef..83b0cbca46b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/highlighter") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - HighlightingTestGenerated.Deprecated.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class HighlightingTestGenerated extends AbstractHighlightingTest { public void testAllFilesPresentInHighlighter() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java index d95a798d519..7e49854f9b6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/imports/OptimizeImportsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.imports; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/editor/optimizeImports") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - OptimizeImportsTestGenerated.AllUnderImports.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest { public void testAllFilesPresentInOptimizeImports() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 184608e3df8..9432617e373 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.intentions; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,50 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/intentions") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - IntentionTestGenerated.AddBraces.class, - IntentionTestGenerated.AttributeCallReplacements.class, - IntentionTestGenerated.Branched.class, - IntentionTestGenerated.ConvertAssertToIf.class, - IntentionTestGenerated.ConvertFunctionToProperty.class, - IntentionTestGenerated.ConvertIfToAssert.class, - IntentionTestGenerated.ConvertNegatedBooleanSequence.class, - IntentionTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class, - IntentionTestGenerated.ConvertParameterToReceiver.class, - IntentionTestGenerated.ConvertPropertyToFunction.class, - IntentionTestGenerated.ConvertReceiverToParameter.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(JUnit3RunnerWithInners.class) public class IntentionTestGenerated extends AbstractIntentionTest { public void testAllFilesPresentInIntentions() throws Exception { @@ -139,13 +94,6 @@ 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(JUnit3RunnerWithInners.class) public static class AttributeCallReplacements extends AbstractIntentionTest { public void testAllFilesPresentInAttributeCallReplacements() throws Exception { @@ -382,8 +330,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class ReplaceGetIntention extends AbstractIntentionTest { @TestMetadata("acceptableVararg.kt") @@ -647,18 +593,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @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(JUnit3RunnerWithInners.class) public static class Branched extends AbstractIntentionTest { public void testAllFilesPresentInBranched() throws Exception { @@ -823,13 +757,6 @@ 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(JUnit3RunnerWithInners.class) public static class Folding extends AbstractIntentionTest { public void testAllFilesPresentInFolding() throws Exception { @@ -1241,8 +1168,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/ifThenToElvis") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class IfThenToElvis extends AbstractIntentionTest { public void testAllFilesPresentInIfThenToElvis() throws Exception { @@ -1445,8 +1370,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/ifThenToSafeAccess") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class IfThenToSafeAccess extends AbstractIntentionTest { public void testAllFilesPresentInIfThenToSafeAccess() throws Exception { @@ -1661,10 +1584,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/ifWhen") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - IfWhen.IfToWhen.class, - IfWhen.WhenToIf.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class IfWhen extends AbstractIntentionTest { public void testAllFilesPresentInIfWhen() throws Exception { @@ -1959,14 +1878,6 @@ 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(JUnit3RunnerWithInners.class) public static class Unfolding extends AbstractIntentionTest { public void testAllFilesPresentInUnfolding() throws Exception { @@ -2228,12 +2139,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/branched/when") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - When.EliminateSubject.class, - When.Flatten.class, - When.IntroduceSubject.class, - When.Merge.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class When extends AbstractIntentionTest { public void testAllFilesPresentInWhen() throws Exception { @@ -3864,10 +3769,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/declarations") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Declarations.ConvertMemberToExtension.class, - Declarations.Split.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractIntentionTest { public void testAllFilesPresentInDeclarations() throws Exception { @@ -5134,8 +5035,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/removeExplicitTypeArguments") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class RemoveExplicitTypeArguments extends AbstractIntentionTest { public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception { @@ -5836,8 +5735,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { @TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class SimplifyNegatedBinaryExpressionIntention extends AbstractIntentionTest { public void testAllFilesPresentInSimplifyNegatedBinaryExpressionIntention() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java index 56d03e8c2e3..917eb4c6f59 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/declarations/JoinLinesTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.intentions.declarations; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,11 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/joinLines") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JoinLinesTestGenerated.DeclarationAndAssignment.class, - JoinLinesTestGenerated.NestedIfs.class, - JoinLinesTestGenerated.RemoveBraces.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JoinLinesTestGenerated extends AbstractJoinLinesTest { public void testAllFilesPresentInJoinLines() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocCompletionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocCompletionTestGenerated.java index c960b9d1e35..5838904a212 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest; diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java index 2f4db1042ac..3360da92a81 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KDocHighlightingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java index f226b94e648..fed2a4da61a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/KdocResolveTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.kdoc; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveTest; diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java index f78748f543c..8a7ec6497a9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/GotoSuperTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java index 4e7b1f3dba3..dba1b8d349b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoImplementationTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java index b338d44b5a6..1cfe6b6cb50 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/KotlinGotoTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.navigation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - KotlinGotoTestGenerated.GotoClass.class, - KotlinGotoTestGenerated.GotoSymbol.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class KotlinGotoTestGenerated extends AbstractKotlinGotoTest { @TestMetadata("idea/testData/navigation/gotoClass") diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java index 9c937ecaa0e..e23191fe321 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/FunctionParameterInfoTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.parameterInfo; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java index e29344657bb..2b2df7f2d30 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,20 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/quickfix") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - QuickFixMultiFileTestGenerated.AddStarProjections.class, - QuickFixMultiFileTestGenerated.AutoImports.class, - QuickFixMultiFileTestGenerated.ChangeSignature.class, - QuickFixMultiFileTestGenerated.CreateFromUsage.class, - QuickFixMultiFileTestGenerated.Migration.class, - QuickFixMultiFileTestGenerated.Modifiers.class, - QuickFixMultiFileTestGenerated.Nullables.class, - QuickFixMultiFileTestGenerated.Override.class, - QuickFixMultiFileTestGenerated.Suppress.class, - QuickFixMultiFileTestGenerated.TypeImports.class, - QuickFixMultiFileTestGenerated.TypeMismatch.class, - QuickFixMultiFileTestGenerated.Variables.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInQuickfix() throws Exception { @@ -52,8 +37,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/addStarProjections") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class AddStarProjections extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAddStarProjections() throws Exception { @@ -286,12 +269,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateFromUsage.CreateClass.class, - CreateFromUsage.CreateFunction.class, - CreateFromUsage.CreateSecondaryConstructor.class, - CreateFromUsage.CreateVariable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateFromUsage extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateFromUsage() throws Exception { @@ -300,14 +277,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage/createClass") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateClass.AnnotationEntry.class, - CreateClass.CallExpression.class, - CreateClass.DelegationSpecifier.class, - CreateClass.ImportDirective.class, - CreateClass.ReferenceExpression.class, - CreateClass.TypeReference.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateClass extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateClass() throws Exception { @@ -343,9 +312,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CallExpression.TypeArguments.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CallExpression extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCallExpression() throws Exception { @@ -653,9 +619,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateFunction.Call.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateFunction extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateFunction() throws Exception { @@ -664,9 +627,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction/call") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Call.TypeArguments.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Call extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCall() throws Exception { @@ -792,10 +752,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/createFromUsage/createVariable") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateVariable.Parameter.class, - CreateVariable.Property.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateVariable extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInCreateVariable() throws Exception { @@ -890,9 +846,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/migration") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Migration.LambdaSyntax.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Migration extends AbstractQuickFixMultiFileTest { @TestMetadata("addInitKeywordMultiple.before.Main.kt") @@ -929,9 +882,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Modifiers.AddOpenToClassDeclaration.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInModifiers() throws Exception { @@ -940,9 +890,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - AddOpenToClassDeclaration.FinalJavaClass.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class AddOpenToClassDeclaration extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception { @@ -951,9 +898,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - FinalJavaClass.JavaCode.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class FinalJavaClass extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInFinalJavaClass() throws Exception { @@ -962,8 +906,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaCode extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInJavaCode() throws Exception { @@ -977,8 +919,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/nullables") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class Nullables extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInNullables() throws Exception { @@ -989,9 +929,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/override") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Override.NothingToOverride.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInOverride() throws Exception { @@ -1023,9 +960,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/suppress") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Suppress.ForStatement.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Suppress extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInSuppress() throws Exception { @@ -1034,8 +968,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/suppress/forStatement") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class ForStatement extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInForStatement() throws Exception { @@ -1062,8 +994,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/typeMismatch") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class TypeMismatch extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInTypeMismatch() throws Exception { @@ -1074,8 +1004,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes @TestMetadata("idea/testData/quickfix/variables") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class Variables extends AbstractQuickFixMultiFileTest { public void testAllFilesPresentInVariables() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 17dc4ce0d33..8c07cb13b46 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,33 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/quickfix") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - QuickFixTestGenerated.Abstract.class, - QuickFixTestGenerated.AddStarProjections.class, - QuickFixTestGenerated.AutoImports.class, - QuickFixTestGenerated.ChangeSignature.class, - QuickFixTestGenerated.CheckArguments.class, - QuickFixTestGenerated.ConflictingImports.class, - QuickFixTestGenerated.CreateFromUsage.class, - QuickFixTestGenerated.Expressions.class, - QuickFixTestGenerated.InsertDelegationCall.class, - QuickFixTestGenerated.Migration.class, - QuickFixTestGenerated.Modifiers.class, - QuickFixTestGenerated.Nullables.class, - QuickFixTestGenerated.Override.class, - QuickFixTestGenerated.PlatformClasses.class, - QuickFixTestGenerated.RemoveUnused.class, - QuickFixTestGenerated.RemoveUnusedReceiver.class, - QuickFixTestGenerated.Supercalls.class, - QuickFixTestGenerated.SupertypeInitialization.class, - QuickFixTestGenerated.Suppress.class, - QuickFixTestGenerated.TypeAddition.class, - QuickFixTestGenerated.TypeImports.class, - QuickFixTestGenerated.TypeMismatch.class, - QuickFixTestGenerated.TypeProjection.class, - QuickFixTestGenerated.Variables.class, - QuickFixTestGenerated.When.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class QuickFixTestGenerated extends AbstractQuickFixTest { public void testAllFilesPresentInQuickfix() throws Exception { @@ -206,12 +178,6 @@ 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(JUnit3RunnerWithInners.class) public static class AddStarProjections extends AbstractQuickFixTest { public void testAllFilesPresentInAddStarProjections() throws Exception { @@ -713,12 +679,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateFromUsage.CreateClass.class, - CreateFromUsage.CreateFunction.class, - CreateFromUsage.CreateSecondaryConstructor.class, - CreateFromUsage.CreateVariable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateFromUsage extends AbstractQuickFixTest { public void testAllFilesPresentInCreateFromUsage() throws Exception { @@ -727,14 +687,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/createClass") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateClass.AnnotationEntry.class, - CreateClass.CallExpression.class, - CreateClass.DelegationSpecifier.class, - CreateClass.ImportDirective.class, - CreateClass.ReferenceExpression.class, - CreateClass.TypeReference.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateClass extends AbstractQuickFixTest { public void testAllFilesPresentInCreateClass() throws Exception { @@ -800,9 +752,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/createClass/callExpression") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CallExpression.TypeArguments.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CallExpression extends AbstractQuickFixTest { public void testAllFilesPresentInCallExpression() throws Exception { @@ -1506,19 +1455,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateFunction.BinaryOperations.class, - CreateFunction.Call.class, - CreateFunction.Component.class, - CreateFunction.DelegateAccessors.class, - CreateFunction.Get.class, - CreateFunction.HasNext.class, - CreateFunction.Invoke.class, - CreateFunction.Iterator.class, - CreateFunction.Next.class, - CreateFunction.Set.class, - CreateFunction.UnaryOperations.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateFunction extends AbstractQuickFixTest { public void testAllFilesPresentInCreateFunction() throws Exception { @@ -1620,9 +1556,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/createFunction/call") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Call.TypeArguments.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Call extends AbstractQuickFixTest { public void testAllFilesPresentInCall() throws Exception { @@ -2356,11 +2289,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/createFromUsage/createVariable") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - CreateVariable.LocalVariable.class, - CreateVariable.Parameter.class, - CreateVariable.Property.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class CreateVariable extends AbstractQuickFixTest { public void testAllFilesPresentInCreateVariable() throws Exception { @@ -3070,9 +2998,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/migration") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Migration.LambdaSyntax.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Migration extends AbstractQuickFixTest { @TestMetadata("beforeAddOverrideToEqualsHashCodeToString.kt") @@ -3151,9 +3076,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Modifiers.AddOpenToClassDeclaration.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Modifiers extends AbstractQuickFixTest { @TestMetadata("beforeAbstractModifierInEnum.kt") @@ -3354,9 +3276,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - AddOpenToClassDeclaration.FinalJavaClass.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class AddOpenToClassDeclaration extends AbstractQuickFixTest { public void testAllFilesPresentInAddOpenToClassDeclaration() throws Exception { @@ -3431,9 +3350,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - FinalJavaClass.JavaCode.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class FinalJavaClass extends AbstractQuickFixTest { public void testAllFilesPresentInFinalJavaClass() throws Exception { @@ -3442,8 +3358,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/modifiers/addOpenToClassDeclaration/finalJavaClass/javaCode") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaCode extends AbstractQuickFixTest { public void testAllFilesPresentInJavaCode() throws Exception { @@ -3457,9 +3371,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/nullables") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Nullables.UnsafeInfixCall.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Nullables extends AbstractQuickFixTest { public void testAllFilesPresentInNullables() throws Exception { @@ -3508,10 +3419,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/override") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Override.NothingToOverride.class, - Override.TypeMismatchOnOverride.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Override extends AbstractQuickFixTest { public void testAllFilesPresentInOverride() throws Exception { @@ -4046,13 +3953,6 @@ 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(JUnit3RunnerWithInners.class) public static class Suppress extends AbstractQuickFixTest { public void testAllFilesPresentInSuppress() throws Exception { @@ -4307,9 +4207,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { @TestMetadata("idea/testData/quickfix/suppress/forStatement") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ForStatement.Unavailable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ForStatement extends AbstractQuickFixTest { public void testAllFilesPresentInForStatement() throws Exception { @@ -4755,13 +4652,6 @@ 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(JUnit3RunnerWithInners.class) public static class TypeMismatch extends AbstractQuickFixTest { @TestMetadata("beforeAccessibleLocalClassInReturn.kt") @@ -5317,13 +5207,6 @@ 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, - Variables.RemoveValVarFromParameter.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Variables extends AbstractQuickFixTest { public void testAllFilesPresentInVariables() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java index 814acedfc1f..0a681c0493b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/inline/InlineTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.refactoring.inline; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,12 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/refactoring/inline") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - InlineTestGenerated.AddParenthesis.class, - InlineTestGenerated.ExplicateParameterTypes.class, - InlineTestGenerated.ExplicateTypeArgument.class, - InlineTestGenerated.Property.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class InlineTestGenerated extends AbstractInlineTest { public void testAllFilesPresentInInline() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java index d73c512255e..a22ccd2a8af 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/JetExtractionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.refactoring.introduce; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,12 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetExtractionTestGenerated.IntroduceVariable.class, - JetExtractionTestGenerated.ExtractFunction.class, - JetExtractionTestGenerated.IntroduceProperty.class, - JetExtractionTestGenerated.IntroduceParameter.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/introduceVariable") @@ -323,16 +316,6 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @TestMetadata("idea/testData/refactoring/extractFunction") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ExtractFunction.Basic.class, - ExtractFunction.ControlFlow.class, - ExtractFunction.DefaultContainer.class, - ExtractFunction.Delegation.class, - ExtractFunction.Duplicates.class, - ExtractFunction.Initializers.class, - ExtractFunction.Parameters.class, - ExtractFunction.TypeParameters.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ExtractFunction extends AbstractJetExtractionTest { public void testAllFilesPresentInExtractFunction() throws Exception { @@ -512,17 +495,6 @@ 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.ExitPointEquivalence.class, - ControlFlow.Initializer.class, - ControlFlow.OutputValues.class, - ControlFlow.Throws.class, - ControlFlow.Unextractable.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ControlFlow extends AbstractJetExtractionTest { public void testAllFilesPresentInControlFlow() throws Exception { @@ -1318,12 +1290,6 @@ 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(JUnit3RunnerWithInners.class) public static class Initializers extends AbstractJetExtractionTest { public void testAllFilesPresentInInitializers() throws Exception { @@ -1537,14 +1503,6 @@ public class JetExtractionTestGenerated extends AbstractJetExtractionTest { @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(JUnit3RunnerWithInners.class) public static class Parameters extends AbstractJetExtractionTest { public void testAllFilesPresentInParameters() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java index eb50df766f8..12201868c01 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/JetMoveTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.refactoring.move; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java index a4a019ea217..ff59c894a69 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/RenameTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.refactoring.rename; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java index 4834e2cfa68..b1c1ff0226f 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/AdditionalResolveDescriptorRendererTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java index e05f04bbaf0..cb3f15221fb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/PartialBodyResolveTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java index a04643c944c..0f8c51eafd0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInJavaTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java index 88cc804b280..ddd991db521 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java index af862b7b31f..f6dfceb153a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,11 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/resolve/references") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - ReferenceResolveTestGenerated.DelegatedPropertyAccessors.class, - ReferenceResolveTestGenerated.ForLoopIn.class, - ReferenceResolveTestGenerated.Invoke.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest { public void testAllFilesPresentInReferences() throws Exception { @@ -379,10 +373,6 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/delegatedPropertyAccessors") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - DelegatedPropertyAccessors.InSource.class, - DelegatedPropertyAccessors.InStandardLibrary.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class DelegatedPropertyAccessors extends AbstractReferenceResolveTest { public void testAllFilesPresentInDelegatedPropertyAccessors() throws Exception { @@ -464,11 +454,6 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest @TestMetadata("idea/testData/resolve/references/forLoopIn") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ForLoopIn.InBuiltIns.class, - ForLoopIn.InLibrary.class, - ForLoopIn.InSource.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ForLoopIn extends AbstractReferenceResolveTest { public void testAllFilesPresentInForLoopIn() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java index 7c6cc6ffcd2..9a9093192ef 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveWithLibTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java index 4cb470ce986..75070a498a9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java index 0abc0242b6a..f2170b8bee8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/structureView/KotlinFileStructureTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.structureView; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java index ebbfb10a7fa..7ee6fd0bfc5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/MultiFileHighlightingTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java index 76b1c09818e..4c0bf48b80a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/ResolveByStubTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,24 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/loadJava/compiledKotlin") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - ResolveByStubTestGenerated.Annotations.class, - ResolveByStubTestGenerated.Class.class, - ResolveByStubTestGenerated.ClassFun.class, - ResolveByStubTestGenerated.ClassObject.class, - ResolveByStubTestGenerated.Constructor.class, - ResolveByStubTestGenerated.DataClass.class, - ResolveByStubTestGenerated.Enum.class, - ResolveByStubTestGenerated.FromLoadJava.class, - ResolveByStubTestGenerated.Fun.class, - ResolveByStubTestGenerated.Inline.class, - ResolveByStubTestGenerated.MemberOrder.class, - ResolveByStubTestGenerated.Nested.class, - ResolveByStubTestGenerated.PlatformTypes.class, - ResolveByStubTestGenerated.Prop.class, - ResolveByStubTestGenerated.Type.class, - ResolveByStubTestGenerated.Visibility.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { public void testAllFilesPresentInCompiledKotlin() throws Exception { @@ -56,13 +37,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @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(JUnit3RunnerWithInners.class) public static class Annotations extends AbstractResolveByStubTest { public void testAllFilesPresentInAnnotations() throws Exception { @@ -447,9 +421,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/class") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Class.JavaBean.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Class extends AbstractResolveByStubTest { public void testAllFilesPresentInClass() throws Exception { @@ -840,9 +811,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Constructor.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Constructor extends AbstractResolveByStubTest { public void testAllFilesPresentInConstructor() throws Exception { @@ -1071,12 +1039,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - FromLoadJava.KotlinSignature.class, - FromLoadJava.Library.class, - FromLoadJava.Modality.class, - FromLoadJava.NotNull.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class FromLoadJava extends AbstractResolveByStubTest { public void testAllFilesPresentInFromLoadJava() throws Exception { @@ -1289,10 +1251,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - KotlinSignature.Error.class, - KotlinSignature.Propagation.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinSignature extends AbstractResolveByStubTest { @TestMetadata("AllBoundsInWhen.kt") @@ -1568,11 +1526,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Propagation.Parameter.class, - Propagation.Return.class, - Propagation.TypeParameter.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Propagation extends AbstractResolveByStubTest { public void testAllFilesPresentInPropagation() throws Exception { @@ -2112,12 +2065,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Fun.GenericWithTypeVariables.class, - Fun.GenericWithoutTypeVariables.class, - Fun.NonGeneric.class, - Fun.Vararg.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Fun extends AbstractResolveByStubTest { public void testAllFilesPresentInFun() throws Exception { @@ -2535,9 +2482,6 @@ public class ResolveByStubTestGenerated extends AbstractResolveByStubTest { @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Prop.DefaultAccessors.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Prop extends AbstractResolveByStubTest { public void testAllFilesPresentInProp() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java index b70ec4c245b..52f8abefa67 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/StubBuilderTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java b/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java index b2215c3899d..fa7f40cf0c7 100644 --- a/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/load/java/JavaTypeSubstitutorTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.load.java; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java index a39329c0d34..0fa82c8a107 100644 --- a/idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/psi/patternMatching/JetPsiUnifierTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.psi.patternMatching; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/unifier") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JetPsiUnifierTestGenerated.Equivalence.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInUnifier() throws Exception { @@ -41,12 +37,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Equivalence.ControlStructures.class, - Equivalence.Declarations.class, - Equivalence.Expressions.class, - Equivalence.Types.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Equivalence extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInEquivalence() throws Exception { @@ -55,9 +45,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/controlStructures") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - ControlStructures.Blocks.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class ControlStructures extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInControlStructures() throws Exception { @@ -172,11 +159,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/declarations") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Declarations.ClassesAndObjects.class, - Declarations.LocalCallables.class, - Declarations.TypeParameters.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Declarations extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInDeclarations() throws Exception { @@ -248,9 +230,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/declarations/localCallables") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - LocalCallables.Lambdas.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class LocalCallables extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInLocalCallables() throws Exception { @@ -339,15 +318,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Expressions.CallableReferences.class, - Expressions.Calls.class, - Expressions.Casts.class, - Expressions.Conventions.class, - Expressions.Misc.class, - Expressions.Super.class, - Expressions.This.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Expressions extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInExpressions() throws Exception { @@ -503,10 +473,6 @@ public class JetPsiUnifierTestGenerated extends AbstractJetPsiUnifierTest { @TestMetadata("idea/testData/unifier/equivalence/expressions/conventions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - Conventions.Assignments.class, - Conventions.Invoke.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class Conventions extends AbstractJetPsiUnifierTest { public void testAllFilesPresentInConventions() throws Exception { diff --git a/idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java index 18719a9a02a..c0b6aeab754 100644 --- a/idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/safeDelete/JetSafeDeleteTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.safeDelete; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,21 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - JetSafeDeleteTestGenerated.KotlinClass.class, - JetSafeDeleteTestGenerated.KotlinClassWithJava.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(JUnit3RunnerWithInners.class) public class JetSafeDeleteTestGenerated extends AbstractJetSafeDeleteTest { @TestMetadata("idea/testData/safeDelete/deleteClass/kotlinClass") diff --git a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java index 992432ca371..f76494c8ff3 100644 --- a/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/shortenRefs/ShortenRefsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.shortenRefs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,13 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("idea/testData/shortenRefs") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - ShortenRefsTestGenerated.Constructor.class, - ShortenRefsTestGenerated.Imports.class, - ShortenRefsTestGenerated.Java.class, - ShortenRefsTestGenerated.This.class, - ShortenRefsTestGenerated.Type.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class ShortenRefsTestGenerated extends AbstractShortenRefsTest { public void testAllFilesPresentInShortenRefs() throws Exception { diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 57953f606aa..e3b9138a9ac 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,79 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("j2k/testData/fileOrElement") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JavaToKotlinConverterForWebDemoTestGenerated.Annotations.class, - JavaToKotlinConverterForWebDemoTestGenerated.AnonymousBlock.class, - JavaToKotlinConverterForWebDemoTestGenerated.ArrayAccessExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.ArrayInitializerExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.ArrayType.class, - JavaToKotlinConverterForWebDemoTestGenerated.AssertStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.AssignmentExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.BinaryExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.Blocks.class, - JavaToKotlinConverterForWebDemoTestGenerated.BoxedType.class, - JavaToKotlinConverterForWebDemoTestGenerated.BreakStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.CallChainExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.Class.class, - JavaToKotlinConverterForWebDemoTestGenerated.ClassExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.CodeSimplifications.class, - JavaToKotlinConverterForWebDemoTestGenerated.Comments.class, - JavaToKotlinConverterForWebDemoTestGenerated.ConditionalExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.Constructors.class, - JavaToKotlinConverterForWebDemoTestGenerated.ContinueStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.DeclarationStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.DoWhileStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.DocComments.class, - JavaToKotlinConverterForWebDemoTestGenerated.DropAccessors.class, - JavaToKotlinConverterForWebDemoTestGenerated.Enum.class, - JavaToKotlinConverterForWebDemoTestGenerated.Equals.class, - JavaToKotlinConverterForWebDemoTestGenerated.Field.class, - JavaToKotlinConverterForWebDemoTestGenerated.For.class, - JavaToKotlinConverterForWebDemoTestGenerated.ForeachStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.Formatting.class, - JavaToKotlinConverterForWebDemoTestGenerated.Function.class, - JavaToKotlinConverterForWebDemoTestGenerated.Identifier.class, - JavaToKotlinConverterForWebDemoTestGenerated.IfStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.ImportStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.Inheritance.class, - JavaToKotlinConverterForWebDemoTestGenerated.IsOperator.class, - JavaToKotlinConverterForWebDemoTestGenerated.Issues.class, - JavaToKotlinConverterForWebDemoTestGenerated.KotlinApiAccess.class, - JavaToKotlinConverterForWebDemoTestGenerated.LabelStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.List.class, - JavaToKotlinConverterForWebDemoTestGenerated.LiteralExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.LocalVariable.class, - JavaToKotlinConverterForWebDemoTestGenerated.MethodCallExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.Misc.class, - JavaToKotlinConverterForWebDemoTestGenerated.MutableCollections.class, - JavaToKotlinConverterForWebDemoTestGenerated.NewClassExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.Nullability.class, - JavaToKotlinConverterForWebDemoTestGenerated.ObjectLiteral.class, - JavaToKotlinConverterForWebDemoTestGenerated.Overloads.class, - JavaToKotlinConverterForWebDemoTestGenerated.PackageStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.ParenthesizedExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.PolyadicExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.PostfixOperator.class, - JavaToKotlinConverterForWebDemoTestGenerated.PrefixOperator.class, - JavaToKotlinConverterForWebDemoTestGenerated.Projections.class, - JavaToKotlinConverterForWebDemoTestGenerated.RawGenerics.class, - JavaToKotlinConverterForWebDemoTestGenerated.ReturnStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.Settings.class, - JavaToKotlinConverterForWebDemoTestGenerated.StaticMembers.class, - JavaToKotlinConverterForWebDemoTestGenerated.SuperExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.Switch.class, - JavaToKotlinConverterForWebDemoTestGenerated.SynchronizedStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.ThisExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.ThrowStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.ToKotlinClasses.class, - JavaToKotlinConverterForWebDemoTestGenerated.Trait.class, - JavaToKotlinConverterForWebDemoTestGenerated.TryStatement.class, - JavaToKotlinConverterForWebDemoTestGenerated.TryWithResource.class, - JavaToKotlinConverterForWebDemoTestGenerated.TypeCastExpression.class, - JavaToKotlinConverterForWebDemoTestGenerated.TypeParameters.class, - JavaToKotlinConverterForWebDemoTestGenerated.VarArg.class, - JavaToKotlinConverterForWebDemoTestGenerated.WhileStatement.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaToKotlinConverterForWebDemoTest { public void testAllFilesPresentInFileOrElement() throws Exception { diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java index df7e094b464..78ee4a2d431 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index 5eb1a7f34e5..1b71969fc85 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,79 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("j2k/testData/fileOrElement") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - JavaToKotlinConverterSingleFileTestGenerated.Annotations.class, - JavaToKotlinConverterSingleFileTestGenerated.AnonymousBlock.class, - JavaToKotlinConverterSingleFileTestGenerated.ArrayAccessExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.ArrayInitializerExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.ArrayType.class, - JavaToKotlinConverterSingleFileTestGenerated.AssertStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.AssignmentExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.BinaryExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.Blocks.class, - JavaToKotlinConverterSingleFileTestGenerated.BoxedType.class, - JavaToKotlinConverterSingleFileTestGenerated.BreakStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.CallChainExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.Class.class, - JavaToKotlinConverterSingleFileTestGenerated.ClassExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.CodeSimplifications.class, - JavaToKotlinConverterSingleFileTestGenerated.Comments.class, - JavaToKotlinConverterSingleFileTestGenerated.ConditionalExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.Constructors.class, - JavaToKotlinConverterSingleFileTestGenerated.ContinueStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.DeclarationStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.DoWhileStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.DocComments.class, - JavaToKotlinConverterSingleFileTestGenerated.DropAccessors.class, - JavaToKotlinConverterSingleFileTestGenerated.Enum.class, - JavaToKotlinConverterSingleFileTestGenerated.Equals.class, - JavaToKotlinConverterSingleFileTestGenerated.Field.class, - JavaToKotlinConverterSingleFileTestGenerated.For.class, - JavaToKotlinConverterSingleFileTestGenerated.ForeachStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.Formatting.class, - JavaToKotlinConverterSingleFileTestGenerated.Function.class, - JavaToKotlinConverterSingleFileTestGenerated.Identifier.class, - JavaToKotlinConverterSingleFileTestGenerated.IfStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.ImportStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.Inheritance.class, - JavaToKotlinConverterSingleFileTestGenerated.IsOperator.class, - JavaToKotlinConverterSingleFileTestGenerated.Issues.class, - JavaToKotlinConverterSingleFileTestGenerated.KotlinApiAccess.class, - JavaToKotlinConverterSingleFileTestGenerated.LabelStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.List.class, - JavaToKotlinConverterSingleFileTestGenerated.LiteralExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.LocalVariable.class, - JavaToKotlinConverterSingleFileTestGenerated.MethodCallExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.Misc.class, - JavaToKotlinConverterSingleFileTestGenerated.MutableCollections.class, - JavaToKotlinConverterSingleFileTestGenerated.NewClassExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.Nullability.class, - JavaToKotlinConverterSingleFileTestGenerated.ObjectLiteral.class, - JavaToKotlinConverterSingleFileTestGenerated.Overloads.class, - JavaToKotlinConverterSingleFileTestGenerated.PackageStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.ParenthesizedExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.PolyadicExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.PostfixOperator.class, - JavaToKotlinConverterSingleFileTestGenerated.PrefixOperator.class, - JavaToKotlinConverterSingleFileTestGenerated.Projections.class, - JavaToKotlinConverterSingleFileTestGenerated.RawGenerics.class, - JavaToKotlinConverterSingleFileTestGenerated.ReturnStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.Settings.class, - JavaToKotlinConverterSingleFileTestGenerated.StaticMembers.class, - JavaToKotlinConverterSingleFileTestGenerated.SuperExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.Switch.class, - JavaToKotlinConverterSingleFileTestGenerated.SynchronizedStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.ThisExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.ThrowStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.ToKotlinClasses.class, - JavaToKotlinConverterSingleFileTestGenerated.Trait.class, - JavaToKotlinConverterSingleFileTestGenerated.TryStatement.class, - JavaToKotlinConverterSingleFileTestGenerated.TryWithResource.class, - JavaToKotlinConverterSingleFileTestGenerated.TypeCastExpression.class, - JavaToKotlinConverterSingleFileTestGenerated.TypeParameters.class, - JavaToKotlinConverterSingleFileTestGenerated.VarArg.class, - JavaToKotlinConverterSingleFileTestGenerated.WhileStatement.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaToKotlinConverterSingleFileTest { public void testAllFilesPresentInFileOrElement() throws Exception { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 6748008890c..9d89e84f6b2 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,17 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - IncrementalJpsTestGenerated.MultiModule.class, - IncrementalJpsTestGenerated.PureKotlin.class, - IncrementalJpsTestGenerated.WithJava.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { @@ -109,8 +101,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") @@ -439,11 +429,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - WithJava.ConvertBetweenJavaAndKotlin.class, - WithJava.JavaUsedInKotlin.class, - WithJava.KotlinUsedInJava.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { @@ -452,8 +437,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { @@ -488,9 +471,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - JavaUsedInKotlin.SamConversions.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { @@ -547,8 +527,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { @@ -572,8 +550,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInKotlinUsedInJava() throws Exception { diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java index 1ff557e97e6..7e64395faa7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -30,9 +29,6 @@ import java.util.regex.Pattern; @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/box/bridges") @TestDataPath("$PROJECT_ROOT") -@InnerTestClasses({ - BridgeTestGenerated.SubstitutionInSuperClass.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class BridgeTestGenerated extends AbstractBridgeTest { @TestMetadata("objectClone.kt") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java index fe0b06f4ea7..ae912314fb1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompanionObjectTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java index 30e1af08f62..3724673eb3d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java index a321899a185..28cac662bba 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsStdlibTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java index 6ae9b9508a2..1eb3ad7831f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/InlineJsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java index 9c65e0f099a..40ce3f18bf6 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodeTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java index af94ce0281e..4b17cdb7112 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/LabelTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java index 96fa472d76f..fa981e7addb 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java index 686d1f3e88d..4b4082e4986 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java index 3fed94ba718..488ebffe74e 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBoxTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - AndroidBoxTestGenerated.Android.class, - AndroidBoxTestGenerated.Invoke.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class AndroidBoxTestGenerated extends AbstractAndroidBoxTest { @TestMetadata("plugins/android-compiler-plugin/testData/codegen/android") diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java index fff30cfea44..5f264b1d4fd 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidBytecodeShapeTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java index fef3e91950b..6cbae11cdd2 100644 --- a/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java +++ b/plugins/android-compiler-plugin/tests/org/jetbrains/kotlin/lang/resolve/android/test/AndroidXml2KConversionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.lang.resolve.android.test; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,10 +27,6 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - AndroidXml2KConversionTestGenerated.Simple.class, - AndroidXml2KConversionTestGenerated.Exceptions.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class AndroidXml2KConversionTestGenerated extends AbstractAndroidXml2KConversionTest { @TestMetadata("plugins/android-compiler-plugin/testData/android/converter/simple") diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java index e2bcebdcb81..fef5c122c2a 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidCompletionTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java index eff778e09ef..4333baf0326 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidFindUsagesTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java index c192b9d6ffd..971dd91cf33 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidGotoTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java index 609ebce1905..30c3ac7d326 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/AndroidRenameTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java index 947eab2e226..a117ea10fe7 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/ParserResultEqualityTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; diff --git a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java index 03c29b978b1..b6a81e4af23 100644 --- a/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java +++ b/plugins/android-jps-plugin/tests/org/jetbrains/kotlin/jps/build/android/AndroidJpsTestCaseGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build.android; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata;