jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-18 05:18:24 +02:00
Code Issues Releases Activity

Fix merging if default values do not exist (#130)

Browse Source
This commit is contained in:
Daniel Kurzynski 2018-04-23 13:41:22 +02:00 committed by GitHub
parent 3d5a97ab71
commit 540e8c36db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/sap/piper/ConfigurationMerger.groovy
View File

@ -10,6 +10,8 @@ class ConfigurationMerger {
Map filteredConfig = configKeys?configs.subMap(configKeys):configs
Map merged = [:]
defaults = defaults ?: [:]
merged.putAll(defaults)
for(String key : filteredConfig.keySet())

17
test/groovy/com/sap/piper/ConfigurationMergerTest.groovy
View File

@ -50,19 +50,30 @@ class ConfigurationMergerTest {
@Test
void testMergeDeepStructure(){
Map defaults = [fruits: [apples: 1, oranges: 10, bananaaas: 0]]
Map configuration = [fruits: [bananaaas: 50, cucumbers: 1000]]
Map defaults = [fruits: [apples: 1, oranges: 10, bananas: 0]]
Map configuration = [fruits: [bananas: 50, cucumbers: 1000]]
Set configurationKeys = ['fruits']
Map parameters = [fruits: [apples: 18], veggie: []]
Set parameterKeys = ['fruits']
Map merged = ConfigurationMerger.merge(parameters, parameterKeys, configuration, configurationKeys, defaults)
Assert.assertEquals(50, merged.fruits.bananaaas)
Assert.assertEquals(50, merged.fruits.bananas)
Assert.assertEquals(18, merged.fruits.apples)
Assert.assertEquals(10, merged.fruits.oranges)
Assert.assertEquals(1000, merged.fruits.cucumbers)
Assert.assertEquals(null, merged.veggie)
}
@Test
void testMergeDeepStructureWithMissingDefaults(){
Map defaults = [others:[apples: 18]]
Map configuration = [fruits: [bananas: 50, cucumbers: 1000]]
Set configurationKeys = ['fruits']
Map merged = ConfigurationMerger.merge(configuration, configurationKeys, defaults)
Assert.assertEquals(50, merged.fruits.bananas)
Assert.assertEquals(18, merged.others.apples)
Assert.assertEquals(1000, merged.fruits.cucumbers)
}
@Test
void testReadConfigInsideMerge() {
DefaultValueCache.createInstance([steps:[myStep:[overwrite: 'x', defaultKey1:'defaultValue1']]])