Refactor some other pieces of code in CLion plugin

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.AssertionRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.AssertionRequest
 import org.utbot.cpp.clion.plugin.grpc.getAssertionGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.ClassRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.ClassRequest
 import org.utbot.cpp.clion.plugin.grpc.getClassGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 import org.utbot.cpp.clion.plugin.utils.isCPPFileName

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.FileRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.FileRequest
 import org.utbot.cpp.clion.plugin.grpc.getFileGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.FolderRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.FolderRequest
 import org.utbot.cpp.clion.plugin.grpc.getFolderGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.FunctionRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.FunctionRequest
 import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.LineRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.LineRequest
 import org.utbot.cpp.clion.plugin.grpc.getLineGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 

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

@@ -11,8 +11,8 @@ import javax.swing.ListSelectionModel
 import javax.swing.event.DocumentEvent
 import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
 import org.utbot.cpp.clion.plugin.grpc.getPredicateGrpcRequest
-import org.utbot.cpp.clion.plugin.client.requests.FunctionReturnTypeRequest
-import org.utbot.cpp.clion.plugin.client.requests.PredicateRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.FunctionReturnTypeRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.PredicateRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 import org.utbot.cpp.clion.plugin.utils.currentClient
 import org.utbot.cpp.clion.plugin.utils.notifyError

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.grpc.getProjectGrpcRequest
-import org.utbot.cpp.clion.plugin.client.requests.ProjectRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.ProjectRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 import org.utbot.cpp.clion.plugin.utils.currentClient
 

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.client.requests.SnippetRequest
+import org.utbot.cpp.clion.plugin.client.requests.test.SnippetRequest
 import org.utbot.cpp.clion.plugin.grpc.getSnippetGrpcRequest
 import org.utbot.cpp.clion.plugin.utils.activeProject
 

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

@@ -17,6 +17,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import org.jetbrains.annotations.TestOnly
+import org.utbot.cpp.clion.plugin.client.channels.LogChannel
 import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
 import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
@@ -31,7 +32,7 @@ import testsgen.Testgen
 class Client(
     val project: Project,
     clientId: String,
-    private val loggingChannels: List<LoggingChannel>
+    private val loggingChannels: List<LogChannel>
 ) : Disposable,
     GrpcClient(projectIndependentSettings.port, projectIndependentSettings.serverName, clientId) {
     var connectionStatus = ConnectionStatus.INIT

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

@@ -3,14 +3,17 @@ package org.utbot.cpp.clion.plugin.client
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.Project
+import org.utbot.cpp.clion.plugin.client.channels.GTestLogChannelImpl
+import org.utbot.cpp.clion.plugin.client.channels.LogChannel
+import org.utbot.cpp.clion.plugin.client.channels.ServerLogChannelImpl
 import kotlin.random.Random
 import org.utbot.cpp.clion.plugin.listeners.ConnectionSettingsListener
 import org.utbot.cpp.clion.plugin.utils.logger
 
 @Service
 class ClientManager(val project: Project): Disposable {
     private val clientId = generateClientID()
-    private val loggingChannels = listOf<LoggingChannel>(GTestChannel(project), ServerLogChannel(project))
+    private val loggingChannels = listOf<LogChannel>(GTestLogChannelImpl(project), ServerLogChannelImpl(project))
     var client: Client = Client(project, clientId, loggingChannels)
         private set
 
@@ -32,9 +35,7 @@ class ClientManager(val project: Project): Disposable {
         }
     }
 
-    override fun dispose() {
-        client.dispose()
-    }
+    override fun dispose() = client.dispose()
 
     private fun generateClientID(): String {
         fun createRandomSequence() = (1..RANDOM_SEQUENCE_LENGTH)

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

@@ -0,0 +1,25 @@
+package org.utbot.cpp.clion.plugin.client.channels
+
+import com.intellij.openapi.components.service
+import com.intellij.openapi.project.Project
+import kotlinx.coroutines.flow.Flow
+import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
+import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
+import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
+import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
+import testsgen.Testgen
+import testsgen.TestsGenServiceGrpcKt
+
+class GTestLogChannelImpl(project: Project): LogChannelImpl(project) {
+    override val name: String = "GTest Log"
+    override val logLevel: String = "TestLogLevel"
+
+    override val console: UTBotConsole = project.service<OutputProvider>().gtestOutputChannel.outputConsole
+
+    override suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry> =
+        stub.openGTestChannel(getLogChannelGrpcRequest(logLevel))
+
+    override suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub) {
+        stub.closeGTestChannel(getDummyGrpcRequest())
+    }
+}

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

@@ -0,0 +1,40 @@
+package org.utbot.cpp.clion.plugin.client.channels
+
+import com.intellij.openapi.project.Project
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.collect
+import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
+import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
+import org.utbot.cpp.clion.plugin.utils.logger
+import testsgen.Testgen
+import testsgen.TestsGenServiceGrpcKt
+
+interface LogChannel {
+    suspend fun provide(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub)
+}
+
+abstract class LogChannelImpl(val project: Project): LogChannel {
+    abstract val name: String
+    abstract val logLevel: String
+
+    abstract val console: UTBotConsole
+
+    abstract suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry>
+    abstract suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub)
+
+    override fun toString(): String = name
+
+    override suspend fun provide(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub) {
+        val logger = project.logger
+        try {
+            close(stub)
+        } catch (cause: io.grpc.StatusException) {
+            logger.error{ "Exception when closing log channel: $name \n$cause" }
+        }
+
+        open(stub)
+            .catch { cause -> logger.error{ "Exception in log channel: $name \n$cause" } }
+            .collect { invokeOnEdt { console.info(it.message) } }
+    }
+}

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

@@ -0,0 +1,25 @@
+package org.utbot.cpp.clion.plugin.client.channels
+
+import com.intellij.openapi.components.service
+import com.intellij.openapi.project.Project
+import kotlinx.coroutines.flow.Flow
+import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
+import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
+import org.utbot.cpp.clion.plugin.ui.services.OutputProvider
+import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
+import testsgen.Testgen
+import testsgen.TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub
+
+class ServerLogChannelImpl(project: Project): LogChannelImpl(project) {
+    override val name: String = "Server Log"
+    override val logLevel: String = "ServerLogLevel"
+
+    override val console: UTBotConsole = project.service<OutputProvider>().serverOutputChannel.outputConsole
+
+    override suspend fun open(stub: TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry> =
+        stub.openLogChannel(getLogChannelGrpcRequest(logLevel))
+
+    override suspend fun close(stub: TestsGenServiceCoroutineStub) {
+        stub.closeLogChannel(getDummyGrpcRequest())
+    }
+}

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

@@ -62,14 +62,12 @@ class CoverageAndResultsHandler(
         )
 
         manager.coverageGathered(suite)
-        notify(response)
+        notifyCoverageReceived()
     }
 
-    private fun notify(reponse: Testgen.CoverageAndResultsResponse) {
-        sourceFilePath ?: return
-        notifyInfo(
-            "Coverage received!", project,
-            FocusAction(sourceFilePath)
-        )
+    private fun notifyCoverageReceived() {
+        if (sourceFilePath != null) {
+            notifyInfo("Coverage received!", project, FocusAction(sourceFilePath))
+        }
     }
 }