fix tests

Author: vol0n

clion-plugin/build.gradle.kts

@@ -196,7 +196,7 @@ tasks {
         setScanForTestClasses(false)
         // Only run tests from classes that end with "Test"
         include("**/*Test.class")
-        exclude("**/*BaseGenerationTestCaseTest.class")
+        exclude("**/*BaseGenerationTestCaseTest.class", "**/*BaseBuildingTest.class")
         systemProperty("idea.log.debug.categories", true)
         systemProperty("idea.log.trace.categories", true)
 

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/UTBotStartupActivity.kt

@@ -4,6 +4,7 @@ import com.intellij.ide.util.RunOnceUtil
 import com.intellij.openapi.components.service
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
+import org.tinylog.kotlin.Logger
 import org.utbot.cpp.clion.plugin.client.ManagedClient
 import org.utbot.cpp.clion.plugin.settings.settings
 
@@ -12,6 +13,7 @@ class UTBotStartupActivity : StartupActivity {
         // We initialize Client here, so that initialization will not happen
         // when user issues first generation request which would cause a UI freeze.
         if (project.settings.storedSettings.isPluginEnabled) {
+            Logger.info("startup activity is run: Initializing client")
             initializeClient(project)
             guessPathsOnFirstOpen(project)
         }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/BaseGenerateTestsAction.kt

@@ -2,6 +2,8 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.actions.UTBotBaseAction
+import org.utbot.cpp.clion.plugin.client.ManagedClient
+import org.utbot.cpp.clion.plugin.utils.activeProject
 import org.utbot.cpp.clion.plugin.utils.client
 
 abstract class BaseGenerateTestsAction : UTBotBaseAction() {
@@ -10,7 +12,7 @@ abstract class BaseGenerateTestsAction : UTBotBaseAction() {
         val isDefined: Boolean = isDefined(e)
 
         e.presentation.isVisible = isDefined
-        e.presentation.isEnabled = isDefined && e.client.isServerAvailable()
+        e.presentation.isEnabled = isDefined && ManagedClient.isConnectedToServer(e.activeProject())
     }
 
     /**

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/ManagedClient.kt

@@ -2,6 +2,7 @@ package org.utbot.cpp.clion.plugin.client
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
+import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import org.utbot.cpp.clion.plugin.client.channels.GTestLogChannelImpl
@@ -26,6 +27,7 @@ class ManagedClient(val project: Project) : Disposable {
     private val clientId = generateClientID()
     private val loggingChannels = listOf<LogChannel>(GTestLogChannelImpl(project), ServerLogChannelImpl(project))
     val isPluginEnabled: Boolean get() = project.settings.storedSettings.isPluginEnabled
+
     // if plugin is disabled then Client is null
     private var client: Client? =
         if (isPluginEnabled) createNewClient() else null
@@ -107,6 +109,8 @@ class ManagedClient(val project: Project) : Disposable {
     }
 
     companion object {
+        fun isConnectedToServer(project: Project) =
+            project.serviceIfCreated<ManagedClient>()?.isServerAvailable() ?: false
         const val RANDOM_SEQUENCE_MAX_VALUE = 10
         const val RANDOM_SEQUENCE_LENGTH = 5
     }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/channels/LogChannelImpl.kt

@@ -18,12 +18,15 @@ abstract class LogChannelImpl(val project: Project) : LogChannel {
     abstract val name: String
     abstract val logLevel: String
 
-    val console: UTBotConsole by lazy { createConsole() }
+    // because this function is called asynchronously (we call it from invokeOnEdt which is async)
+    // it may be called when project is disposed or other services are disposed -- this is very unlikely in production
+    // but possible in tests, so we do nothing if this happens
+    private val console: UTBotConsole? by lazy { if (project.isDisposed) null else createConsole() }
 
     abstract suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry>
     abstract suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub)
 
-    abstract fun createConsole(): UTBotConsole
+    abstract fun createConsole(): UTBotConsole?
 
     override fun toString(): String = name
 
@@ -37,6 +40,6 @@ abstract class LogChannelImpl(val project: Project) : LogChannel {
 
         open(stub)
             .catch { cause -> logger.error { "Exception in log channel: $name \n$cause" } }
-            .collect { invokeOnEdt { console.info(it.message) } }
+            .collect { invokeOnEdt { console?.info(it.message) } }
     }
 }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/handlers/StreamHandler.kt

@@ -5,6 +5,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onCompletion
+import org.tinylog.kotlin.Logger
 
 /**
  * Base class for handling stream of server responses

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/services/OutputProvider.kt

@@ -65,4 +65,8 @@ class OutputProvider(val project: Project) : Disposable {
             }
         }
     }
+
+    companion object {
+
+    }
 }

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/UTBotToolWindowFactory.kt

@@ -9,6 +9,7 @@ import com.intellij.openapi.wm.ToolWindowFactory
 import org.utbot.cpp.clion.plugin.UTBot
 import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.logsToolWindow.ConsoleToolWindow
 import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
+import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
 
 class UTBotToolWindowFactory : ToolWindowFactory, DumbAware {
     private val logger = Logger.getInstance(this::class.java)

clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/utbotToolWindow/targetToolWindow/UTBotTargetsController.kt

@@ -26,7 +26,6 @@ class UTBotTargetsController(val project: Project) {
 
     private var areTargetsUpToDate = false
     private val targetsUiModel = CollectionListModel(mutableListOf<UTBotTarget>())
-    private val client = project.service<ManagedClient>()
     val targetsToolWindow: UTBotTargetsToolWindow by lazy { UTBotTargetsToolWindow(targetsUiModel, this) }
 
     val targets: List<UTBotTarget>
@@ -39,12 +38,14 @@ class UTBotTargetsController(val project: Project) {
     fun isTargetUpToDate(path: String): Boolean = areTargetsUpToDate && targets.find { it.path == path } != null
 
     fun requestTargetsFromServer() {
+        invokeOnEdt { requestTargetsEdt() }
+    }
+
+    private fun requestTargetsEdt() {
         areTargetsUpToDate = false
 
-        invokeOnEdt {
-            targetsUiModel.removeAll()
-            targetsToolWindow.setBusy(true)
-        }
+        targetsUiModel.removeAll()
+        targetsToolWindow.setBusy(true)
         ProjectTargetsRequest(
             GrpcRequestBuilderFactory(project).createProjectTargetsRequestBuilder(),
             project,
@@ -76,14 +77,14 @@ class UTBotTargetsController(val project: Project) {
                     targetsToolWindow.setBusy(false)
                 }
             }).let { targetsRequest ->
-            //todo: throw exception from client and handle it here
+            val client = project.service<ManagedClient>()
+
             if (!client.isServerAvailable()) {
                 logger.error { "Could not request targets from server: server is unavailable!" }
-                invokeOnEdt {
-                    targetsToolWindow.setBusy(false)
-                }
+                targetsToolWindow.setBusy(false)
                 return
             }
+
             logger.trace { "Requesting project targets from server!" }
             client.executeRequest(targetsRequest)
         }
@@ -110,7 +111,7 @@ class UTBotTargetsController(val project: Project) {
                     if (newStatus != oldStatus) {
                         // todo: remove this, when ci is fixed
                         if (!ApplicationManager.getApplication().isUnitTestMode)
-                            requestTargetsFromServer()
+                            invokeOnEdt(::requestTargetsFromServer)
                     }
                 }
             }

clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/buildingRequestsTests/BaseBuildingTest.kt

@@ -4,6 +4,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.ex.ActionUtil
 import com.intellij.openapi.project.Project
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
+import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.extension.ExtendWith
 import org.utbot.cpp.clion.plugin.SwingEdtInterceptor
 import org.utbot.cpp.clion.plugin.actions.generate.GenerateForLineAction
@@ -41,6 +42,11 @@ open class BaseBuildingTest {
         }
     }
 
+    @AfterEach
+    fun tearDown() {
+        fixture.tearDown()
+    }
+
     // HELPER METHODS:
 
     protected fun createExpectedProjectContext(remotePath: String): Testgen.ProjectContext {

clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/integrationTests/BaseGenerationTestCase.kt

@@ -74,12 +74,12 @@ abstract class BaseGenerationTestCase {
     }
 
     protected fun waitForConnection(timeout: Long = 10000L) {
+        Logger.info { "Waiting for connection to server!" }
         runBlocking {
             try {
                 withTimeout(timeout) {
                     while (!client.isServerAvailable()) {
                         delay(1000L)
-                        Logger.info { "Waiting for connection to server!" }
                     }
                 }
             } catch (_: TimeoutCancellationException) {

clion-plugin/src/test/resources/tinylog.properties

@@ -1,2 +1,3 @@
 writer        = console
+writer.level  = ${PLUGIN_LOG_LEVEL:info}
 writer.format = {date: HH:mm:ss.SSS} | {file}: {line} [{thread}] {pipe}{level}{pipe} {message}