Skip to content

Commit 6d7e57b

Browse files
vol0nvol0n
committed
add some tests for building grpc requests
1 parent ac80ea0 commit 6d7e57b

File tree

54 files changed

+625
-373
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+625
-373
lines changed

‎clion-plugin/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ dependencies {
7676
// testing with JUnit 5
7777
testImplementation(platform("org.junit:junit-bom:5.8.2"))
7878
testImplementation("org.junit.jupiter:junit-jupiter")
79+
testImplementation("org.mockito.kotlin:mockito-kotlin:4.0.0")
80+
testImplementation("io.mockk:mockk:1.13.2")
7981
}
8082

8183
sourceSets {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package org.utbot.cpp.clion.plugin.actions
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import org.utbot.cpp.clion.plugin.UTBot
55
import org.utbot.cpp.clion.plugin.client.requests.CreateBuildDirRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88
import org.utbot.cpp.clion.plugin.utils.client
99
import testsgen.Testgen
1010

1111
class AskServerToGenerateBuildDir : UTBotBaseAction(UTBot.message("projectConfigure.generate.buildDir")) {
1212

1313
override fun actionPerformed(e: AnActionEvent) = CreateBuildDirRequest(
14-
ParamsBuilder(e.activeProject()).buildProjectConfigRequestParams(Testgen.ConfigMode.CREATE_BUILD_DIR),
14+
GrpcRequestBuilderFactory(e.activeProject()).createProjectConfigRequestBuilder(Testgen.ConfigMode.CREATE_BUILD_DIR),
1515
e.activeProject(),
1616
e.activeProject().client
1717
).execute()

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

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

1111
class ConfigureProjectAction : UTBotBaseAction(UTBot.message("projectConfigure.configure")) {
1212

1313
override fun actionPerformed(e: AnActionEvent) = CheckProjectConfigurationRequest(
14-
ParamsBuilder(e.activeProject()).buildProjectConfigRequestParams(Testgen.ConfigMode.CHECK),
14+
GrpcRequestBuilderFactory(e.activeProject()).createProjectConfigRequestBuilder(Testgen.ConfigMode.CHECK),
1515
e.activeProject()
1616
).execute()
1717

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

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

@@ -13,7 +13,7 @@ class ReconfigureProjectAction: UTBotBaseAction(UTBot.message("projectConfigure.
1313
override fun actionPerformed(e: AnActionEvent) {
1414
val project = e.activeProject()
1515
CheckProjectConfigurationRequest(
16-
ParamsBuilder(project).buildProjectConfigRequestParams(Testgen.ConfigMode.ALL),
16+
GrpcRequestBuilderFactory(project).createProjectConfigRequestBuilder(Testgen.ConfigMode.ALL),
1717
project,
1818
).execute()
1919
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.AssertionRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
99
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
1010

1111
class GenerateForAssertionAction : BaseGenerateTestsAction() {
1212
override fun actionPerformed(e: AnActionEvent) =
1313
AssertionRequest(
14-
ParamsBuilder(e.activeProject()).buildAssertionRequestParams(e.getLineNumberUnsafe(), e.getFilePathUnsafe()),
14+
GrpcRequestBuilderFactory(e.activeProject()).createAssertionRequestBuilder(e.getLineNumberUnsafe(), e.getFilePathUnsafe()),
1515
e.activeProject(),
1616
).execute()
1717

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.ClassRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
99
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
@@ -12,7 +12,7 @@ import org.utbot.cpp.clion.plugin.utils.isCPPFileName
1212
class GenerateForClassAction : BaseGenerateTestsAction() {
1313
override fun actionPerformed(e: AnActionEvent) =
1414
ClassRequest(
15-
ParamsBuilder(e.activeProject()).buildClassRequestParams(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
15+
GrpcRequestBuilderFactory(e.activeProject()).createClassRequestBuilder(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
1616
e.activeProject(),
1717
).execute()
1818

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.FileRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
76
import org.utbot.cpp.clion.plugin.utils.activeProject
8-
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
7+
import org.utbot.cpp.clion.plugin.utils.getBuilderForFileRequest
98
import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
109

1110
class GenerateForFileAction : BaseGenerateTestsAction() {
1211
override fun actionPerformed(e: AnActionEvent) =
1312
FileRequest(
14-
ParamsBuilder(e.activeProject()).buildFileRequestParams(e.getFilePathUnsafe()),
13+
e.getBuilderForFileRequest(),
1514
e.activeProject(),
1615
).execute()
1716

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.FolderRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
99

1010
class GenerateForFolderAction : BaseGenerateTestsAction() {
1111
override fun actionPerformed(e: AnActionEvent) =
1212
FolderRequest(
13-
ParamsBuilder(e.activeProject()).buildFolderRequestParams(e.getFilePathUnsafe()),
13+
GrpcRequestBuilderFactory(e.activeProject()).createFolderRequestBuilder(e.getFilePathUnsafe()),
1414
e.activeProject()
1515
).execute()
1616

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.FunctionRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
99
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
1010

1111
class GenerateForFunctionAction : BaseGenerateTestsAction() {
1212
override fun actionPerformed(e: AnActionEvent) {
1313
FunctionRequest(
14-
ParamsBuilder(e.activeProject()).buildFunctionRequestParams(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
14+
GrpcRequestBuilderFactory(e.activeProject()).createFunctionRequestBuilder(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
1515
e.activeProject()
1616
).execute()
1717
}

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.LineRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
76
import org.utbot.cpp.clion.plugin.utils.activeProject
7+
import org.utbot.cpp.clion.plugin.utils.getBuilderForLineRequest
88

99
class GenerateForLineAction : BaseGenerateTestsAction() {
1010
override fun actionPerformed(e: AnActionEvent) {
11-
val filePath = e.getRequiredData(CommonDataKeys.VIRTUAL_FILE).path
12-
val editor = e.getRequiredData(CommonDataKeys.EDITOR)
13-
val lineNumber = editor.caretModel.logicalPosition.line + 1
1411
LineRequest(
15-
ParamsBuilder(e.activeProject()).buildLineRequestBuilder(lineNumber, filePath),
12+
e.getBuilderForLineRequest(),
1613
e.activeProject(),
1714
).execute()
1815
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import javax.swing.event.DocumentEvent
1212
import org.utbot.cpp.clion.plugin.UTBot
1313
import org.utbot.cpp.clion.plugin.client.requests.test.FunctionReturnTypeRequest
1414
import org.utbot.cpp.clion.plugin.client.requests.test.PredicateRequest
15-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
15+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
1616
import org.utbot.cpp.clion.plugin.utils.activeProject
1717
import org.utbot.cpp.clion.plugin.utils.client
1818
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
@@ -48,7 +48,7 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
4848
// when we gathered all needed information for predicate request, assemble it and execute it.
4949
fun sendPredicateToServer(validationType: ValidationType, valueToCompare: String, comparisonOperator: String) =
5050
PredicateRequest(
51-
ParamsBuilder(e.activeProject()).buildPredicateRequestParams(
51+
GrpcRequestBuilderFactory(e.activeProject()).createPredicateRequestBuilder(
5252
comparisonOperator,
5353
validationType,
5454
valueToCompare,
@@ -111,7 +111,7 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
111111
}
112112
//ask server for return type
113113
FunctionReturnTypeRequest(
114-
ParamsBuilder(e.activeProject()).buildFunctionRequestParams(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
114+
GrpcRequestBuilderFactory(e.activeProject()).createFunctionRequestBuilder(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
115115
e.activeProject(),
116116
) { functionReturnType ->
117117
val validationType = functionReturnType.validationType

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForProjectAction.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.generate
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import org.utbot.cpp.clion.plugin.client.requests.test.ProjectRequest
5-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
5+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
66
import org.utbot.cpp.clion.plugin.utils.activeProject
77
import org.utbot.cpp.clion.plugin.utils.client
88

99
class GenerateForProjectAction : BaseGenerateTestsAction() {
1010
override fun actionPerformed(e: AnActionEvent) {
1111
ProjectRequest(
12-
ParamsBuilder(e.activeProject()).buildProjectRequestParams(),
12+
GrpcRequestBuilderFactory(e.activeProject()).createProjectRequestBuilder(),
1313
e.activeProject(),
1414
).apply {
1515
e.client.executeRequest(this)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package org.utbot.cpp.clion.plugin.actions.generate
33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import com.intellij.openapi.actionSystem.CommonDataKeys
55
import org.utbot.cpp.clion.plugin.client.requests.test.SnippetRequest
6-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
88
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
99

1010
class GenerateForSnippetAction : BaseGenerateTestsAction() {
1111
override fun actionPerformed(e: AnActionEvent) {
1212
SnippetRequest(
13-
ParamsBuilder(e.activeProject()).buildSnippetRequestParams(e.getFilePathUnsafe()),
13+
GrpcRequestBuilderFactory(e.activeProject()).createSnippetRequestBuilder(e.getFilePathUnsafe()),
1414
e.activeProject(),
1515
).execute()
1616
}

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/RunAllTestsWithCoverageAction.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.generate
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import org.utbot.cpp.clion.plugin.client.requests.RunAllTestsWithCoverageRequest
5-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
5+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
66
import org.utbot.cpp.clion.plugin.utils.activeProject
77

88
class RunAllTestsWithCoverageAction : BaseGenerateTestsAction() {
99
override fun actionPerformed(e: AnActionEvent) {
1010
RunAllTestsWithCoverageRequest(
11-
ParamsBuilder(e.activeProject()).buildCoverageAndResultsRequestParams(null),
11+
GrpcRequestBuilderFactory(e.activeProject()).createCovAndResulstsRequestBuilder(null),
1212
e.activeProject()
1313
).execute()
1414
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys
55
import com.intellij.openapi.diagnostic.Logger
66
import com.intellij.psi.PsiElement
77
import org.utbot.cpp.clion.plugin.client.requests.RunWithCoverageRequest
8-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
8+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
99
import org.utbot.cpp.clion.plugin.utils.activeProject
1010

1111

@@ -16,7 +16,7 @@ class RunWithCoverageAction(val element: PsiElement) : BaseGenerateTestsAction()
1616
val project = e.activeProject()
1717

1818
RunWithCoverageRequest(
19-
ParamsBuilder(project).buildCoverageAndResultsRequestParams(element),
19+
GrpcRequestBuilderFactory(project).createCovAndResulstsRequestBuilder(element),
2020
project,
2121
).execute()
2222
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import kotlinx.coroutines.Job
1212
import org.jetbrains.annotations.TestOnly
1313
import org.utbot.cpp.clion.plugin.client.Client.Companion.SERVER_TIMEOUT
1414
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
15-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
15+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
1616
import org.utbot.cpp.clion.plugin.listeners.ConnectionSettingsListener
1717
import org.utbot.cpp.clion.plugin.listeners.ConnectionStatus
1818
import org.utbot.cpp.clion.plugin.listeners.PluginActivationListener
@@ -76,7 +76,7 @@ class ManagedClient(val project: Project) : Disposable {
7676

7777
fun configureProject() {
7878
CheckProjectConfigurationRequest(
79-
ParamsBuilder(project).buildProjectConfigRequestParams(Testgen.ConfigMode.CHECK),
79+
GrpcRequestBuilderFactory(project).createProjectConfigRequestBuilder(Testgen.ConfigMode.CHECK),
8080
project,
8181
).also { request ->
8282
client?.executeRequestIfNotDisposed(request)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.utbot.cpp.clion.plugin.actions.AskServerToGenerateBuildDir
99
import org.utbot.cpp.clion.plugin.actions.AskServerToGenerateJsonForProjectConfiguration
1010
import org.utbot.cpp.clion.plugin.client.ManagedClient
1111
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
12-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
12+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
1313
import org.utbot.cpp.clion.plugin.settings.settings
1414
import org.utbot.cpp.clion.plugin.utils.logger
1515
import org.utbot.cpp.clion.plugin.utils.notifyError
@@ -91,7 +91,7 @@ class CreateBuildDirHandler(
9191
)
9292

9393
CheckProjectConfigurationRequest(
94-
ParamsBuilder(project).buildProjectConfigRequestParams(Testgen.ConfigMode.CHECK),
94+
GrpcRequestBuilderFactory(project).createProjectConfigRequestBuilder(Testgen.ConfigMode.CHECK),
9595
project
9696
).also {
9797
client.executeRequest(it)

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,24 @@ package org.utbot.cpp.clion.plugin.client.requests
33
import com.intellij.openapi.project.Project
44
import kotlinx.coroutines.Job
55
import org.utbot.cpp.clion.plugin.client.Request
6-
import org.utbot.cpp.clion.plugin.grpc.Params
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilder
77
import org.utbot.cpp.clion.plugin.grpc.RemoteMapping
8-
import org.utbot.cpp.clion.plugin.settings.settings
98
import org.utbot.cpp.clion.plugin.utils.client
109
import org.utbot.cpp.clion.plugin.utils.logger
11-
import org.utbot.cpp.clion.plugin.utils.path
1210
import testsgen.TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub
1311

1412
/**
1513
* Base class for requests.
1614
* It sends a request of type [X] and handles the response of type [Y].
1715
*/
18-
abstract class BaseRequest<X, Y>(val params: Params<X>, val project: Project) : Request {
16+
abstract class BaseRequest<X, Y>(val params: GrpcRequestBuilder<X>, val project: Project) : Request {
1917
abstract val logMessage: String
2018
val request: X by lazy { build() } // must not be accessed from this class constructor
2119

2220
override fun toString(): String = logMessage
2321

2422
open fun build(): X {
25-
val mapping =
26-
RemoteMapping(project.path, project.settings.storedSettings.remotePath, project.settings.isRemoteScenario)
23+
val mapping = RemoteMapping(project)
2724
return params.build(mapping)
2825
}
2926

‎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,12 +5,12 @@ import kotlinx.coroutines.Job
55
import kotlinx.coroutines.flow.Flow
66
import org.utbot.cpp.clion.plugin.UTBot
77
import org.utbot.cpp.clion.plugin.client.handlers.CheckProjectConfigurationHandler
8-
import org.utbot.cpp.clion.plugin.grpc.Params
8+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilder
99
import testsgen.Testgen
1010
import testsgen.TestsGenServiceGrpcKt
1111

1212
class CheckProjectConfigurationRequest(
13-
params: Params<Testgen.ProjectConfigRequest>,
13+
params: GrpcRequestBuilder<Testgen.ProjectConfigRequest>,
1414
project: Project,
1515
) : BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(params, project) {
1616
override val id: String = "Configure Project"

‎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
@@ -6,12 +6,12 @@ import kotlinx.coroutines.flow.Flow
66
import org.utbot.cpp.clion.plugin.UTBot
77
import org.utbot.cpp.clion.plugin.client.ManagedClient
88
import org.utbot.cpp.clion.plugin.client.handlers.CreateBuildDirHandler
9-
import org.utbot.cpp.clion.plugin.grpc.Params
9+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilder
1010
import testsgen.Testgen
1111
import testsgen.TestsGenServiceGrpcKt.TestsGenServiceCoroutineStub
1212

1313
class CreateBuildDirRequest(
14-
params: Params<Testgen.ProjectConfigRequest>,
14+
params: GrpcRequestBuilder<Testgen.ProjectConfigRequest>,
1515
project: Project,
1616
val client: ManagedClient
1717
) : BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(params, project) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,21 @@ import kotlinx.coroutines.Job
66
import kotlinx.coroutines.flow.Flow
77
import org.utbot.cpp.clion.plugin.UTBot
88
import org.utbot.cpp.clion.plugin.client.handlers.GenerateJsonHandler
9-
import org.utbot.cpp.clion.plugin.grpc.Params
10-
import org.utbot.cpp.clion.plugin.grpc.ParamsBuilder
9+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilder
10+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
1111
import org.utbot.cpp.clion.plugin.utils.activeProject
1212
import testsgen.Testgen
1313
import testsgen.TestsGenServiceGrpcKt
1414

1515
class GenerateJsonFilesRequest(
16-
params: Params<Testgen.ProjectConfigRequest>,
16+
params: GrpcRequestBuilder<Testgen.ProjectConfigRequest>,
1717
project: Project
1818
) : BaseRequest<Testgen.ProjectConfigRequest, Flow<Testgen.ProjectConfigResponse>>(params, project) {
1919
override val id: String = "Generate JSON Files"
2020
override val logMessage: String = "Sending request to check project configuration."
2121

2222
constructor(project: Project) : this(
23-
ParamsBuilder(project).buildProjectConfigRequestParams(Testgen.ConfigMode.GENERATE_JSON_FILES),
23+
GrpcRequestBuilderFactory(project).createProjectConfigRequestBuilder(Testgen.ConfigMode.GENERATE_JSON_FILES),
2424
project
2525
)
2626

0 commit comments

Comments
 (0)