From f893c11527d2c3bb048b7fed5656a149e8a5ea7f Mon Sep 17 00:00:00 2001
From: Dima <d.ovcharenko90@gmail.com>
Date: Mon, 17 Jul 2023 18:04:16 +0300
Subject: [PATCH] finalize

---
 .../jenkins/library/configuration/CoverageOptions.groovy  | 6 ------
 src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy   | 8 ++++----
 test/integration/groovy/jobConfigurationTest.groovy       | 1 -
 test/integration/resources/jobConfiguration.json          | 1 -
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/ru/pulsar/jenkins/library/configuration/CoverageOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/CoverageOptions.groovy
index dbb677c..665f3dc 100644
--- a/src/ru/pulsar/jenkins/library/configuration/CoverageOptions.groovy
+++ b/src/ru/pulsar/jenkins/library/configuration/CoverageOptions.groovy
@@ -12,11 +12,6 @@ class CoverageOptions implements Serializable {
     ''')
     String dbgsPath
 
-    @JsonPropertyDescription('''Порт сервера отладки.
-    По умолчанию равен 1550.
-    ''')
-    int dbgsPort = 1550
-
     @JsonPropertyDescription('''Путь к исполняемому файлу Coverage41C
     По умолчанию равен Coverage41C.
     ''')
@@ -27,7 +22,6 @@ class CoverageOptions implements Serializable {
     String toString() {
         return "coverageOptions{" +
                 "dbgsPath=" + dbgsPath +
-                "dbgsPort=" + dbgsPort +
                 ", coverage41CPath=" + coverage41CPath +
                 '}'
     }
diff --git a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
index 21e7b87..9103e79 100644
--- a/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
+++ b/src/ru/pulsar/jenkins/library/steps/SonarScanner.groovy
@@ -104,13 +104,13 @@ class SonarScanner implements Serializable {
             StringJoiner coveragePathsConstructor = new StringJoiner(",")
 
             if (config.stageFlags.bdd && config.bddOptions.coverage) {
-                steps.unstash("bdd-coverage")
-                coveragePathsConstructor.add("build/out/bdd-coverage.xml")
+                steps.unstash(Bdd.COVERAGE_STASH_NAME)
+                coveragePathsConstructor.add(Bdd.COVERAGE_STASH_PATH)
             }
 
             if (config.stageFlags.smoke && config.smokeTestOptions.coverage) {
-                steps.unstash("smoketest-coverage")
-                coveragePathsConstructor.add("build/out/smoketest-coverage.xml")
+                steps.unstash(SmokeTest.COVERAGE_STASH_NAME)
+                coveragePathsConstructor.add(SmokeTest.COVERAGE_STASH_PATH)
             }
 
             String coveragePaths = coveragePathsConstructor.toString()
diff --git a/test/integration/groovy/jobConfigurationTest.groovy b/test/integration/groovy/jobConfigurationTest.groovy
index b1788e3..c77feec 100644
--- a/test/integration/groovy/jobConfigurationTest.groovy
+++ b/test/integration/groovy/jobConfigurationTest.groovy
@@ -75,7 +75,6 @@ class jobConfigurationTest {
         rule.assertLogContains("sonarScannerToolName='sonar-scanner'", run)
         rule.assertLogContains("initMethod=FROM_SOURCE", run)
         rule.assertLogContains("dbgsPath=C:\\Program files\\1cv8\\8.3.12.1500\\bin\\dbgs.exe", run)
-        rule.assertLogContains("dbgsPort=4543", run)
         rule.assertLogContains("coverage41CPath=C:\\coverage\\Coverage41C.exe", run)
     }
 }
\ No newline at end of file
diff --git a/test/integration/resources/jobConfiguration.json b/test/integration/resources/jobConfiguration.json
index 82c836c..ebd5e6f 100644
--- a/test/integration/resources/jobConfiguration.json
+++ b/test/integration/resources/jobConfiguration.json
@@ -13,7 +13,6 @@
   },
   "coverage": {
     "dbgsPath": "C:\\\\Program files\\\\1cv8\\\\8.3.12.1500\\\\bin\\\\dbgs.exe",
-    "dbgsPort": 4543,
     "coverage41CPath": "C:\\\\coverage\\\\Coverage41C.exe"
   }
 }
\ No newline at end of file