Fixed durations (#340)

Author: sksamuel

build.gradle.kts

@@ -76,7 +76,7 @@ val descriptors = listOf(
    ),
 )
 
-val productName = System.getenv("PRODUCT_NAME") ?: "IC-242"
+val productName = System.getenv("PRODUCT_NAME") ?: "IC-243"
 val jvmTargetVersion = System.getenv("JVM_TARGET") ?: "17"
 val descriptor = descriptors.first { it.sourceFolder == productName }
 

gradle.properties

@@ -8,3 +8,5 @@ org.gradle.caching=true
 sandbox = /tmp/
 
 kotlin.stdlib.default.dependency = false
+org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+systemProp.org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

src/main/kotlin/io/kotest/plugin/intellij/console/KotestExecutionConsoleManager.kt

@@ -6,6 +6,8 @@ import com.intellij.execution.process.ProcessHandler
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil
 import com.intellij.execution.testframework.sm.runner.SMTRunnerEventsListener
+import com.intellij.execution.testframework.sm.runner.SMTestProxy.SMRootTestProxy
+import com.intellij.execution.testframework.sm.runner.events.TestDurationStrategy
 import com.intellij.execution.testframework.sm.runner.ui.SMTRunnerConsoleView
 import com.intellij.openapi.actionSystem.AnAction
 import com.intellij.openapi.externalSystem.execution.ExternalSystemExecutionConsoleManager
@@ -16,7 +18,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
 import io.kotest.plugin.intellij.Constants
 import jetbrains.buildServer.messages.serviceMessages.ServiceMessagesParser
-import org.jetbrains.plugins.gradle.service.execution.GradleRunConfiguration
 import org.jetbrains.plugins.gradle.util.GradleConstants
 
 //object KotestConsoleFilterProvider: ConsoleFilterProvider {
@@ -47,7 +48,7 @@ class KotestExecutionConsoleManager : ExternalSystemExecutionConsoleManager<SMTR
       return emptyArray()
    }
 
-   @Suppress("UnstableApiUsage")
+   @Suppress("UnstableApiUsage", "OverrideOnly")
    override fun attachExecutionConsole(
       project: Project,
       task: ExternalSystemTask,
@@ -59,11 +60,9 @@ class KotestExecutionConsoleManager : ExternalSystemExecutionConsoleManager<SMTR
       if (processHandler == null) return null
       val settings = env.runnerAndConfigurationSettings ?: return null
 
-      val runConfiguration = settings.configuration as GradleRunConfiguration
-      val consoleProperties = KotestSMTRunnerConsoleProperties(runConfiguration, env.executor)
+      val consoleProperties = KotestSMTRunnerConsoleProperties(settings.configuration, env.executor)
 
 //      val splitterPropertyName = SMTestRunnerConnectionUtil.getSplitterPropertyName(Constants.FrameworkName)
-//
 //      val consoleView = KotestSMTRunnerConsoleView(consoleProperties, splitterPropertyName)
 
       val consoleView = SMTestRunnerConnectionUtil.createConsole(consoleProperties)
@@ -72,6 +71,16 @@ class KotestExecutionConsoleManager : ExternalSystemExecutionConsoleManager<SMTR
       SMTestRunnerConnectionUtil.initConsoleView(consoleView, Constants.FRAMEWORK_NAME)
 
       consoleView.resultsViewer.testsRootNode.executionId = env.executionId
+      try {
+         // don't know why this method is not public, and cannot figure out how to override it
+         // see https://youtrack.jetbrains.com/issue/IJSDK-2340/set-duration-strategy-on-SMRootTestProxy
+         val method = SMRootTestProxy::class.java.getDeclaredMethod("setDurationStrategy", TestDurationStrategy::class.java)
+         method.isAccessible = true
+         method.invoke(consoleView.resultsViewer.testsRootNode, TestDurationStrategy.MANUAL)
+      } catch (e: Exception) {
+         println(e)
+         e.printStackTrace()
+      }
       consoleView.resultsViewer.testsRootNode.setSuiteStarted()
 
       val publisher = project.messageBus.syncPublisher(SMTRunnerEventsListener.TEST_STATUS)
@@ -89,6 +98,7 @@ class KotestExecutionConsoleManager : ExternalSystemExecutionConsoleManager<SMTR
             }
             consoleView.resultsViewer.onBeforeTestingFinished(consoleView.resultsViewer.testsRootNode)
             publisher.onBeforeTestingFinished(consoleView.resultsViewer.testsRootNode)
+
             consoleView.resultsViewer.onTestingFinished(consoleView.resultsViewer.testsRootNode)
             publisher.onTestingFinished(consoleView.resultsViewer.testsRootNode)
          }

src/main/kotlin/io/kotest/plugin/intellij/console/KotestSMTRunnerConsoleProperties.kt

@@ -2,17 +2,17 @@ package io.kotest.plugin.intellij.console
 
 import com.intellij.execution.Executor
 import com.intellij.execution.Location
+import com.intellij.execution.configurations.RunConfiguration
 import com.intellij.execution.testframework.JavaAwareTestConsoleProperties
 import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties
 import com.intellij.execution.testframework.sm.runner.SMTestLocator
-import com.intellij.openapi.externalSystem.service.execution.ExternalSystemRunConfiguration
 import com.intellij.pom.Navigatable
 import io.kotest.plugin.intellij.Constants
 import io.kotest.plugin.intellij.KotestTestLocator
 import javax.swing.tree.TreeSelectionModel
 
 class KotestSMTRunnerConsoleProperties(
-   conf: ExternalSystemRunConfiguration,
+   conf: RunConfiguration,
    executor: Executor
 ) : SMTRunnerConsoleProperties(conf, Constants.FRAMEWORK_NAME, executor) {
 

src/main/kotlin/io/kotest/plugin/intellij/console/KotestServiceMessageCallback.kt

@@ -47,7 +47,7 @@ class KotestServiceMessageCallback(
             proxy.setFinished()
             val attrs = MessageAttributeParser.parse(msg)
             // this will actually be ignored due to a bug in intellij
-            proxy.setDuration(attrs.duration?.inWholeMilliseconds ?: 0L)
+            attrs.duration?.let { proxy.setDuration(attrs.duration.inWholeMilliseconds) }
             console.resultsViewer.onSuiteFinished(proxy)
             publisher.onSuiteFinished(proxy)
          }
@@ -61,7 +61,7 @@ class KotestServiceMessageCallback(
             val proxy = getProxy(msg)
             proxy.setFinished()
             val attrs = MessageAttributeParser.parse(msg)
-            proxy.setDuration(attrs.duration?.inWholeMilliseconds ?: 0L)
+            attrs.duration?.let { proxy.setDuration(attrs.duration.inWholeMilliseconds) }
             console.resultsViewer.onTestFinished(proxy)
             publisher.onTestFinished(proxy)
          }
@@ -96,6 +96,4 @@ class KotestServiceMessageCallback(
       val attrs = MessageAttributeParser.parse(msg)
       return proxies[attrs.id] ?: error("Proxy ${attrs.id} not found")
    }
-
-
 }