From ee2e40ce6b3da63f3fbc990c53ab069c2032764e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 7 Feb 2020 06:34:36 +0300 Subject: [PATCH] Regenerate test --- ...WithScopeExpansionRunnerTestGenerated.java | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java index bde87d51121..2ecfceaa33b 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ @@ -8,7 +8,6 @@ package org.jetbrains.kotlin.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; -import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -24,7 +23,7 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } @TestMetadata("accessingFunctionsViaPackagePart") @@ -63,7 +62,7 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, false); } @TestMetadata("annotations") @@ -627,11 +626,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class ClassHierarchyAffected extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInClassHierarchyAffected() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), null, false); } @TestMetadata("annotationFlagRemoved") @@ -835,11 +834,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class Js extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInJs() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/js"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/js"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("inlineFunctionLocalDeclarationChanges") @@ -852,11 +851,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class FriendsModuleDisabled extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInFriendsModuleDisabled() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/js/friendsModuleDisabled"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/js/friendsModuleDisabled"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("internalInlineFunctionIsChanged") @@ -869,11 +868,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class InternalInlineFunctionIsChanged extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInInternalInlineFunctionIsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -883,11 +882,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunctionLocalDeclarationChanges extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInInlineFunctionLocalDeclarationChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -897,11 +896,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class ScopeExpansion extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInScopeExpansion() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/scopeExpansion"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("changeTypeAliasAndUsage") @@ -919,11 +918,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class ChangeTypeAliasAndUsage extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInChangeTypeAliasAndUsage() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/scopeExpansion/changeTypeAliasAndUsage"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -932,11 +931,11 @@ public class IncrementalJsKlibCompilerWithScopeExpansionRunnerTestGenerated exte @RunWith(JUnit3RunnerWithInners.class) public static class ProtectedBecomesPublicAccessedTroughChild extends AbstractIncrementalJsKlibCompilerWithScopeExpansionRunnerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInProtectedBecomesPublicAccessedTroughChild() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/scopeExpansion/protectedBecomesPublicAccessedTroughChild"), Pattern.compile("^([^\\.]+)$"), null, true); } } }