azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PerfTests gradle interceptor clean up

Browse Source
This commit is contained in:
Vladimir Dolzhenko
2020-05-26 21:49:38 +02:00
parent a1c173733c
commit 5c58a9dfd1
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/HighlightWholeProjectPerformanceTest.kt
+10 -12
View File
@@ -38,18 +38,17 @@ class HighlightWholeProjectPerformanceTest : UsefulTestCase() {
fun testHighlightAllKtFilesInProject() { fun testHighlightAllKtFilesInProject() {
val emptyProfile = System.getProperty("emptyProfile", "false").toBoolean() val emptyProfile = System.getProperty("emptyProfile", "false").toBoolean()
val projectSpecs = projectSpecs() val projectSpecs = projectSpecs()
for (projectSpec in projectSpecs) { suite(suiteName = "allKtFilesInProject") {
val projectName = projectSpec.name app {
val projectPath = projectSpec.path warmUpProject()
suite(suiteName = "$projectName project") { with(config) {
app { warmup = 1
warmUpProject() iterations = 3
}
with(config) { for (projectSpec in projectSpecs) {
warmup = 1 val projectName = projectSpec.name
iterations = 3 val projectPath = projectSpec.path
}
try { try {
project(ExternalProject(projectPath, ProjectOpenAction.GRADLE_PROJECT), refresh = true) { project(ExternalProject(projectPath, ProjectOpenAction.GRADLE_PROJECT), refresh = true) {
@@ -93,7 +92,6 @@ class HighlightWholeProjectPerformanceTest : UsefulTestCase() {
// nothing as it is already caught by perfTest // nothing as it is already caught by perfTest
} }
} }
} }
} }
} }
idea/performanceTests/test/org/jetbrains/kotlin/idea/perf/util/logging.kt
+1 -1
View File
@@ -9,7 +9,7 @@ import java.io.PrintWriter
import java.io.StringWriter import java.io.StringWriter
inline fun gradleMessage(block: () -> String) { inline fun gradleMessage(block: () -> String) {
//print("#gradle ${block()}") print("#gradle ${block()}")
} }
inline fun logMessage(message: () -> String) { inline fun logMessage(message: () -> String) {
idea/performanceTests/test/org/jetbrains/kotlin/idea/testFramework/GradleProcessOutputInterceptor.kt
+4 -1
View File
@@ -24,8 +24,11 @@ interface GradleProcessOutputInterceptor {
fun install(parentDisposable: Disposable) { fun install(parentDisposable: Disposable) {
val installedExtensions = EP.extensions val installedExtensions = EP.extensions
val actual = installedExtensions.firstIsInstanceOrNull<GradleProcessOutputInterceptor>()
if (actual is GradleProcessOutputInterceptorImpl) return
assertNull( assertNull(
installedExtensions.firstIsInstanceOrNull<GradleProcessOutputInterceptor>(), actual,
"Another ${GradleProcessOutputInterceptor::class.java.simpleName} is already installed" "Another ${GradleProcessOutputInterceptor::class.java.simpleName} is already installed"
) )