From bca8e963625d0ced8612d8cd1721dbc0a48dfbe6 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Mon, 25 May 2020 21:54:34 +0200
Subject: [PATCH] Clean up after nicer performance tests suite dsl

---
 .../kotlin/idea/perf/AbstractPerformanceProjectsTest.kt   | 2 +-
 .../jetbrains/kotlin/idea/perf/PerformanceStressTest.kt   | 8 ++++++--
 .../jetbrains/kotlin/idea/perf/util/performanceSuite.kt   | 3 ---
 .../org/jetbrains/kotlin/idea/perf/util/testProject.kt    | 3 ---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
index 41de40c46b3..1a6816c1872 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/AbstractPerformanceProjectsTest.kt
@@ -58,7 +58,7 @@ abstract class AbstractPerformanceProjectsTest : UsefulTestCase() {
         super.setUp()
 
         myApplication = initApp(testRootDisposable)
-        initSdk(testRootDisposable)
+        jdk18 = initSdk(testRootDisposable)
     }
 
     internal fun warmUpProject(stats: Stats, vararg filesToHighlight: String, openProject: () -> Project) {
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceStressTest.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceStressTest.kt
index 4ddc5a3f52c..6510fb78e9f 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceStressTest.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/PerformanceStressTest.kt
@@ -10,7 +10,6 @@ import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.kotlin.idea.perf.util.DefaultProfile
 import org.jetbrains.kotlin.idea.perf.util.PerformanceSuite
 import org.jetbrains.kotlin.idea.perf.util.PerformanceSuite.TypingConfig
-import org.jetbrains.kotlin.idea.perf.util.ProjectProfile
 import org.jetbrains.kotlin.idea.perf.util.suite
 import org.jetbrains.kotlin.idea.testFramework.commitAllDocuments
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners
@@ -26,7 +25,7 @@ class PerformanceStressTest : UsefulTestCase() {
 
         suite(
             suiteName = "Lots of overloaded method project",
-            config = PerformanceSuite.StatsScopeConfig(name = "kt-35135 project", warmup = 8, iterations = 15)
+            config = PerformanceSuite.StatsScopeConfig(name = "kt-35135 project")
         ) {
             app {
                 warmUpProject()
@@ -76,6 +75,11 @@ class PerformanceStressTest : UsefulTestCase() {
                             delayMs = 50
                         )
 
+                        with(config) {
+                            warmup = 8
+                            iterations = 15
+                        }
+
                         measure<List<HighlightInfo>>("type override fun foo()", fixture = fixture) {
                             before = {
                                 moveCursor(typingConfig)
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
index 7e4325bef03..b89ec2b48bb 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/performanceSuite.kt
@@ -45,9 +45,6 @@ import org.jetbrains.kotlin.idea.testFramework.TestApplicationManager
 import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe
 import java.io.File
 
-/**
- * @author Vladimir Ilmov
- */
 class PerformanceSuite {
     companion object {
 
diff --git a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/testProject.kt b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/testProject.kt
index 0d3f9f47a3e..76f5067ad2e 100644
--- a/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/testProject.kt
+++ b/idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/testProject.kt
@@ -7,9 +7,6 @@ package org.jetbrains.kotlin.idea.perf.util
 
 import org.jetbrains.kotlin.idea.testFramework.ProjectOpenAction
 
-/**
- * @author Vladimir Ilmov
- */
 class ExternalProject(val path: String, val openWith: ProjectOpenAction) {
     companion object {
         const val KOTLIN_PROJECT_PATH = "../perfTestProject"