From 7db9f9c3aec83243677c65ad9cd0f71b71df6e51 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 15 Jun 2023 12:26:46 +0200 Subject: [PATCH] minor: script some test cases to speedup parallel execution --- .../scripting/ide_services/JvmReplTest.kt | 4 +- .../ReplCompletionAndErrorsAnalysisTest.kt | 74 ++++++++++--------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt b/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt index b9afcd84a31..74c624d2950 100644 --- a/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt +++ b/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/JvmReplTest.kt @@ -367,7 +367,7 @@ class JvmIdeServicesTest : TestCase() { } } -class LegacyReplTestLong : TestCase() { +class LegacyReplTestLong1 : TestCase() { fun test256Evals() { JvmTestRepl() .use { repl -> @@ -397,7 +397,9 @@ class LegacyReplTestLong : TestCase() { assertEquals(evaluated.toString(), evals, (evaluated?.result as ResultValue.Value?)?.value) } } +} +class LegacyReplTestLong2 : TestCase() { fun testReplSlowdownKt22740() { JvmTestRepl() .use { repl -> diff --git a/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/ReplCompletionAndErrorsAnalysisTest.kt b/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/ReplCompletionAndErrorsAnalysisTest.kt index 963aa7a217f..799e71091bf 100644 --- a/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/ReplCompletionAndErrorsAnalysisTest.kt +++ b/plugins/scripting/scripting-ide-services-test/test/org/jetbrains/kotlin/scripting/ide_services/ReplCompletionAndErrorsAnalysisTest.kt @@ -506,42 +506,6 @@ class ReplCompletionAndErrorsAnalysisTest : TestCase() { } } - @Test - fun testLongRunningCompilationWithReceiver() = test { - // This test normally completes in about 8-13s - // Removing skip* configuration parameters should slow down the test (2-3 times) - - val conf = ScriptCompilationConfiguration { - jvm { - updateClasspath(classpathFromClass()) - } - implicitReceivers(TestReceiver1::class, TestReceiver2::class) - skipExtensionsResolutionForImplicits(KotlinType(TestReceiver1::class)) - skipExtensionsResolutionForImplicitsExceptInnermost(KotlinType(TestReceiver2::class)) - } - - val writer = System.out.writer() - for (i in 1..200) { - run(longCompilationRun(writer, i, conf)) - run { - compilationConfiguration = conf - - code = """ - val x = xyz - """.trimIndent() - cursor = 11 - - expect { - completions.mode = ComparisonType.EQUALS - addCompletion("xyz1", "xyz1", "Int", "property") - addCompletion("xyz2", "xyz2", "Int", "property") - } - - loggingInfo = CSVLoggingInfo(complete = CSVLoggingInfoItem(writer, i, "complete;")) - } - } - } - private val setupDefaultImportsCompletionRun: TestRunConfigurator = { compilationConfiguration = ScriptCompilationConfiguration { defaultImports(listOf("kotlin.math.atan")) @@ -630,3 +594,41 @@ private fun longCompletionRun(writer: Writer, i: Int, conf: ScriptCompilationCon } } +class ReplCompletionAndErrorsAnalysisLongRunningTest1 : TestCase() { + + @Test + fun testLongRunningCompilationWithReceiver() = test { + // This test normally completes in about 8-13s + // Removing skip* configuration parameters should slow down the test (2-3 times) + + val conf = ScriptCompilationConfiguration { + jvm { + updateClasspath(classpathFromClass()) + } + implicitReceivers(TestReceiver1::class, TestReceiver2::class) + skipExtensionsResolutionForImplicits(KotlinType(TestReceiver1::class)) + skipExtensionsResolutionForImplicitsExceptInnermost(KotlinType(TestReceiver2::class)) + } + + val writer = System.out.writer() + for (i in 1..200) { + run(longCompilationRun(writer, i, conf)) + run { + compilationConfiguration = conf + + code = """ + val x = xyz + """.trimIndent() + cursor = 11 + + expect { + completions.mode = ComparisonType.EQUALS + addCompletion("xyz1", "xyz1", "Int", "property") + addCompletion("xyz2", "xyz2", "Int", "property") + } + + loggingInfo = CSVLoggingInfo(complete = CSVLoggingInfoItem(writer, i, "complete;")) + } + } + } +}