From da81b9994ca444876e49ef712fac52d054bb9323 Mon Sep 17 00:00:00 2001 From: Arseniy Volynets Date: Wed, 3 Aug 2022 21:39:24 +0300 Subject: [PATCH 1/3] rename com.huawei... -> org.utbot... --- .../plugin/coverage/UTBotCoverageEngine.kt | 2 +- .../src/main/resources/META-INF/plugin.xml | 46 +++++++++---------- .../clion/plugin/tests/GenerateForFileTest.kt | 2 +- .../tests/GenerateForIsolatedFileTest.kt | 2 +- .../clion/plugin/tests/GenerateForLineTest.kt | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/coverage/UTBotCoverageEngine.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/coverage/UTBotCoverageEngine.kt index de8563fa5..d485686e4 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/coverage/UTBotCoverageEngine.kt +++ b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/coverage/UTBotCoverageEngine.kt @@ -135,7 +135,7 @@ class UTBotCoverageEngine : CoverageEngine() { * Checks whether coverage should be shown for file based on [CoverageSuitesBundle]. * It is used in [CoverageDataManager.applyInformationToEditor]. * - * For example, see JavaCoverageEngine: We may not want to show com.huawei.utbot.cpp.clion.coverage for files in test + * For example, see JavaCoverageEngine: We may not want to show coverage for files in test * folders, if suite.isTrackTestFolders == false, we may check it here and return false. * * For now all files are accepted. diff --git a/clion-plugin/src/main/resources/META-INF/plugin.xml b/clion-plugin/src/main/resources/META-INF/plugin.xml index 9a57eb5db..f7a73e27b 100644 --- a/clion-plugin/src/main/resources/META-INF/plugin.xml +++ b/clion-plugin/src/main/resources/META-INF/plugin.xml @@ -20,7 +20,7 @@ @@ -53,38 +53,38 @@ - - - - - - - - - @@ -98,7 +98,7 @@ anchor="first"/> - @@ -106,10 +106,10 @@ + relative-to-action="org.utbot.cpp.clion.plugin.actions.GenerateForFileAction"/> - @@ -117,10 +117,10 @@ + relative-to-action="org.utbot.cpp.clion.plugin.actions.GenerateForLineAction"/> - @@ -128,10 +128,10 @@ + relative-to-action="org.utbot.cpp.clion.plugin.actions.GenerateForFunctionAction"/> - @@ -139,10 +139,10 @@ + relative-to-action="org.utbot.cpp.clion.plugin.actions.GenerateForClassAction"/> - @@ -150,10 +150,10 @@ + relative-to-action="org.utbot.cpp.clion.plugin.actions.GenerateForClassAction"/> - @@ -163,7 +163,7 @@ anchor="last"/> - @@ -172,7 +172,7 @@ anchor="last"/> - diff --git a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForFileTest.kt b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForFileTest.kt index 6d9f156bb..e145c1f2b 100644 --- a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForFileTest.kt +++ b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForFileTest.kt @@ -17,7 +17,7 @@ class GenerateForFileTest : BaseGenerationTestCase() { project.settings.storedSettings.verbose = isVerboseMode fixture.configureFromTempProjectFile(relativeFilePath) - fixture.performEditorAction("com.huawei.utbot.cpp.actions.GenerateForFileAction") + fixture.performEditorAction("org.utbot.cpp.clion.plugin.actions.GenerateForFileAction") waitForRequestsToFinish() testsDirectoryPath.assertFileOrDirExists() diff --git a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForIsolatedFileTest.kt b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForIsolatedFileTest.kt index 21d7d9fec..f246b963f 100644 --- a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForIsolatedFileTest.kt +++ b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForIsolatedFileTest.kt @@ -17,7 +17,7 @@ class GenerateForIsolatedFileTest : BaseGenerationTestCase() { "Testing generate for snippet using target: auto, compiler: ${compiler.name}, verbose mode = ${project.settings.storedSettings.verbose}") compiler.buildProject(projectPath, buildDirName) fixture.configureFromTempProjectFile("snippet.c") - fixture.performEditorAction("com.huawei.utbot.cpp.actions.GenerateForSnippetAction") + fixture.performEditorAction("org.utbot.cpp.clion.plugin.actions.GenerateForSnippetAction") waitForRequestsToFinish() testsDirectoryPath.assertFileOrDirExists() testsDirectoryPath.assertTestFilesExist(listOf("snippet")) diff --git a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForLineTest.kt b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForLineTest.kt index 68de17ed0..12b118265 100644 --- a/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForLineTest.kt +++ b/clion-plugin/src/test/kotlin/org/utbot/cpp/clion/plugin/tests/GenerateForLineTest.kt @@ -23,7 +23,7 @@ class GenerateForLineTest: BaseGenerationTestCase() { fixture.configureFromTempProjectFile("/lib/basic_functions.c") fixture.editor.moveCursorToLine(lineNumber) - fixture.performEditorAction("com.huawei.utbot.cpp.actions.GenerateForLineAction") + fixture.performEditorAction("org.utbot.cpp.clion.plugin.actions.GenerateForLineAction") waitForRequestsToFinish() testsDirectoryPath.assertFileOrDirExists() From 8bfc132bd3e57f936261e6fe8d3ff81bea8c00ea Mon Sep 17 00:00:00 2001 From: Arseniy Volynets Date: Wed, 3 Aug 2022 21:45:53 +0300 Subject: [PATCH 2/3] fix package name --- clion-plugin/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clion-plugin/gradle.properties b/clion-plugin/gradle.properties index e18d1fad0..755e0cdc5 100644 --- a/clion-plugin/gradle.properties +++ b/clion-plugin/gradle.properties @@ -1,7 +1,7 @@ # IntelliJ Platform Artifacts Repositories # -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html -pluginGroup = com.huawei.utbot +pluginGroup = org.utbot.cpp.clion.plugin pluginName = UTBotCppClion pluginVersion = 0.0.1 From c372fe078b19bc1f5ea9fb26ecbf6322581e7b27 Mon Sep 17 00:00:00 2001 From: Arseniy Volynets Date: Thu, 4 Aug 2022 00:02:31 +0300 Subject: [PATCH 3/3] Remove clientVersion from settings, take it from plugin.xml --- .../utbot/cpp/clion/plugin/grpc/VersionGrpcRequests.kt | 3 ++- .../cpp/clion/plugin/settings/UTBotAllProjectSettings.kt | 1 - .../cpp/clion/plugin/ui/wizard/steps/ConnectionStep.kt | 5 +++-- .../org/utbot/cpp/clion/plugin/utils/EnvironmentUtils.kt | 8 +++++++- clion-plugin/src/main/resources/META-INF/plugin.xml | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/grpc/VersionGrpcRequests.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/grpc/VersionGrpcRequests.kt index c979bde85..2a3861436 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/grpc/VersionGrpcRequests.kt +++ b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/grpc/VersionGrpcRequests.kt @@ -1,6 +1,7 @@ package org.utbot.cpp.clion.plugin.grpc +import org.utbot.cpp.clion.plugin.utils.ourPluginVersion import testsgen.Testgen //TODO: when plugin is ready for release, take version from publish github action. -fun getVersionGrpcRequest(): Testgen.VersionInfo = Testgen.VersionInfo.newBuilder().setVersion("0.0.1").build() +fun getVersionGrpcRequest(): Testgen.VersionInfo = Testgen.VersionInfo.newBuilder().setVersion(ourPluginVersion).build() diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt index c590a82e0..06d09b0b7 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt +++ b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/settings/UTBotAllProjectSettings.kt @@ -82,7 +82,6 @@ class UTBotAllProjectSettings(val project: Project) { } companion object { - const val clientVersion = "0.0.1" const val DEFAULT_HOST = "localhost" const val DEFAULT_PORT = 2121 } diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/wizard/steps/ConnectionStep.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/wizard/steps/ConnectionStep.kt index 22aa1bffb..cdd7eec9b 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/wizard/steps/ConnectionStep.kt +++ b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/ui/wizard/steps/ConnectionStep.kt @@ -35,6 +35,7 @@ import javax.swing.event.DocumentEvent import org.utbot.cpp.clion.plugin.settings.UTBotProjectStoredSettings import org.utbot.cpp.clion.plugin.ui.ObservableValue import org.utbot.cpp.clion.plugin.utils.isWindows +import org.utbot.cpp.clion.plugin.utils.ourPluginVersion enum class ConnectionStatus { Connected, @@ -145,7 +146,7 @@ class ConnectionStep( val warningMessage: () -> String = { "⚠️ Warning! Versions are different or not defined:" + - "Client: ${UTBotAllProjectSettings.clientVersion} Server: ${serverVersion ?: "not defined"}" + "Client: ${ourPluginVersion} Server: ${serverVersion ?: "not defined"}" } label(warningMessage()).visibleIf( object : ComponentPredicate() { @@ -188,7 +189,7 @@ class ConnectionStep( GrpcClient(port, host, "DummyId").use { client -> serverVersion = client.stub.handshake(getVersionGrpcRequest()).version - if (serverVersion != UTBotAllProjectSettings.clientVersion) + if (serverVersion != ourPluginVersion) return ConnectionStatus.Suspicious return ConnectionStatus.Connected } diff --git a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/utils/EnvironmentUtils.kt b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/utils/EnvironmentUtils.kt index 16047a52f..237e1ca77 100644 --- a/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/utils/EnvironmentUtils.kt +++ b/clion-plugin/src/main/kotlin/org/utbot/cpp/clion/plugin/utils/EnvironmentUtils.kt @@ -1,4 +1,10 @@ package org.utbot.cpp.clion.plugin.utils +import com.intellij.ide.plugins.PluginManagerCore +import com.intellij.openapi.extensions.PluginId + val isWindows - get() = System.getProperty("os.name").contains("win", ignoreCase = true) \ No newline at end of file + get() = System.getProperty("os.name").contains("win", ignoreCase = true) + +val ourPluginVersion: String + get() = PluginManagerCore.getPlugin(PluginId.findId("org.utbot.cpp.clion.plugin"))?.version ?: "dev-version" \ No newline at end of file diff --git a/clion-plugin/src/main/resources/META-INF/plugin.xml b/clion-plugin/src/main/resources/META-INF/plugin.xml index f7a73e27b..1440f3113 100644 --- a/clion-plugin/src/main/resources/META-INF/plugin.xml +++ b/clion-plugin/src/main/resources/META-INF/plugin.xml @@ -1,8 +1,9 @@ - com.github.vol0n.utbotcppclion + org.utbot.cpp.clion.plugin UTBotCppClion vol0n + 0.0.1 com.intellij.modules.platform com.intellij.modules.clion.ide