Merge pull request #98 from ovcharenko-di/feature/coverage

Замер покрытия
firstBitMarksistskaya · Dec 19, 2024 · 4f98e66 · 4f98e66
2 parents 7248c85 + 42bbfc7
commit 4f98e66
Show file tree

Hide file tree

Showing 34 changed files with 1,979 additions and 1,012 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,4 @@
-*.groovy eol=lf
+*.groovy eol=lf
+*.json eol=lf
+*.md eol=lf
+*.os eol=lf
diff --git a/README.md b/README.md
diff --git a/resources/dbgs.os b/resources/dbgs.os
@@ -0,0 +1,3 @@
+#Использовать v8find
+
+Сообщить(Платформа1С.ПутьКDBGS(АргументыКоманднойСтроки[0]));
diff --git a/resources/globalConfiguration.json b/resources/globalConfiguration.json
@@ -50,7 +50,9 @@
   "bdd": {
     "vrunnerSteps": [
       "vanessa --settings ./tools/vrunner.json"
-    ]
+    ],
+    "coverage": false,
+    "dbgsPort": 1550
   },
   "sonarqube": {
     "sonarQubeInstallation": "",
@@ -83,13 +85,21 @@
     "vrunnerSettings": "./tools/vrunner.json",
     "xddConfigPath": "./tools/xUnitParams.json",
     "publishToAllureReport": false,
-    "publishToJUnitReport": true
+    "publishToJUnitReport": true,
+    "coverage": false,
+    "dbgsPort": 1550
+  },
+  "coverage": {
+    "dbgsPath": "",
+    "coverage41CPath": "Coverage41C"
   },
   "yaxunit": {
     "vrunnerSettings": "./tools/vrunner.json",
     "configPath": "./tools/yaxunit.json",
     "publishToAllureReport": false,
-    "publishToJUnitReport": true
+    "publishToJUnitReport": true,
+    "coverage": false,
+    "dbgsPort": 1550
   },
   "resultsTransform": {
     "transformer": "stebi",

diff --git a/resources/schema.json b/resources/schema.json
diff --git a/resources/yaxunit.json b/resources/yaxunit.json
@@ -18,9 +18,9 @@
   "reportFormat": "jUnit",
   "showReport": false,
   "logging": {
-    "file": "./build/out/yaxunit/log.txt",
-    "enable": false,
-    "level": "debug"
+    "enable": true,
+    "console": true,
+    "level": "info"
   },
   "exitCode": "./build/out/yaxunit/result.txt"
 }
diff --git a/src/JobConfigurationSchemaGenerator.java b/src/JobConfigurationSchemaGenerator.java
@@ -15,7 +15,7 @@
 
 public class JobConfigurationSchemaGenerator {
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
 
     SchemaGeneratorConfigBuilder configBuilder = new SchemaGeneratorConfigBuilder(SchemaVersion.DRAFT_7, OptionPreset.PLAIN_JSON)
             .with(new JacksonModule(JacksonOption.FLATTENED_ENUMS_FROM_JSONVALUE, JacksonOption.FLATTENED_ENUMS_FROM_JSONPROPERTY));

diff --git a/src/idea.gdsl b/src/idea.gdsl
diff --git a/src/ru/pulsar/jenkins/library/IStepExecutor.groovy b/src/ru/pulsar/jenkins/library/IStepExecutor.groovy
@@ -7,6 +7,9 @@ import jenkins.plugins.http_request.ResponseContentSupplier
 import org.jenkinsci.plugins.pipeline.utility.steps.fs.FileWrapper
 import org.jenkinsci.plugins.workflow.support.actions.EnvironmentAction
 import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
+import ru.pulsar.jenkins.library.configuration.JobConfiguration
+import ru.pulsar.jenkins.library.configuration.StepCoverageOptions
+import ru.pulsar.jenkins.library.steps.Coverable
 
 interface IStepExecutor {
 
@@ -20,6 +23,7 @@ interface IStepExecutor {
 
     FileWrapper[] findFiles(String glob)
 
+    @SuppressWarnings('unused')
     FileWrapper[] findFiles(String glob, String excludes)
 
     String readFile(String file)
@@ -40,6 +44,8 @@ interface IStepExecutor {
 
     def ringCommand(String script)
 
+    void start(String executable, String params)
+
     void tool(String toolName)
 
     def withCredentials(List bindings, Closure body)
@@ -64,6 +70,10 @@ interface IStepExecutor {
 
     def withEnv(List<String> strings, Closure body)
 
+    def withCoverage(JobConfiguration config, Coverable stage, StepCoverageOptions options, Closure body)
+
+    def lock(String resource, Closure<Object> body)
+
     def archiveArtifacts(String path)
 
     def stash(String name, String includes)
@@ -76,14 +86,17 @@ interface IStepExecutor {
 
     def zip(String dir, String zipFile)
 
+    @SuppressWarnings('unused')
     def zip(String dir, String zipFile, String glob)
 
     def unzip(String dir, String zipFile)
 
+    @SuppressWarnings('unused')
     def unzip(String dir, String zipFile, quiet)
 
     def catchError(Closure body)
 
+    @SuppressWarnings('unused')
     ResponseContentSupplier httpRequest(String url, String outputFile, String responseHandle, boolean wrapAsMultipart)
 
     ResponseContentSupplier httpRequest(String url, HttpMode httpMode, MimeType contentType, String requestBody, String validResponseCodes, boolean consoleLogResponseBody)

diff --git a/src/ru/pulsar/jenkins/library/StepExecutor.groovy b/src/ru/pulsar/jenkins/library/StepExecutor.groovy
@@ -7,6 +7,9 @@ import jenkins.plugins.http_request.ResponseContentSupplier
 import org.jenkinsci.plugins.pipeline.utility.steps.fs.FileWrapper
 import org.jenkinsci.plugins.workflow.support.actions.EnvironmentAction
 import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper
+import ru.pulsar.jenkins.library.configuration.JobConfiguration
+import ru.pulsar.jenkins.library.configuration.StepCoverageOptions
+import ru.pulsar.jenkins.library.steps.Coverable
 import ru.yandex.qatools.allure.jenkins.config.ResultsConfig
 
 class StepExecutor implements IStepExecutor {
@@ -72,6 +75,18 @@ class StepExecutor implements IStepExecutor {
         return steps.ringCommand(script)
     }
 
+    @Override
+    void start(String executable, String params) {
+        if (executable == null || executable.trim().isEmpty()) {
+            throw new IllegalArgumentException("executable не может быть пустым")
+        }
+        try {
+            steps.start(executable, params)
+        } catch (Exception e) {
+            throw new RuntimeException("Ошибка при запуске процесса: ${e.message}", e)
+        }
+    }
+
     @Override
     void tool(String toolName) {
         steps.tool toolName
@@ -144,6 +159,18 @@ class StepExecutor implements IStepExecutor {
         }
     }
 
+    @Override
+    def withCoverage(JobConfiguration config, Coverable stage, StepCoverageOptions options, Closure body) {
+        steps.withCoverage(config, stage, options, body)
+    }
+
+    @Override
+    def lock(String resource, Closure body) {
+        steps.lock(resource: resource) {
+            body()
+        }
+    }
+
     @Override
     def archiveArtifacts(String path) {
         steps.archiveArtifacts path

diff --git a/src/ru/pulsar/jenkins/library/configuration/BddOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/BddOptions.groovy
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonPropertyDescription
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-class BddOptions implements Serializable {
+class BddOptions extends StepCoverageOptions implements Serializable {
 
     @JsonPropertyDescription("""Шаги, запускаемые через vrunner.
     В каждой строке передается отдельная команда 
@@ -21,6 +21,8 @@ class BddOptions implements Serializable {
     String toString() {
         return "BddOptions{" +
             "vrunnerSteps=" + vrunnerSteps +
-            '}';
+            "coverage=" + coverage +
+            "dbgsPort=" + dbgsPort +
+            '}'
     }
 }
diff --git a/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy b/src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy
@@ -14,23 +14,23 @@ import static java.util.Collections.emptySet
 class ConfigurationReader implements Serializable {
 
     private static ObjectMapper mapper
-    private static BeanUtilsBean beanUtilsBean;
+    private static BeanUtilsBean beanUtilsBean
 
     static {
         mapper = new ObjectMapper()
-        mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true);
+        mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true)
 
         beanUtilsBean = new BeanUtilsBean(new ConvertUtilsBean() {
             @Override
             @NonCPS
             Object convert(String value, Class clazz) {
                 if (clazz.isEnum()) {
-                    return Enum.valueOf(clazz, value);
+                    return Enum.valueOf(clazz, value)
                 } else {
-                    return super.convert(value, clazz);
+                    return super.convert(value, clazz)
                 }
             }
-        });
+        })
     }
 
     private static final String DEFAULT_CONFIGURATION_RESOURCE = 'globalConfiguration.json'
@@ -49,7 +49,7 @@ class ConfigurationReader implements Serializable {
         def globalConfiguration = create()
         def jobConfiguration = mapper.readValue(config, JobConfiguration.class)
 
-        return mergeConfigurations(globalConfiguration, jobConfiguration);
+        return mergeConfigurations(globalConfiguration, jobConfiguration)
     }
 
     private static JobConfiguration mergeConfigurations(
@@ -65,6 +65,7 @@ class ConfigurationReader implements Serializable {
             "bddOptions",
             "sonarQubeOptions",
             "smokeTestOptions",
+            "coverageOptions",
             "yaxunitOptions",
             "syntaxCheckOptions",
             "resultsTransformOptions",
@@ -84,7 +85,7 @@ class ConfigurationReader implements Serializable {
         mergeSyntaxCheckOptions(baseConfiguration.syntaxCheckOptions, configurationToMerge.syntaxCheckOptions)
         mergeNotificationsOptions(baseConfiguration.notificationsOptions, configurationToMerge.notificationsOptions)
 
-        return baseConfiguration;
+        return baseConfiguration
     }
 
     @NonCPS
@@ -95,7 +96,7 @@ class ConfigurationReader implements Serializable {
             .filter({ e -> e.getKey() != "metaClass" })
             .filter({ e -> !nonMergeableSettings.contains(e.getKey()) })
             .forEach { e ->
-                beanUtilsBean.setProperty(baseObject, e.getKey(), e.getValue());
+                beanUtilsBean.setProperty(baseObject, e.getKey(), e.getValue())
             }
 
         nonMergeableSettings.forEach({ key ->

diff --git a/src/ru/pulsar/jenkins/library/configuration/GlobalCoverageOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/GlobalCoverageOptions.groovy
@@ -0,0 +1,29 @@
+package ru.pulsar.jenkins.library.configuration
+
+import com.cloudbees.groovy.cps.NonCPS
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonPropertyDescription
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class GlobalCoverageOptions implements Serializable {
+
+    @JsonPropertyDescription('''Путь к исполняемому файлу dbgs.
+    По умолчанию ищется с помощью v8find для указанной версии платформы (v8version).
+    ''')
+    String dbgsPath
+
+    @JsonPropertyDescription('''Путь к исполняемому файлу Coverage41C
+    По умолчанию ищется в PATH.
+    ''')
+    String coverage41CPath
+
+    @Override
+    @NonCPS
+    String toString() {
+        return "coverageOptions{" +
+                "dbgsPath=" + dbgsPath +
+                ", coverage41CPath=" + coverage41CPath +
+                '}'
+    }
+
+}
diff --git a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy
@@ -56,6 +56,10 @@ class JobConfiguration implements Serializable {
     @JsonPropertyDescription("Настройки дымового тестирования")
     SmokeTestOptions smokeTestOptions
 
+    @JsonProperty("coverage")
+    @JsonPropertyDescription("Настройки замеров покрытия")
+    GlobalCoverageOptions coverageOptions
+
     @JsonProperty("yaxunit")
     @JsonPropertyDescription("Настройки YAXUnit")
     YaxunitOptions yaxunitOptions
@@ -89,6 +93,7 @@ class JobConfiguration implements Serializable {
             ", sonarQubeOptions=" + sonarQubeOptions +
             ", syntaxCheckOptions=" + syntaxCheckOptions +
             ", smokeTestOptions=" + smokeTestOptions +
+            ", coverageOptions=" + coverageOptions +
             ", yaxunitOptions=" + yaxunitOptions +
             ", resultsTransformOptions=" + resultsTransformOptions +
             ", notificationOptions=" + notificationsOptions +

diff --git a/src/ru/pulsar/jenkins/library/configuration/SmokeTestOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/SmokeTestOptions.groovy
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonPropertyDescription
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-class SmokeTestOptions implements Serializable {
+class SmokeTestOptions extends StepCoverageOptions implements Serializable {
 
     @JsonPropertyDescription("""Путь к конфигурационному файлу vanessa-runner.
     По умолчанию содержит значение "./tools/vrunner.json".
@@ -15,7 +15,7 @@ class SmokeTestOptions implements Serializable {
     @JsonPropertyDescription("""Путь к конфигурационному файлу для xddTestRunner.
     По умолчанию содержит значение "./tools/xUnitParams.json".
     """)
-    String xddConfigPath;
+    String xddConfigPath
 
     @JsonPropertyDescription("""Выполнять публикацию результатов в отчет Allure.
     По умолчанию выключено.
@@ -35,6 +35,8 @@ class SmokeTestOptions implements Serializable {
             ", xddConfigPath='" + xddConfigPath + '\'' +
             ", publishToAllureReport=" + publishToAllureReport +
             ", publishToJUnitReport=" + publishToJUnitReport +
+            ", coverage=" + coverage +
+            ", dbgsPort=" + dbgsPort +
             '}'
     }
 }
diff --git a/src/ru/pulsar/jenkins/library/configuration/StepCoverageOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/StepCoverageOptions.groovy
@@ -0,0 +1,16 @@
+package ru.pulsar.jenkins.library.configuration
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.annotation.JsonPropertyDescription
+
+class StepCoverageOptions implements Serializable {
+
+    @JsonPropertyDescription("Выполнять замер покрытия")
+    @JsonProperty(defaultValue = "false")
+    Boolean coverage = false
+
+    @JsonPropertyDescription("Порт, на котором будет запущен сервер отладки для замера покрытия")
+    @JsonProperty(defaultValue = "1550")
+    Integer dbgsPort = 1550
+
+}
diff --git a/src/ru/pulsar/jenkins/library/configuration/YaxunitOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/YaxunitOptions.groovy
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonPropertyDescription
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-class YaxunitOptions implements Serializable {
+class YaxunitOptions extends StepCoverageOptions implements Serializable {
 
     @JsonPropertyDescription("""Путь к конфигурационному файлу vanessa-runner.
     По умолчанию содержит значение "./tools/vrunner.json".
@@ -35,6 +35,8 @@ class YaxunitOptions implements Serializable {
             ", configPath='" + configPath +
             ", publishToAllureReport='" + publishToAllureReport +
             ", publishToJUnitReport='" + publishToJUnitReport +
+            ", coverage='" + coverage +
+            ", dbgsPort='" + dbgsPort +
             '}'
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#Использовать v8find

		Сообщить(Платформа1С.ПутьКDBGS(АргументыКоманднойСтроки[0]));