Improved helm-generator code to make it more testable and improved code coverage

Issue-ID: DCAEGEN2-2911
Issue-ID: DCAEGEN2-2917
Change-Id: Ifc1f336b627b37a9356a3a72b33fcac18bdaa686
Signed-off-by: Dhrumin Desai <dd303q@att.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ChartTemplateStructureValidatorTest.java b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ChartTemplateStructureValidatorTest.java
index 9bef191..3e94b64 100644
--- a/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ChartTemplateStructureValidatorTest.java
+++ b/mod2/helm-generator/helmchartgenerator-core/src/test/java/org/onap/dcaegen2/platform/helmchartgenerator/ChartTemplateStructureValidatorTest.java
@@ -18,23 +18,31 @@
 
 package org.onap.dcaegen2.platform.helmchartgenerator;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.onap.dcaegen2.platform.helmchartgenerator.validation.ChartTemplateStructureValidator;
+import org.onap.dcaegen2.platform.helmchartgenerator.validation.ChartTemplateStructureValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ChartTemplateStructureValidatorTest {
 
+    private ChartTemplateStructureValidatorImpl validator;
+
+    @BeforeEach
+    void setUp() {
+        validator = new ChartTemplateStructureValidatorImpl();
+    }
+
     @Test
     void validateTemplateStructure(){
         String validStructureLocation = "src/test/input/blueprint";
-        assertDoesNotThrow(() -> ChartTemplateStructureValidator.validateChartTemplateStructure(validStructureLocation));
+        assertDoesNotThrow(() -> validator.validateChartTemplateStructure(validStructureLocation));
     }
 
     @Test
     void invalidateTemplateStructureShouldThrowRuntimeError() {
         String invalidStructureLocation = "test";
-        assertThrows(RuntimeException.class, () -> ChartTemplateStructureValidator.validateChartTemplateStructure(invalidStructureLocation));
+        assertThrows(RuntimeException.class, () -> validator.validateChartTemplateStructure(invalidStructureLocation));
     }
 }