Skip to content

Commit fe5070f

Browse files
vol0nvol0n
committed
Merge branch 'vol0n/clion_plugin' of https://github.com/UnitTestBot/UTBotCpp into vol0n/clion_plugin
2 parents d3477d1 + 74dd383 commit fe5070f

27 files changed

+286
-280
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getAssertionRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getAssertionGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.AssertionRequest
77

88
class GenerateForAssertionAction : GenerateTestsBaseAction() {
99
override fun actionPerformed(e: AnActionEvent) {
1010
AssertionRequest(
11-
getAssertionRequestMessage(e),
11+
getAssertionGrpcRequest(e),
1212
e.project!!,
1313
).execute()
1414
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getClassRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getClassGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.ClassRequest
77
import org.utbot.cpp.clion.plugin.utils.isCPPFileName
88

99
class GenerateForClassAction : GenerateTestsBaseAction() {
1010
override fun actionPerformed(e: AnActionEvent) {
1111
ClassRequest(
12-
getClassRequestMessage(e),
12+
getClassGrpcRequest(e),
1313
e.project!!,
1414
).execute()
1515
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getFileRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getFileGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.FileRequest
77
import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
88

99
class GenerateForFileAction : GenerateTestsBaseAction() {
1010
override fun actionPerformed(e: AnActionEvent) {
11-
FileRequest(getFileRequestMessage(e), e.project!!).execute()
11+
FileRequest(getFileGrpcRequest(e), e.project!!).execute()
1212
}
1313

1414
// 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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getFolderRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getFolderGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.FolderRequest
77

88
class GenerateForFolderAction : GenerateTestsBaseAction() {
99
override fun actionPerformed(e: AnActionEvent) {
1010
FolderRequest(
11-
getFolderRequestMessage(e),
11+
getFolderGrpcRequest(e),
1212
e.project!!
1313
).execute()
1414
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getFunctionRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.FunctionRequest
77

88
class GenerateForFunctionAction : GenerateTestsBaseAction() {
@@ -13,7 +13,7 @@ class GenerateForFunctionAction : GenerateTestsBaseAction() {
1313

1414
override fun actionPerformed(e: AnActionEvent) {
1515
FunctionRequest(
16-
getFunctionRequestMessage(e),
16+
getFunctionGrpcRequest(e),
1717
e.project!!
1818
).execute()
1919
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getLineRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getLineGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.LineRequest
77

88
class GenerateForLineAction : GenerateTestsBaseAction() {
@@ -15,7 +15,7 @@ class GenerateForLineAction : GenerateTestsBaseAction() {
1515

1616
override fun actionPerformed(e: AnActionEvent) {
1717
LineRequest(
18-
getLineRequestMessage(e),
18+
getLineGrpcRequest(e),
1919
e.project!!
2020
).execute()
2121
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import com.intellij.ui.DocumentAdapter
99
import com.intellij.ui.components.fields.ExtendableTextField
1010
import javax.swing.ListSelectionModel
1111
import javax.swing.event.DocumentEvent
12-
import org.utbot.cpp.clion.plugin.utils.getFunctionRequestMessage
13-
import org.utbot.cpp.clion.plugin.utils.getPredicateRequestMessage
12+
import org.utbot.cpp.clion.plugin.grpc.getFunctionGrpcRequest
13+
import org.utbot.cpp.clion.plugin.grpc.getPredicateGrpcRequest
1414
import org.utbot.cpp.clion.plugin.client.requests.FunctionReturnTypeRequest
1515
import org.utbot.cpp.clion.plugin.client.requests.PredicateRequest
1616
import org.utbot.cpp.clion.plugin.utils.client
@@ -88,7 +88,7 @@ class GenerateForPredicateAction : GenerateTestsBaseAction() {
8888
override fun actionPerformed(e: AnActionEvent) {
8989

9090
fun sendPredicateToServer(validationType: ValidationType, valueToCompare: String, comparisonOperator: String) {
91-
val predicateRequest = getPredicateRequestMessage(validationType, valueToCompare, comparisonOperator, e)
91+
val predicateRequest = getPredicateGrpcRequest(e, comparisonOperator, validationType, valueToCompare)
9292
PredicateRequest(
9393
predicateRequest,
9494
e.project!!
@@ -122,7 +122,7 @@ class GenerateForPredicateAction : GenerateTestsBaseAction() {
122122

123123
FunctionReturnTypeRequest(
124124
e.project!!,
125-
getFunctionRequestMessage(e)
125+
getFunctionGrpcRequest(e)
126126
) { functionReturnType ->
127127
val type = functionReturnType.validationType
128128
chooseComparisonOperator(type) { comparisonOperator ->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
4-
import org.utbot.cpp.clion.plugin.utils.getProjectRequestMessage
4+
import org.utbot.cpp.clion.plugin.grpc.getProjectGrpcRequest
55
import org.utbot.cpp.clion.plugin.client.requests.ProjectRequest
66
import org.utbot.cpp.clion.plugin.utils.client
77

@@ -12,7 +12,7 @@ class GenerateForProjectAction : GenerateTestsBaseAction() {
1212

1313
override fun actionPerformed(e: AnActionEvent) {
1414
ProjectRequest(
15-
getProjectRequestMessage(e),
15+
getProjectGrpcRequest(e),
1616
e.project!!
1717
).apply {
1818
e.client.executeRequest(this)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
5-
import org.utbot.cpp.clion.plugin.utils.getSnippetRequestMessage
5+
import org.utbot.cpp.clion.plugin.grpc.getSnippetGrpcRequest
66
import org.utbot.cpp.clion.plugin.client.requests.SnippetRequest
77

88
class GenerateForSnippetAction : GenerateTestsBaseAction() {
99
override fun actionPerformed(e: AnActionEvent) {
1010
SnippetRequest(
11-
getSnippetRequestMessage(e),
11+
getSnippetGrpcRequest(e),
1212
e.project!!
1313
).execute()
1414
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.intellij.notification.Notification
44
import com.intellij.notification.NotificationAction
55
import com.intellij.openapi.actionSystem.AnActionEvent
66
import org.utbot.cpp.clion.plugin.UTBot
7-
import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
7+
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
88
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
99
import testsgen.Testgen
1010

@@ -16,7 +16,7 @@ class ReconfigureProjectAction: NotificationAction(UTBot.message("projectConfigu
1616
override fun actionPerformed(e: AnActionEvent) {
1717
CheckProjectConfigurationRequest(
1818
e.project!!,
19-
getProjectConfigRequestMessage(e.project!!, Testgen.ConfigMode.ALL),
19+
getProjectConfigGrpcRequest(e.project!!, Testgen.ConfigMode.ALL),
2020
).execute()
2121
}
2222

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package org.utbot.cpp.clion.plugin.actions
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
4+
import com.intellij.openapi.actionSystem.CommonDataKeys
45
import com.intellij.openapi.diagnostic.Logger
56
import com.intellij.psi.PsiElement
6-
import org.utbot.cpp.clion.plugin.utils.getCoverageAndResultsRequest
7+
import org.utbot.cpp.clion.plugin.grpc.getCoverageAndResultsGrpcRequest
78
import org.utbot.cpp.clion.plugin.client.requests.RunWithCoverageRequest
9+
import org.utbot.cpp.clion.plugin.grpc.activeProject
810
import org.utbot.cpp.clion.plugin.ui.testsResults.TestNameAndTestSuite
911

1012

@@ -17,7 +19,8 @@ class RunWithCoverageAction(val element: PsiElement) : GenerateTestsBaseAction()
1719
val testArgs = TestNameAndTestSuite.getFromPsiElement(element)
1820
val suiteName = testArgs.suite
1921
val testedMethodName = testArgs.name
20-
val request = getCoverageAndResultsRequest(e, suiteName, testedMethodName)
22+
val filePath = e.getRequiredData(CommonDataKeys.VIRTUAL_FILE).path
23+
val request = getCoverageAndResultsGrpcRequest(e.activeProject(), filePath, suiteName, testedMethodName)
2124
RunWithCoverageRequest(
2225
e.project!!,
2326
request

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import kotlinx.coroutines.runBlocking
2121
import kotlinx.coroutines.withTimeout
2222

2323
import kotlinx.coroutines.Job
24-
import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
25-
import org.utbot.cpp.clion.plugin.utils.getVersionInfo
24+
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
25+
import org.utbot.cpp.clion.plugin.grpc.getVersionGrpcRequest
2626
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
2727
import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
2828
import org.utbot.cpp.clion.plugin.listeners.UTBotEventsListener
@@ -84,7 +84,7 @@ class Client(
8484
fun configureProject() {
8585
CheckProjectConfigurationRequest(
8686
project,
87-
getProjectConfigRequestMessage(project, Testgen.ConfigMode.CHECK)
87+
getProjectConfigGrpcRequest(project, Testgen.ConfigMode.CHECK)
8888
).also {
8989
executeRequest(it)
9090
}
@@ -96,7 +96,7 @@ class Client(
9696
requestsCS.launch {
9797
// Logger.info("sending HandShake request!")
9898
try {
99-
stub.handshake(getVersionInfo())
99+
stub.handshake(getVersionGrpcRequest())
100100
logger.info { "Handshake successful!" }
101101
} catch (e: Exception) {
102102
logger.warn { "HandShake failed with the following error: ${e.message}" }

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import com.intellij.openapi.project.Project
55
import kotlinx.coroutines.flow.Flow
66
import kotlinx.coroutines.flow.catch
77
import kotlinx.coroutines.flow.collect
8-
import org.utbot.cpp.clion.plugin.utils.getDummyRequest
9-
import org.utbot.cpp.clion.plugin.utils.getLogChannelRequest
8+
import org.utbot.cpp.clion.plugin.grpc.getDummyGrpcRequest
9+
import org.utbot.cpp.clion.plugin.grpc.getLogChannelGrpcRequest
1010
import org.utbot.cpp.clion.plugin.ui.userLog.OutputProvider
1111
import org.utbot.cpp.clion.plugin.ui.userLog.UTBotConsole
1212
import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
@@ -58,11 +58,11 @@ class GTestChannel(project: Project): BaseChannel(project) {
5858
override val console: UTBotConsole = project.service<OutputProvider>().gtestOutputChannel.outputConsole
5959

6060
override suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub) {
61-
stub.closeGTestChannel(getDummyRequest())
61+
stub.closeGTestChannel(getDummyGrpcRequest())
6262
}
6363

6464
override suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry> {
65-
return stub.openGTestChannel(getLogChannelRequest(logLevel))
65+
return stub.openGTestChannel(getLogChannelGrpcRequest(logLevel))
6666
}
6767
}
6868

@@ -72,10 +72,10 @@ class ServerLogChannel(project: Project): BaseChannel(project) {
7272
override val console: UTBotConsole = project.service<OutputProvider>().serverOutputChannel.outputConsole
7373

7474
override suspend fun close(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub) {
75-
stub.closeLogChannel(getDummyRequest())
75+
stub.closeLogChannel(getDummyGrpcRequest())
7676
}
7777

7878
override suspend fun open(stub: TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub): Flow<Testgen.LogEntry> {
79-
return stub.openLogChannel(getLogChannelRequest(logLevel))
79+
return stub.openLogChannel(getLogChannelGrpcRequest(logLevel))
8080
}
8181
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/requests/CheckProjectConfigurationRequest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
55
import kotlinx.coroutines.Job
66
import kotlinx.coroutines.flow.Flow
77
import org.utbot.cpp.clion.plugin.UTBot
8-
import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
8+
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
99
import org.utbot.cpp.clion.plugin.client.handlers.CheckProjectConfigurationHandler
1010
import testsgen.Testgen
1111
import testsgen.TestsGenServiceGrpcKt
@@ -16,7 +16,7 @@ class CheckProjectConfigurationRequest(
1616
): BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(request, project) {
1717
override val logMessage: String = "Sending request to check project configuration."
1818

19-
constructor(project: Project): this(project, getProjectConfigRequestMessage(project, Testgen.ConfigMode.CHECK))
19+
constructor(project: Project): this(project, getProjectConfigGrpcRequest(project, Testgen.ConfigMode.CHECK))
2020
constructor(e: AnActionEvent): this(e.project!!)
2121

2222
override suspend fun TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub.send(cancellationJob: Job?): Flow<Testgen.ProjectConfigResponse> {

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/requests/CreateBuildFolderRequest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
55
import kotlinx.coroutines.Job
66
import kotlinx.coroutines.flow.Flow
77
import org.utbot.cpp.clion.plugin.UTBot
8-
import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
8+
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
99
import org.utbot.cpp.clion.plugin.client.handlers.CreateBuildDirHandler
1010
import testsgen.Testgen
1111
import testsgen.TestsGenServiceGrpcKt
@@ -16,7 +16,7 @@ class CreateBuildDirRequest(
1616
): BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(request, project) {
1717
override val logMessage: String = "Sending request to check project configuration."
1818

19-
constructor(e: AnActionEvent): this(e.project!!, getProjectConfigRequestMessage(e.project!!, Testgen.ConfigMode.CREATE_BUILD_DIR))
19+
constructor(e: AnActionEvent): this(e.project!!, getProjectConfigGrpcRequest(e.project!!, Testgen.ConfigMode.CREATE_BUILD_DIR))
2020

2121
override suspend fun TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub.send(cancellationJob: Job?): Flow<Testgen.ProjectConfigResponse> {
2222
return this.configureProject(request)

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/client/requests/GenerateJsonFilesRequest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.intellij.openapi.project.Project
55
import kotlinx.coroutines.Job
66
import kotlinx.coroutines.flow.Flow
77
import org.utbot.cpp.clion.plugin.UTBot
8-
import org.utbot.cpp.clion.plugin.utils.getProjectConfigRequestMessage
8+
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
99
import org.utbot.cpp.clion.plugin.client.handlers.GenerateJsonHandler
1010
import testsgen.Testgen
1111
import testsgen.TestsGenServiceGrpcKt
@@ -16,7 +16,7 @@ class GenerateJsonFilesRequest(
1616
): BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(request, project) {
1717
override val logMessage: String = "Sending request to check project configuration."
1818

19-
constructor(project: Project): this(project, getProjectConfigRequestMessage(project, Testgen.ConfigMode.GENERATE_JSON_FILES))
19+
constructor(project: Project): this(project, getProjectConfigGrpcRequest(project, Testgen.ConfigMode.GENERATE_JSON_FILES))
2020
constructor(e: AnActionEvent): this(e.project!!)
2121

2222
override suspend fun TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub.send(cancellationJob: Job?): Flow<Testgen.ProjectConfigResponse> {

0 commit comments

Comments
 (0)