From 343735e36c36e4b4a877b6c79427d1e5ac2a9143 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 18 Feb 2016 13:04:16 +0100 Subject: [PATCH] fixing test after changing cleanup scheme - first it is now required to rebuild sources, and therefore consumed memory is increased --- .../jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt | 2 +- .../org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt index 0afc91a6c9c..7aa2ebce9f5 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BasicKotlinGradlePluginIT.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.gradle -import org.gradle.api.logging.LogLevel import org.junit.Test +import org.gradle.api.logging.LogLevel class SimpleKotlinGradleIT : BaseGradleIT() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index 4a78441b6f1..06871e8d73d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -63,12 +63,13 @@ class KotlinGradleIT: BaseGradleIT() { } for (i in 1..3) { - project.build(userVariantArg, "build", options = BaseGradleIT.BuildOptions(withDaemon = true)) { + project.build(userVariantArg, "clean", "build", options = BaseGradleIT.BuildOptions(withDaemon = true)) { assertSuccessful() - val matches = "\\[PERF\\] Used memory after build: (\\d+) kb \\(([+-]?\\d+) kb\\)".toRegex().find(output) - assert(matches != null && matches.groups.size == 3) { "Used memory after build is not reported by plugin" } + val matches = "\\[PERF\\] Used memory after build: (\\d+) kb \\(difference since build start: ([+-]?\\d+) kb\\)".toRegex().find(output) + assert(matches != null && matches.groups.size == 3) { "Used memory after build is not reported by plugin on attempt $i" } val reportedGrowth = matches!!.groups.get(2)!!.value.removePrefix("+").toInt() - assert(reportedGrowth <= 700) { "Used memory growth $reportedGrowth > 700" } + val expectedGrowthLimit = 2000 + assert(reportedGrowth <= expectedGrowthLimit) { "Used memory growth $reportedGrowth > $expectedGrowthLimit" } } }