Skip to content

Commit 31a6049

Browse files
vol0nvol0n
authored
provide better handling of network error/user inputs (#469)
* Postpone request building until execution to catch errors * add titles to notifications, change texts * change text * throw on buildDirPath and testsDirPath failure * fix heatbeat error log message * validate tests, build, remote paths in wizard and settings * add notifyNotConnected * uncomment detect * fix messages keys * fixes after rebase * remove unused code & fix some styles issues * fix targetPath conversion to remote version * fix remote mapping * add some tests for building grpc requests * fix tests * Fix notifications messages, fix log level, relative paths - Relative paths entered by user are striped of leading slashed /\ - fixed log depth - wrong stacktrace was taken - changed notification messages' texts * Remove empty companion * remove unused deps * change texts * renames, small refactorings * stop indicator only if started * Start indicator even if no statusbar - now progress indicator is started even if there is no statusBar to display progress - fixed condition in TestsStreamHandler for showing notification * fix typos * undo vscode config change
1 parent d8478cc commit 31a6049

File tree

98 files changed

+1491
-617
lines changed

Some content is hidden

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

98 files changed

+1491
-617
lines changed

‎clion-plugin/build.gradle.kts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ plugins {
3535
// Java support
3636
id("java")
3737
// Kotlin support
38-
id("org.jetbrains.kotlin.jvm") version "1.6.10"
38+
id("org.jetbrains.kotlin.jvm") version "1.7.20"
3939
// Gradle IntelliJ Plugin
4040
id("org.jetbrains.intellij") version "1.5.2"
4141
// Gradle Changelog Plugin
@@ -91,11 +91,11 @@ detekt {
9191
allRules = false // activate all available (even unstable) rules.
9292
}
9393

94-
//kotlin {
95-
// jvmToolchain {
96-
// (this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
97-
// }
98-
//}
94+
kotlin {
95+
jvmToolchain {
96+
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
97+
}
98+
}
9999

100100
protobuf {
101101
protoc {
@@ -194,7 +194,7 @@ tasks {
194194
setScanForTestClasses(false)
195195
// Only run tests from classes that end with "Test"
196196
include("**/*Test.class")
197-
exclude("**/*BaseGenerationTestCaseTest.class")
197+
exclude("**/*BaseGenerationTestCaseTest.class", "**/*BaseBuildingTest.class")
198198
systemProperty("idea.log.debug.categories", true)
199199
systemProperty("idea.log.trace.categories", true)
200200

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import com.intellij.ide.util.RunOnceUtil
44
import com.intellij.openapi.components.service
55
import com.intellij.openapi.project.Project
66
import com.intellij.openapi.startup.StartupActivity
7+
import org.tinylog.kotlin.Logger
78
import org.utbot.cpp.clion.plugin.client.ManagedClient
89
import org.utbot.cpp.clion.plugin.settings.settings
910

@@ -12,6 +13,7 @@ class UTBotStartupActivity : StartupActivity {
1213
// We initialize Client here, so that initialization will not happen
1314
// when user issues first generation request which would cause a UI freeze.
1415
if (project.settings.storedSettings.isPluginEnabled) {
16+
Logger.info("startup activity is run: Initializing client")
1517
initializeClient(project)
1618
guessPathsOnFirstOpen(project)
1719
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@ 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.GrpcRequestBuilderFactory
7+
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.client
9+
import testsgen.Testgen
610

711
class AskServerToGenerateBuildDir : UTBotBaseAction(UTBot.message("projectConfigure.generate.buildDir")) {
812

9-
override fun actionPerformed(e: AnActionEvent) = CreateBuildDirRequest(e).execute()
13+
override fun actionPerformed(e: AnActionEvent) = CreateBuildDirRequest(
14+
GrpcRequestBuilderFactory(e.activeProject()).createProjectConfigRequestBuilder(Testgen.ConfigMode.CREATE_BUILD_DIR),
15+
e.activeProject(),
16+
e.activeProject().client
17+
).execute()
1018

1119
override fun updateIfEnabled(e: AnActionEvent) {
1220
e.presentation.isEnabledAndVisible = e.project != null

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

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

33
import com.intellij.icons.AllIcons
4-
import com.intellij.openapi.actionSystem.AnAction
54
import com.intellij.openapi.actionSystem.AnActionEvent
65
import com.intellij.openapi.components.service
76
import org.utbot.cpp.clion.plugin.ui.utbotToolWindow.targetToolWindow.UTBotTargetsController
@@ -16,4 +15,4 @@ class RefreshTargetsAction: UTBotBaseAction() {
1615
e.presentation.isEnabledAndVisible = e.project != null
1716
e.presentation.icon = AllIcons.Actions.Refresh
1817
}
19-
}
18+
}

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package org.utbot.cpp.clion.plugin.actions
2+
3+
import com.intellij.openapi.actionSystem.AnActionEvent
4+
import com.intellij.openapi.options.ShowSettingsUtil
5+
import com.intellij.openapi.project.DumbAwareAction
6+
import org.utbot.cpp.clion.plugin.UTBot
7+
import org.utbot.cpp.clion.plugin.settings.UTBotConfigurable
8+
9+
class ShowSettingsAction : DumbAwareAction(UTBot.message("show.settings.text"))/*, LightEditCompatible*/ {
10+
override fun actionPerformed(e: AnActionEvent) {
11+
ShowSettingsUtil.getInstance().showSettingsDialog(e.project, UTBotConfigurable::class.java)
12+
}
13+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ abstract class UTBotBaseToggleAction(
2020
}
2121

2222
abstract fun updateIfEnabled(e: AnActionEvent)
23-
}
23+
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ 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.GrpcRequestBuilderFactory
78
import org.utbot.cpp.clion.plugin.utils.activeProject
9+
import testsgen.Testgen
810

911
class ConfigureProjectAction : UTBotBaseAction(UTBot.message("projectConfigure.configure")) {
1012

11-
override fun actionPerformed(e: AnActionEvent) = CheckProjectConfigurationRequest(e.activeProject()).execute()
13+
override fun actionPerformed(e: AnActionEvent) = CheckProjectConfigurationRequest(
14+
GrpcRequestBuilderFactory(e.activeProject()).createProjectConfigRequestBuilder(Testgen.ConfigMode.CHECK),
15+
e.activeProject()
16+
).execute()
1217

1318
override fun updateIfEnabled(e: AnActionEvent) {
1419
e.presentation.isEnabledAndVisible = e.project != null

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

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

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import org.utbot.cpp.clion.plugin.UTBot
5-
import org.utbot.cpp.clion.plugin.actions.UTBotBaseAction
6-
import org.utbot.cpp.clion.plugin.grpc.getProjectConfigGrpcRequest
75
import org.utbot.cpp.clion.plugin.client.requests.CheckProjectConfigurationRequest
6+
import org.utbot.cpp.clion.plugin.actions.UTBotBaseAction
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-
getProjectConfigGrpcRequest(project, 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/BaseGenerateTestsAction.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package org.utbot.cpp.clion.plugin.actions.generate
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
44
import org.utbot.cpp.clion.plugin.actions.UTBotBaseAction
5+
import org.utbot.cpp.clion.plugin.client.ManagedClient
6+
import org.utbot.cpp.clion.plugin.utils.activeProject
57
import org.utbot.cpp.clion.plugin.utils.client
68

79
abstract class BaseGenerateTestsAction : UTBotBaseAction() {
@@ -10,7 +12,7 @@ abstract class BaseGenerateTestsAction : UTBotBaseAction() {
1012
val isDefined: Boolean = isDefined(e)
1113

1214
e.presentation.isVisible = isDefined
13-
e.presentation.isEnabled = isDefined && e.client.isServerAvailable()
15+
e.presentation.isEnabled = isDefined && ManagedClient.isConnectedToServer(e.activeProject())
1416
}
1517

1618
/**

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +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.getAssertionGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
9+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
810

911
class GenerateForAssertionAction : BaseGenerateTestsAction() {
1012
override fun actionPerformed(e: AnActionEvent) =
1113
AssertionRequest(
12-
getAssertionGrpcRequest(e),
14+
GrpcRequestBuilderFactory(e.activeProject()).createAssertionRequestBuilder(e.getLineNumberUnsafe(), e.getFilePathUnsafe()),
1315
e.activeProject(),
1416
).execute()
1517

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ 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.getClassGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
9+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
810
import org.utbot.cpp.clion.plugin.utils.isCPPFileName
911

1012
class GenerateForClassAction : BaseGenerateTestsAction() {
1113
override fun actionPerformed(e: AnActionEvent) =
1214
ClassRequest(
13-
getClassGrpcRequest(e),
15+
GrpcRequestBuilderFactory(e.activeProject()).createClassRequestBuilder(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
1416
e.activeProject(),
1517
).execute()
1618

‎clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/actions/generate/GenerateForFileAction.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.FileRequest
6-
import org.utbot.cpp.clion.plugin.grpc.getFileGrpcRequest
76
import org.utbot.cpp.clion.plugin.utils.activeProject
7+
import org.utbot.cpp.clion.plugin.utils.getBuilderForFileRequest
88
import org.utbot.cpp.clion.plugin.utils.isCPPorCFileName
99

1010
class GenerateForFileAction : BaseGenerateTestsAction() {
1111
override fun actionPerformed(e: AnActionEvent) =
1212
FileRequest(
13-
getFileGrpcRequest(e),
13+
e.getBuilderForFileRequest(),
1414
e.activeProject(),
1515
).execute()
1616

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ 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.getFolderGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
89

910
class GenerateForFolderAction : BaseGenerateTestsAction() {
1011
override fun actionPerformed(e: AnActionEvent) =
11-
FolderRequest(
12-
getFolderGrpcRequest(e),
13-
e.activeProject()
14-
).execute()
12+
FolderRequest(
13+
GrpcRequestBuilderFactory(e.activeProject()).createFolderRequestBuilder(e.getFilePathUnsafe()),
14+
e.activeProject()
15+
).execute()
1516

1617
override fun isDefined(e: AnActionEvent): Boolean {
1718
val project = e.project

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ 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.getFunctionGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
9+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
810

911
class GenerateForFunctionAction : BaseGenerateTestsAction() {
10-
11-
override fun actionPerformed(e: AnActionEvent) =
12+
override fun actionPerformed(e: AnActionEvent) {
1213
FunctionRequest(
13-
getFunctionGrpcRequest(e),
14+
GrpcRequestBuilderFactory(e.activeProject()).createFunctionRequestBuilder(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
1415
e.activeProject()
1516
).execute()
17+
}
1618

1719
override fun isDefined(e: AnActionEvent): Boolean {
1820
val project = e.project

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@ 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.getLineGrpcRequest
76
import org.utbot.cpp.clion.plugin.utils.activeProject
7+
import org.utbot.cpp.clion.plugin.utils.getBuilderForLineRequest
88

99
class GenerateForLineAction : BaseGenerateTestsAction() {
10-
override fun actionPerformed(e: AnActionEvent) =
10+
override fun actionPerformed(e: AnActionEvent) {
1111
LineRequest(
12-
getLineGrpcRequest(e),
12+
e.getBuilderForLineRequest(),
1313
e.activeProject(),
1414
).execute()
15+
}
1516

1617
override fun isDefined(e: AnActionEvent): Boolean {
1718
val project = e.project

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@ 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.grpc.getFunctionGrpcRequest
13-
import org.utbot.cpp.clion.plugin.grpc.getPredicateGrpcRequest
12+
import org.utbot.cpp.clion.plugin.UTBot
1413
import org.utbot.cpp.clion.plugin.client.requests.test.FunctionReturnTypeRequest
1514
import org.utbot.cpp.clion.plugin.client.requests.test.PredicateRequest
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
18+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
19+
import org.utbot.cpp.clion.plugin.utils.getLineNumberUnsafe
1820
import org.utbot.cpp.clion.plugin.utils.invokeOnEdt
1921
import org.utbot.cpp.clion.plugin.utils.notifyError
2022
import testsgen.Util.ValidationType
@@ -46,7 +48,13 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
4648
// when we gathered all needed information for predicate request, assemble it and execute it.
4749
fun sendPredicateToServer(validationType: ValidationType, valueToCompare: String, comparisonOperator: String) =
4850
PredicateRequest(
49-
getPredicateGrpcRequest(e, comparisonOperator, validationType, valueToCompare),
51+
GrpcRequestBuilderFactory(e.activeProject()).createPredicateRequestBuilder(
52+
comparisonOperator,
53+
validationType,
54+
valueToCompare,
55+
e.getLineNumberUnsafe(),
56+
e.getFilePathUnsafe()
57+
),
5058
e.activeProject()
5159
).apply {
5260
e.client.executeRequest(this)
@@ -65,13 +73,15 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
6573
}
6674
ValidationType.UNSUPPORTED -> {
6775
notifyError(
76+
UTBot.message("notify.title.error"),
6877
"Unsupported return type for \'Generate Tests With Prompted Result\' feature: \n" +
6978
"supported types are integers, booleans, characters, floats and strings"
7079
)
7180
return
7281
}
7382
ValidationType.UNRECOGNIZED -> {
7483
notifyError(
84+
UTBot.message("notify.title.error"),
7585
"Could not recognise return type for 'Generate Tests With Prompted Result' feature: \n" +
7686
"supported types are integers, booleans, characters, floats and strings"
7787
)
@@ -101,7 +111,7 @@ class GenerateForPredicateAction : BaseGenerateTestsAction() {
101111
}
102112
//ask server for return type
103113
FunctionReturnTypeRequest(
104-
getFunctionGrpcRequest(e),
114+
GrpcRequestBuilderFactory(e.activeProject()).createFunctionRequestBuilder(e.getFilePathUnsafe(), e.getLineNumberUnsafe()),
105115
e.activeProject(),
106116
) { functionReturnType ->
107117
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
@@ -1,15 +1,15 @@
11
package org.utbot.cpp.clion.plugin.actions.generate
22

33
import com.intellij.openapi.actionSystem.AnActionEvent
4-
import org.utbot.cpp.clion.plugin.grpc.getProjectGrpcRequest
54
import org.utbot.cpp.clion.plugin.client.requests.test.ProjectRequest
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-
getProjectGrpcRequest(e),
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +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.getSnippetGrpcRequest
6+
import org.utbot.cpp.clion.plugin.grpc.GrpcRequestBuilderFactory
77
import org.utbot.cpp.clion.plugin.utils.activeProject
8+
import org.utbot.cpp.clion.plugin.utils.getFilePathUnsafe
89

910
class GenerateForSnippetAction : BaseGenerateTestsAction() {
1011
override fun actionPerformed(e: AnActionEvent) {
1112
SnippetRequest(
12-
getSnippetGrpcRequest(e),
13+
GrpcRequestBuilderFactory(e.activeProject()).createSnippetRequestBuilder(e.getFilePathUnsafe()),
1314
e.activeProject(),
1415
).execute()
1516
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ 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.GrpcRequestBuilderFactory
6+
import org.utbot.cpp.clion.plugin.utils.activeProject
57

6-
class RunAllTestsWithCoverageAction: BaseGenerateTestsAction() {
8+
class RunAllTestsWithCoverageAction : BaseGenerateTestsAction() {
79
override fun actionPerformed(e: AnActionEvent) {
8-
RunAllTestsWithCoverageRequest(e).execute()
10+
RunAllTestsWithCoverageRequest(
11+
GrpcRequestBuilderFactory(e.activeProject()).createCovAndResulstsRequestBuilder(null),
12+
e.activeProject()
13+
).execute()
914
}
1015

1116
override fun isDefined(e: AnActionEvent): Boolean {

0 commit comments

Comments
 (0)