Improve test coverage

Add unit tests to improve test coverage.

Issue-ID: SDC-3428
Change-Id: Ifd9e6eb25fa3ec9f4f93d283277574120edff835
Signed-off-by: xuegao <xue.gao@intl.att.com>

6 files changed, 135 insertions, 78 deletions

diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java
index 98850defd1..091118e0fa 100644
--- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java
+++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/HealthCheckStatusTest.java
@@ -19,10 +19,11 @@
  */
 package org.openecomp.sdc.health.data;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class HealthCheckStatusTest {
 
@@ -37,4 +38,9 @@ public class HealthCheckStatusTest {
         HealthCheckStatus status = HealthCheckStatus.toValue("MAYBE");
         assertNull(status);
     }
+
+    @Test
+    public void toStringTest() {
+        assertEquals("UP", HealthCheckStatus.UP.toString());
+    }
 }
\ No newline at end of file
diff --git a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java
index fe9415a72c..be578d9ac8 100644
--- a/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java
+++ b/openecomp-be/backend/openecomp-sdc-healthcheck-manager/src/test/java/org/openecomp/sdc/health/data/MonitoredModulesTest.java
@@ -19,10 +19,10 @@
  */
 package org.openecomp.sdc.health.data;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class MonitoredModulesTest {
 
@@ -37,4 +37,9 @@ public class MonitoredModulesTest {
         MonitoredModules modules = MonitoredModules.toValue("UP");
         assertNull(modules);
     }
+
+    @org.junit.jupiter.api.Test
+    public void toStringTest() {
+        assertEquals("BE", MonitoredModules.BE.toString());
+    }
 }
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java
index 64d90262da..3e2b38e227 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescription.java
@@ -19,9 +19,14 @@
  */
 package org.openecomp.sdc.enrichment.impl.tosca.model;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Objects;
 
 @SuppressWarnings("CheckStyle")
+@Getter
+@Setter
 public class PortMirroringConnectionPointDescription {
 
     private String nf_type;
@@ -44,54 +49,6 @@ public class PortMirroringConnectionPointDescription {
         pps_capacity = "";
     }
 
-    public String getNf_type() {
-        return nf_type;
-    }
-
-    public void setNf_type(String nf_type) {
-        this.nf_type = nf_type;
-    }
-
-    public String getNfc_type() {
-        return nfc_type;
-    }
-
-    public void setNfc_type(String nfc_type) {
-        this.nfc_type = nfc_type;
-    }
-
-    public String getNf_naming_code() {
-        return nf_naming_code;
-    }
-
-    public void setNf_naming_code(String nf_naming_code) {
-        this.nf_naming_code = nf_naming_code;
-    }
-
-    public String getNfc_naming_code() {
-        return nfc_naming_code;
-    }
-
-    public void setNfc_naming_code(String nfc_naming_code) {
-        this.nfc_naming_code = nfc_naming_code;
-    }
-
-    public Object getNetwork_role() {
-        return network_role;
-    }
-
-    public void setNetwork_role(Object network_role) {
-        this.network_role = network_role;
-    }
-
-    public Object getPps_capacity() {
-        return pps_capacity;
-    }
-
-    public void setPps_capacity(String pps_capacity) {
-        this.pps_capacity = pps_capacity;
-    }
-
     public boolean isEmpty() {
         return Objects.isNull(nf_type) && Objects.isNull(nfc_type) && Objects.isNull(nf_naming_code) && Objects.isNull(nfc_naming_code) && Objects
             .isNull(network_role) && Objects.isNull(pps_capacity);
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescriptionTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescriptionTest.java
new file mode 100644
index 0000000000..c9b08769e0
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/tosca/model/PortMirroringConnectionPointDescriptionTest.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.sdc.enrichment.impl.tosca.model;
+
+import org.junit.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class PortMirroringConnectionPointDescriptionTest {
+
+    @Test
+    public void testIsEmpty() {
+        PortMirroringConnectionPointDescription testSuite = new PortMirroringConnectionPointDescription();
+        assertFalse(testSuite.isEmpty());
+
+        testSuite.setNf_type(null);
+        assertFalse(testSuite.isEmpty());
+
+        testSuite.setNfc_type(null);
+        assertFalse(testSuite.isEmpty());
+
+        testSuite.setNf_naming_code(null);
+        assertFalse(testSuite.isEmpty());
+
+        testSuite.setNfc_naming_code(null);
+        assertFalse(testSuite.isEmpty());
+
+        testSuite.setNetwork_role(null);
+        assertFalse(testSuite.isEmpty());
+
+        testSuite.setPps_capacity(null);
+        assertTrue(testSuite.isEmpty());
+    }
+}
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java
index 79d00c3048..f0c78fbb9d 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/composition/NodeTemplateInformation.java
@@ -19,37 +19,20 @@
  */
 package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.composition;
 
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
 import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
 
 /**
  * Created by Talio on 4/4/2017.
  */
+@Getter
+@Setter
+@AllArgsConstructor
 public class NodeTemplateInformation {
 
     UnifiedCompositionEntity unifiedCompositionEntity;
     private NodeTemplate nodeTemplate;
-
-    public NodeTemplateInformation() {
-    }
-
-    public NodeTemplateInformation(UnifiedCompositionEntity unifiedCompositionEntity, NodeTemplate nodeTemplate) {
-        this.unifiedCompositionEntity = unifiedCompositionEntity;
-        this.nodeTemplate = nodeTemplate;
-    }
-
-    public UnifiedCompositionEntity getUnifiedCompositionEntity() {
-        return unifiedCompositionEntity;
-    }
-
-    public void setUnifiedCompositionEntity(UnifiedCompositionEntity unifiedCompositionEntity) {
-        this.unifiedCompositionEntity = unifiedCompositionEntity;
-    }
-
-    public NodeTemplate getNodeTemplate() {
-        return nodeTemplate;
-    }
-
-    public void setNodeTemplate(NodeTemplate nodeTemplate) {
-        this.nodeTemplate = nodeTemplate;
-    }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/util/YamlValidatorUtilTest.java b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/util/YamlValidatorUtilTest.java
new file mode 100644
index 0000000000..d7f5b08988
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-validation-lib/openecomp-sdc-validation-impl/src/test/java/org/openecomp/sdc/validation/util/YamlValidatorUtilTest.java
@@ -0,0 +1,53 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * SDC
+ * ================================================================================
+ * Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package org.openecomp.sdc.validation.util;
+
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.openecomp.sdc.validation.impl.util.YamlValidatorUtil;
+import org.yaml.snakeyaml.error.MarkedYAMLException;
+import org.yaml.snakeyaml.parser.ParserException;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+public class YamlValidatorUtilTest {
+    @Test
+    public void testIsEmpty() {
+        MarkedYAMLException markedYamlException = Mockito.mock(MarkedYAMLException.class);
+        when(markedYamlException.getMessage()).thenReturn("test");
+        assertEquals("test", YamlValidatorUtil.getParserExceptionReason(markedYamlException));
+
+        Exception exception = Mockito.mock(Exception.class);
+        when(exception.getCause()).thenReturn(new Exception());
+        assertEquals("general parser error", YamlValidatorUtil.getParserExceptionReason(exception));
+
+        when(markedYamlException.getCause()).thenReturn(new Exception());
+        when(exception.getCause()).thenReturn(markedYamlException);
+        assertEquals("test", YamlValidatorUtil.getParserExceptionReason(exception));
+
+        ParserException parserException = Mockito.mock(ParserException.class);
+        when(parserException.getMessage()).thenReturn("parseException");
+        when(markedYamlException.getCause()).thenReturn(parserException);
+        when(exception.getCause()).thenReturn(markedYamlException);
+        assertEquals("parseException", YamlValidatorUtil.getParserExceptionReason(exception));
+    }
+}