From f7ef16d2d5555b46c35ed91c3b6ea43ae52079a0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 9 Nov 2019 00:42:10 +0100 Subject: [PATCH] Regenerate tests This fixes project compilation after incorrect merge of da4097f4/e89a87b2 and 4ed64b02 --- .../SmartCompletionHandlerTestGenerated.java | 4 ++-- .../PerformanceHighlightingTestGenerated.java | 10 ++++++++++ ...rmanceSmartCompletionHandlerTestGenerated.java | 4 ++-- .../highlighter/HighlightingTestGenerated.java | 15 ++++++++++----- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java index 8352fd8e707..02fa44f2742 100644 --- a/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java +++ b/idea/idea-completion/tests/org/jetbrains/kotlin/idea/completion/test/handlers/SmartCompletionHandlerTestGenerated.java @@ -809,11 +809,11 @@ public class SmartCompletionHandlerTestGenerated extends AbstractSmartCompletion @RunWith(JUnit3RunnerWithInners.class) public static class SuspendLambdaSignature extends AbstractSmartCompletionHandlerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); } public void testAllFilesPresentInSuspendLambdaSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart/suspendLambdaSignature"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart/suspendLambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NoAdditionalSpace.kt") diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceHighlightingTestGenerated.java b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceHighlightingTestGenerated.java index a06d9916a1e..b69a7cdba28 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceHighlightingTestGenerated.java +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceHighlightingTestGenerated.java @@ -98,11 +98,21 @@ public class PerformanceHighlightingTestGenerated extends AbstractPerformanceHig runTest("idea/testData/highlighter/Object.kt"); } + @TestMetadata("PropertiesWithPropertyDeclarations.kt") + public void testPropertiesWithPropertyDeclarations() throws Exception { + runTest("idea/testData/highlighter/PropertiesWithPropertyDeclarations.kt"); + } + @TestMetadata("SmartCast.kt") public void testSmartCast() throws Exception { runTest("idea/testData/highlighter/SmartCast.kt"); } + @TestMetadata("Suspend.kt") + public void testSuspend() throws Exception { + runTest("idea/testData/highlighter/Suspend.kt"); + } + @TestMetadata("SyntheticExtensionProperty.kt") public void testSyntheticExtensionProperty() throws Exception { runTest("idea/testData/highlighter/SyntheticExtensionProperty.kt"); diff --git a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceSmartCompletionHandlerTestGenerated.java b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceSmartCompletionHandlerTestGenerated.java index e98c686b25b..853eee4ddc3 100644 --- a/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceSmartCompletionHandlerTestGenerated.java +++ b/idea/performanceTests/org/jetbrains/kotlin/idea/perf/PerformanceSmartCompletionHandlerTestGenerated.java @@ -809,11 +809,11 @@ public class PerformanceSmartCompletionHandlerTestGenerated extends AbstractPerf @RunWith(JUnit3RunnerWithInners.class) public static class SuspendLambdaSignature extends AbstractPerformanceSmartCompletionHandlerTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doPerfTest, TargetBackend.ANY, testDataFilePath); + KotlinTestUtils.runTest(this::doPerfTest, this, testDataFilePath); } public void testAllFilesPresentInSuspendLambdaSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart/suspendLambdaSignature"), Pattern.compile("^(.+)\\.kt$"), TargetBackend.ANY, true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/idea-completion/testData/handlers/smart/suspendLambdaSignature"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("NoAdditionalSpace.kt") diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java index c8549278878..0ef8c493445 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/HighlightingTestGenerated.java @@ -98,11 +98,21 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest { runTest("idea/testData/highlighter/Object.kt"); } + @TestMetadata("PropertiesWithPropertyDeclarations.kt") + public void testPropertiesWithPropertyDeclarations() throws Exception { + runTest("idea/testData/highlighter/PropertiesWithPropertyDeclarations.kt"); + } + @TestMetadata("SmartCast.kt") public void testSmartCast() throws Exception { runTest("idea/testData/highlighter/SmartCast.kt"); } + @TestMetadata("Suspend.kt") + public void testSuspend() throws Exception { + runTest("idea/testData/highlighter/Suspend.kt"); + } + @TestMetadata("SyntheticExtensionProperty.kt") public void testSyntheticExtensionProperty() throws Exception { runTest("idea/testData/highlighter/SyntheticExtensionProperty.kt"); @@ -143,11 +153,6 @@ public class HighlightingTestGenerated extends AbstractHighlightingTest { runTest("idea/testData/highlighter/VariablesAsFunctions.kt"); } - @TestMetadata("PropertiesWithPropertyDeclarations.kt") - public void testPropertiesWithPropertyDeclarations() throws Exception { - runTest("idea/testData/highlighter/PropertiesWithPropertyDeclarations.kt"); - } - @TestMetadata("idea/testData/highlighter/deprecated") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)