Merge branch 'vol0n/clion_plugin' of https://github.com/UnitTestBot/UTBotCpp into vol0n/clion_plugin

Author: vol0n

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

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getAssertionRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getAssertionGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.AssertionRequest
 
 class GenerateForAssertionAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         AssertionRequest(
-            getAssertionRequestMessage(e),
+            getAssertionGrpcRequest(e),
             e.project!!,
         ).execute()
     }

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

@@ -2,14 +2,14 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getClassRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getClassGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.ClassRequest
 import org.utbot.cpp.clion.plugin.utils.isCPPFileName
 
 class GenerateForClassAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         ClassRequest(
-            getClassRequestMessage(e),
+            getClassGrpcRequest(e),
             e.project!!,
         ).execute()
     }

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

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getFileRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFileGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FileRequest
 import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
 
 class GenerateForFileAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
-        FileRequest(getFileRequestMessage(e), e.project!!).execute()
+        FileRequest(getFileGrpcRequest(e), e.project!!).execute()
     }
 
     // action is available only if the selected file ends in .cpp, .hpp, .c or .h

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

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getFolderRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFolderGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FolderRequest
 
 class GenerateForFolderAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         FolderRequest(
-            getFolderRequestMessage(e),
+            getFolderGrpcRequest(e),
             e.project!!
         ).execute()
     }

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getFunctionRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.FunctionRequest
 
 class GenerateForFunctionAction : GenerateTestsBaseAction() {
@@ -13,7 +13,7 @@ class GenerateForFunctionAction : GenerateTestsBaseAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
         FunctionRequest(
-            getFunctionRequestMessage(e),
+            getFunctionGrpcRequest(e),
             e.project!!
         ).execute()
     }

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

@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getLineRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getLineGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.LineRequest
 
 class GenerateForLineAction : GenerateTestsBaseAction() {
@@ -15,7 +15,7 @@ class GenerateForLineAction : GenerateTestsBaseAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
         LineRequest(
-            getLineRequestMessage(e),
+            getLineGrpcRequest(e),
             e.project!!
         ).execute()
     }

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

@@ -9,8 +9,8 @@ import com.intellij.ui.DocumentAdapter
 import com.intellij.ui.components.fields.ExtendableTextField
 import javax.swing.ListSelectionModel
 import javax.swing.event.DocumentEvent
-import org.utbot.cpp.clion.plugin.utils.getFunctionRequestMessage
-import org.utbot.cpp.clion.plugin.utils.getPredicateRequestMessage
+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.utils.client
@@ -88,7 +88,7 @@ class GenerateForPredicateAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
 
         fun sendPredicateToServer(validationType: ValidationType, valueToCompare: String, comparisonOperator: String) {
-            val predicateRequest = getPredicateRequestMessage(validationType, valueToCompare, comparisonOperator, e)
+            val predicateRequest = getPredicateGrpcRequest(e, comparisonOperator, validationType, valueToCompare)
             PredicateRequest(
                 predicateRequest,
                 e.project!!
@@ -122,7 +122,7 @@ class GenerateForPredicateAction : GenerateTestsBaseAction() {
 
         FunctionReturnTypeRequest(
             e.project!!,
-            getFunctionRequestMessage(e)
+            getFunctionGrpcRequest(e)
         ) { functionReturnType ->
             val type = functionReturnType.validationType
             chooseComparisonOperator(type) { comparisonOperator ->

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

@@ -1,7 +1,7 @@
 package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
-import org.utbot.cpp.clion.plugin.utils.getProjectRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.ProjectRequest
 import org.utbot.cpp.clion.plugin.utils.client
 
@@ -12,7 +12,7 @@ class GenerateForProjectAction : GenerateTestsBaseAction() {
 
     override fun actionPerformed(e: AnActionEvent) {
         ProjectRequest(
-            getProjectRequestMessage(e),
+            getProjectGrpcRequest(e),
             e.project!!
         ).apply {
             e.client.executeRequest(this)

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

@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
 
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.CommonDataKeys
-import org.utbot.cpp.clion.plugin.utils.getSnippetRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getSnippetGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.SnippetRequest
 
 class GenerateForSnippetAction : GenerateTestsBaseAction() {
     override fun actionPerformed(e: AnActionEvent) {
         SnippetRequest(
-            getSnippetRequestMessage(e),
+            getSnippetGrpcRequest(e),
             e.project!!
         ).execute()
     }

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

@@ -4,7 +4,7 @@ import com.intellij.notification.Notification
 import com.intellij.notification.NotificationAction
 import com.intellij.openapi.actionSystem.AnActionEvent
 import org.utbot.cpp.clion.plugin.UTBot
-import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
+import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
 import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
 import testsgen.Testgen
 
@@ -16,7 +16,7 @@ class ReconfigureProjectAction: NotificationAction(UTBot.message("projectConfigu
     override fun actionPerformed(e: AnActionEvent) {
         CheckProjectConfigurationRequest(
             e.project!!,
-            getProjectConfigRequestMessage(e.project!!, Testgen.ConfigMode.ALL),
+            getProjectConfigGrpcRequest(e.project!!, Testgen.ConfigMode.ALL),
         ).execute()
     }