jenkins/jenkins-lib
1
0
Fork 1
mirror of https://github.com/firstBitMarksistskaya/jenkins-lib.git synced 2025-08-25 20:09:25 +02:00
Code Issues Releases Activity

fix syntax_check options merge

Browse Source 
Co-Authored-By:  ivanovEV <ivanovev@melonfashion.com>
This commit is contained in:
Nikita Fedkin
2022-08-30 19:05:44 +03:00
parent 18a0884855
commit d2d920e328
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ru/pulsar/jenkins/library/configuration/ConfigurationReader.groovy
View File

@@ -79,6 +79,7 @@ class ConfigurationReader implements Serializable {
mergeObjects(baseConfiguration, configurationToMerge, nonMergeableSettings)
mergeInitInfoBaseOptions(baseConfiguration.initInfoBaseOptions, configurationToMerge.initInfoBaseOptions)
mergeBddOptions(baseConfiguration.bddOptions, configurationToMerge.bddOptions)
mergeSyntaxCheckOptions(baseConfiguration.syntaxCheckOptions, configurationToMerge.syntaxCheckOptions)
mergeNotificationsOptions(baseConfiguration.notificationsOptions, configurationToMerge.notificationsOptions)
return baseConfiguration;
@@ -126,6 +127,13 @@ class ConfigurationReader implements Serializable {
baseObject.vrunnerSteps = objectToMerge.vrunnerSteps.clone()
}
@NonCPS
private static void mergeSyntaxCheckOptions(SyntaxCheckOptions baseObject, SyntaxCheckOptions objectToMerge) {
if (objectToMerge == null || objectToMerge.checkModes == null) {
return
}
baseObject.checkModes = objectToMerge.checkModes.clone()
}
private static void mergeNotificationsOptions(NotificationsOptions baseObject, NotificationsOptions objectToMerge) {
if (objectToMerge == null) {

2
test/unit/groovy/ru/pulsar/jenkins/library/configuration/ConfigurationReaderTest.java
View File

@@ -45,7 +45,7 @@ class ConfigurationReaderTest {
.hasFieldOrPropertyWithValue("storagePath", "UNKNOWN_ID")
;
assertThat(jobConfiguration.getSyntaxCheckOptions().getCheckModes()).hasSize(1);
assertThat(jobConfiguration.getSyntaxCheckOptions().getCheckModes()).hasSize(4);
assertThat(jobConfiguration.getResultsTransformOptions().getRemoveSupport()).isFalse();
assertThat(jobConfiguration.getResultsTransformOptions().getSupportLevel()).isZero();

7
test/unit/resources/jobConfiguration.json
View File

@@ -21,7 +21,12 @@
"branchAnalysisConfiguration": "auto"
},
"syntaxCheck": {
"checkModes": ["-ThinClient"]
"checkModes": [
"-ThickClient",
"-ThinClient",
"-WebClient",
"-Server"
]
},
"resultsTransform": {
"removeSupport": false