From fb9d88315a341e4a277cc627dbff2349af9f6232 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 16 May 2017 18:58:21 +0300 Subject: [PATCH] Don't print unnecessary empty line separators when generate tests --- .../jvm/compiler/LoadJavaTestGenerated.java | 4 ---- .../MultiPlatformIntegrationTestGenerated.java | 4 ---- .../tests/generator/TestGenerator.java | 18 ++++++++++++++---- .../AndroidGutterIconTestGenerated.java | 1 - ...ledKotlinInJavaCompletionTestGenerated.java | 1 - ...linSourceInJavaCompletionTestGenerated.java | 1 - ...tlinFindUsagesWithLibraryTestGenerated.java | 1 - .../formatter/FormatterTestGenerated.java | 1 - .../TypingIndentationTestBaseGenerated.java | 1 - ...ompiledTextFromJsMetadataTestGenerated.java | 1 - .../CommonDecompiledTextTestGenerated.java | 1 - ...ompiledTextFromJsMetadataTestGenerated.java | 1 - .../JvmDecompiledTextTestGenerated.java | 1 - .../intentions/IntentionTestGenerated.java | 11 ----------- .../QuickFixMultiFileTestGenerated.java | 18 ------------------ .../idea/quickfix/QuickFixTestGenerated.java | 3 --- ...taContainerVersionChangedTestGenerated.java | 1 - ...alChangeIncrementalOptionTestGenerated.java | 1 - ...mentalCacheVersionChangedTestGenerated.java | 1 - ...xperimentalIncrementalJpsTestGenerated.java | 6 ------ ...ntalIncrementalLazyCachesTestGenerated.java | 1 - ...mentalCacheVersionChangedTestGenerated.java | 1 - .../jps/build/IncrementalJpsTestGenerated.java | 5 ----- .../IncrementalLazyCachesTestGenerated.java | 1 - .../ProtoComparisonTestGenerated.java | 5 ----- .../semantics/JsCodegenBoxTestGenerated.java | 5 ----- .../OutputPrefixPostfixTestGenerated.java | 1 - .../SourceMapGenerationSmokeTestGenerated.java | 1 - 28 files changed, 14 insertions(+), 83 deletions(-) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java index deb6be8a3c8..c02d08b8dce 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java @@ -1777,7 +1777,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/compiledJavaAndKotlin/MixedPackage.txt"); doTestCompiledJavaAndKotlin(fileName); } - } @TestMetadata("compiler/testData/loadJava/compiledJavaIncludeObjectMethods") @@ -5065,7 +5064,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters/SamAdapterForOverriddenFromKotlin.txt"); doTestJavaAgainstKotlin(fileName); } - } @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation") @@ -5105,7 +5103,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/SubclassingKotlinInJava.txt"); doTestJavaAgainstKotlin(fileName); } - } @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility") @@ -5127,7 +5124,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility/ProtectedPackage.txt"); doTestJavaAgainstKotlin(fileName); } - } } diff --git a/compiler/tests/org/jetbrains/kotlin/multiplatform/MultiPlatformIntegrationTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/multiplatform/MultiPlatformIntegrationTestGenerated.java index 6c14795e8bc..83a9c4ba682 100644 --- a/compiler/tests/org/jetbrains/kotlin/multiplatform/MultiPlatformIntegrationTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/multiplatform/MultiPlatformIntegrationTestGenerated.java @@ -145,7 +145,6 @@ public class MultiPlatformIntegrationTestGenerated extends AbstractMultiPlatform String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/multiplatform/classScopes/simple/"); doTest(fileName); } - } @TestMetadata("compiler/testData/multiplatform/implTypeAlias") @@ -167,7 +166,6 @@ public class MultiPlatformIntegrationTestGenerated extends AbstractMultiPlatform String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/multiplatform/implTypeAlias/nestedClassesViaTypeAlias/"); doTest(fileName); } - } @TestMetadata("compiler/testData/multiplatform/regressions") @@ -183,7 +181,5 @@ public class MultiPlatformIntegrationTestGenerated extends AbstractMultiPlatform String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/multiplatform/regressions/kt17001/"); doTest(fileName); } - } - } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java index 85c0d1f6fe8..25ffe3d487a 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java @@ -161,24 +161,34 @@ public class TestGenerator { Collection testMethods = testClassModel.getMethods(); Collection innerTestClasses = testClassModel.getInnerTestClasses(); + boolean first = true; + for (Iterator iterator = testMethods.iterator(); iterator.hasNext(); ) { MethodModel methodModel = iterator.next(); if (!methodModel.shouldBeGenerated()) continue; - generateTestMethod(p, methodModel); - if (iterator.hasNext() || !innerTestClasses.isEmpty()) { + if (first) { + first = false; + } + else { p.println(); } + + generateTestMethod(p, methodModel); } for (Iterator iterator = innerTestClasses.iterator(); iterator.hasNext(); ) { TestClassModel innerTestClass = iterator.next(); if (!innerTestClass.isEmpty()) { - generateTestClass(p, innerTestClass, true); - if (iterator.hasNext()) { + if (first) { + first = false; + } + else { p.println(); } + + generateTestClass(p, innerTestClass, true); } } diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AndroidGutterIconTestGenerated.java b/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AndroidGutterIconTestGenerated.java index 0d2804d4f30..0daa40e43fd 100644 --- a/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AndroidGutterIconTestGenerated.java +++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/annotator/AndroidGutterIconTestGenerated.java @@ -73,6 +73,5 @@ public class AndroidGutterIconTestGenerated extends AbstractAndroidGutterIconTes public void testAllFilesPresentInRes() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/android/gutterIcon/res"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); } - } } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java index dbbfd85cc7a..7d4f27ff7c6 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/CompiledKotlinInJavaCompletionTestGenerated.java @@ -209,5 +209,4 @@ public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompile String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java"); doTest(fileName); } - } diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java index 48f15642072..508e4b48f92 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/KotlinSourceInJavaCompletionTestGenerated.java @@ -209,5 +209,4 @@ public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSou String fileName = KotlinTestUtils.navigationMetadata("idea/idea-completion/testData/injava/TraitMember.java"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java index 0ca9b2a1750..d1379db47ea 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/KotlinFindUsagesWithLibraryTestGenerated.java @@ -169,6 +169,5 @@ public class KotlinFindUsagesWithLibraryTestGenerated extends AbstractKotlinFind public void testAllFilesPresentIn_library() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/findUsages/libraryUsages/_library"), Pattern.compile("^(.+)\\.0\\.kt$"), TargetBackend.ANY, true); } - } } diff --git a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java index 1feb8c66138..78671f447c1 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/FormatterTestGenerated.java @@ -1129,6 +1129,5 @@ public class FormatterTestGenerated extends AbstractFormatterTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/formatter/WhileOnNewLine.after.inv.kt"); doTestInverted(fileName); } - } } diff --git a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java index 82f936729d7..fccec108a88 100644 --- a/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/formatter/TypingIndentationTestBaseGenerated.java @@ -451,6 +451,5 @@ public class TypingIndentationTestBaseGenerated extends AbstractTypingIndentatio String fileName = KotlinTestUtils.navigationMetadata("idea/testData/indentationOnNewline/SettingAlignMultilineParametersInCalls.after.inv.kt"); doNewlineTestWithInvert(fileName); } - } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java index c02059a04d7..c2f5751cb03 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextFromJsMetadataTestGenerated.java @@ -149,5 +149,4 @@ public class CommonDecompiledTextFromJsMetadataTestGenerated extends AbstractCom String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/TypeModifiers/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java index e1d29e4da69..05bc70ed79b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/CommonDecompiledTextTestGenerated.java @@ -155,5 +155,4 @@ public class CommonDecompiledTextTestGenerated extends AbstractCommonDecompiledT String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledText/TypeModifiers/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java index 12a7c64578f..3eeb51a2723 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JsDecompiledTextFromJsMetadataTestGenerated.java @@ -47,5 +47,4 @@ public class JsDecompiledTextFromJsMetadataTestGenerated extends AbstractJsDecom String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJs/TypeAliases/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java index 1282bb712ec..48ea1a1fb52 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/JvmDecompiledTextTestGenerated.java @@ -59,5 +59,4 @@ public class JvmDecompiledTextTestGenerated extends AbstractJvmDecompiledTextTes String fileName = KotlinTestUtils.navigationMetadata("idea/testData/decompiler/decompiledTextJvm/TypeAliases/"); doTest(fileName); } - } diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index c445dd0583d..e9213e9eebb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -1677,7 +1677,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToElvis/willNotInlineClassProperty.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/branched/ifThenToSafeAccess") @@ -1945,7 +1944,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/branched/ifThenToSafeAccess/willNotInlineClassProperty.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/branched/ifWhen") @@ -3686,7 +3684,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/conventionNameCalls/replaceGetOrSet/unnamedAndNamed.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/conventionNameCalls/replaceInvoke") @@ -6973,7 +6970,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/convertToStringTemplate/unescapeSingleQuote.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/convertToWith") @@ -7826,7 +7822,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/deprecatedCallableAddReplaceWith/ValPropertyWithReturn.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/destructuringInLambda") @@ -7932,7 +7927,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/destructuringInLambda/variables.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/destructuringVariables") @@ -9445,7 +9439,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/iterationOverMap/ValueOnly.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/joinDeclarationAndAssignment") @@ -11891,7 +11884,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/objectLiteralToLambda/WithCommentAfterExpression.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/operatorToFunction") @@ -12720,7 +12712,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitSuperQualifier/WrongOffset2.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/removeExplicitType") @@ -12913,7 +12904,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/removeExplicitTypeArguments/variablesAndLiterals.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/removeForLoopIndices") @@ -14594,7 +14584,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/intentions/simplifyNegatedBinaryExpression/simpleInvert.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/intentions/specifyExplicitLambdaSignature") diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java index 85461a97f13..34c227fa730 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiFileTestGenerated.java @@ -43,7 +43,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInAddStarProjections() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/addStarProjections"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } @TestMetadata("idea/testData/quickfix/autoImports") @@ -851,7 +850,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInCheckArguments() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/checkArguments"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } @TestMetadata("idea/testData/quickfix/convertJavaInterfaceToClass") @@ -1322,7 +1320,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes } } } - } @TestMetadata("idea/testData/quickfix/createFromUsage/createSecondaryConstructor") @@ -1365,7 +1362,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInCreateTypeAlias() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createTypeAlias"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } @TestMetadata("idea/testData/quickfix/createFromUsage/createTypeParameter") @@ -1375,7 +1371,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInCreateTypeParameter() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/createFromUsage/createTypeParameter"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } @TestMetadata("idea/testData/quickfix/createFromUsage/createVariable") @@ -1495,7 +1490,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/createFromUsage/createVariable/property/varOnJavaType.before.Main.kt"); doTestWithExtraFile(fileName); } - } } } @@ -1669,7 +1663,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/increaseVisibility/privateTopLevelVarWithSetterInFile.before.Main.kt"); doTestWithExtraFile(fileName); } - } @TestMetadata("idea/testData/quickfix/migration") @@ -1727,7 +1720,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes doTestWithExtraFile(fileName); } } - } @TestMetadata("idea/testData/quickfix/modifiers") @@ -1764,7 +1756,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes doTestWithExtraFile(fileName); } } - } @TestMetadata("idea/testData/quickfix/nullables") @@ -1774,7 +1765,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInNullables() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/nullables"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } @TestMetadata("idea/testData/quickfix/optimizeImports") @@ -1820,7 +1810,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes doTestWithExtraFile(fileName); } } - } @TestMetadata("idea/testData/quickfix/properties") @@ -1830,7 +1819,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInProperties() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/properties"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } @TestMetadata("idea/testData/quickfix/removeUnused") @@ -1905,9 +1893,7 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInForStatement() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/suppress/forStatement"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } - } @TestMetadata("idea/testData/quickfix/typeImports") @@ -1959,7 +1945,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes doTestWithExtraFile(fileName); } } - } @TestMetadata("idea/testData/quickfix/variables") @@ -1977,9 +1962,6 @@ public class QuickFixMultiFileTestGenerated extends AbstractQuickFixMultiFileTes public void testAllFilesPresentInChangeMutability() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/quickfix/variables/changeMutability"), Pattern.compile("^(\\w+)\\.((before\\.Main\\.\\w+)|(test))$"), TargetBackend.ANY, true); } - } - } - } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java index 4917d6d07fa..270d0f7c79d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixTestGenerated.java @@ -919,7 +919,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/autoImports/unresolvedReferenceInCall.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/quickfix/canBeParameter") @@ -1151,7 +1150,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/quickfix/changeSignature/removeUnusedParameter.kt"); doTest(fileName); } - } @TestMetadata("idea/testData/quickfix/changeToLabeledReturn") @@ -5463,7 +5461,6 @@ public class QuickFixTestGenerated extends AbstractQuickFixTest { doTest(fileName); } } - } @TestMetadata("idea/testData/quickfix/expressions") diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index 079ead3deec..b3204649fe1 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -101,5 +101,4 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError/"); doTest(fileName); } - } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java index d3cc25e5692..ed2ab1264c5 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java @@ -71,5 +71,4 @@ public class ExperimentalChangeIncrementalOptionTestGenerated extends AbstractEx String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/"); doTest(fileName); } - } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java index 30515f8111c..70114c4b886 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java @@ -101,5 +101,4 @@ public class ExperimentalIncrementalCacheVersionChangedTestGenerated extends Abs String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError/"); doTest(fileName); } - } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 973d6634b13..d9e707398a3 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -169,7 +169,6 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @@ -1018,7 +1017,6 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @@ -1126,7 +1124,6 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); doTest(fileName); } - } } @@ -1221,7 +1218,6 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); doTest(fileName); } - } } @@ -1316,7 +1312,6 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected") @@ -1596,6 +1591,5 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); doTest(fileName); } - } } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java index 75543c672f3..f1e983b88ff 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java @@ -83,5 +83,4 @@ public class ExperimentalIncrementalLazyCachesTestGenerated extends AbstractExpe String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); doTest(fileName); } - } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index 4ca20738206..8a384e2e0a9 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -101,5 +101,4 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError/"); doTest(fileName); } - } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index f10f0b46907..dd59d1607f9 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -169,7 +169,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @@ -1018,7 +1017,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @@ -1126,7 +1124,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); doTest(fileName); } - } } @@ -1221,7 +1218,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); doTest(fileName); } - } } @@ -1316,6 +1312,5 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); doTest(fileName); } - } } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index cb5736a358d..f9a5e8adb5c 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -83,5 +83,4 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); doTest(fileName); } - } diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index e60ed9d3c4d..bcd0ee79157 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -79,7 +79,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange") @@ -119,7 +118,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged") @@ -177,7 +175,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/comparison/packageMembers") @@ -217,7 +214,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/comparison/unchanged") @@ -239,6 +235,5 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/"); doTest(fileName); } - } } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java index ea921b1d576..022d92368e9 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java @@ -1848,7 +1848,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/builtinStubMethods/extendJavaCollections/hashSet.kt"); doTest(fileName); } - } } @@ -12667,7 +12666,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { public void testAllFilesPresentInOptimized() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/multifileClasses/optimized"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true); } - } } @@ -20732,7 +20730,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { } throw new AssertionError("Looks like this test can be unmuted. Remove IGNORE_BACKEND directive for that."); } - } } @@ -20932,7 +20929,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/secondaryConstructors/withReturnUnit.kt"); doTest(fileName); } - } @TestMetadata("compiler/testData/codegen/box/smap") @@ -20942,7 +20938,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest { public void testAllFilesPresentInSmap() throws Exception { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/codegen/box/smap"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.JS, true); } - } @TestMetadata("compiler/testData/codegen/box/smartCasts") diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java index 4e3aaea953d..76c4255046c 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OutputPrefixPostfixTestGenerated.java @@ -59,5 +59,4 @@ public class OutputPrefixPostfixTestGenerated extends AbstractOutputPrefixPostfi String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/outputPrefixPostfix/simpleWithPrefixAndPostfix.kt"); doTest(fileName); } - } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java index dccfefd35fb..d9470ebf8c7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/SourceMapGenerationSmokeTestGenerated.java @@ -53,5 +53,4 @@ public class SourceMapGenerationSmokeTestGenerated extends AbstractSourceMapGene String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/sourcemap/methodCallInMethod.kt"); doTest(fileName); } - }