X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=mod2%2Fhelm-generator%2Fhelmchartgenerator-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdcaegen2%2Fplatform%2Fhelmchartgenerator%2FKeyValueMergerTest.java;h=102e4f19bf6031334df43fc0271f095ab6c0c4cc;hb=14693baf122b5bb7d34a1d5bec8db32a8d88f4d7;hp=40821707f20f39b6845d6c2ea510d0ff8d5058ec;hpb=f98abd8de6b9457a7edcd3457e664bd9200de2bf;p=dcaegen2%2Fplatform.git

diff --git a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java
index 4082170..102e4f1 100644
--- a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java
+++ b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/KeyValueMergerTest.java
@@ -19,6 +19,7 @@
 package org.onap.dcaegen2.platform.helmchartgenerator;
 
 import org.apache.commons.io.FileUtils;
+import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,6 +38,7 @@ import java.io.InputStream;
 import java.io.PrintWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -68,6 +70,29 @@ class KeyValueMergerTest {
         Mockito.verify(yamlHelper, Mockito.times(2)).dump(any(HashMap.class), any(PrintWriter.class));
     }
 
+    @Test
+    void testServiceAccountNameOverrride() throws Exception{
+        ChartInfo chartInfo = prepareChartInfo();
+        chartDir = prepareChartDir();
+        HashMap<String, Object> valuesKvWithSA = getValuesKvWithSA();
+        Mockito.when(yamlHelper.load(any(InputStream.class))).thenReturn(valuesKvWithSA);
+
+        merger.mergeValuesToChart(chartInfo, chartDir);
+
+        Map<String, Object> serviceAccountKv = (Map<String, Object>) valuesKvWithSA.get("serviceAccount");
+        Assertions.assertThat(serviceAccountKv.get("nameOverride")).isEqualTo("someComponent");
+    }
+
+    private HashMap<String, Object> getValuesKvWithSA() {
+        HashMap<String, Object> innerKV = new HashMap<>();
+        innerKV.put("nameOverride", "TBD");
+        innerKV.put("roles", Arrays.asList("read"));
+
+        HashMap<String, Object> KV = new HashMap<>();
+        KV.put("serviceAccount", innerKV);
+        return KV;
+    }
+
     @AfterEach
     void tearDown(){
         FileUtils.deleteQuietly(chartDir);