aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Puzikov <d.puzikov2@partner.samsung.com>2020-04-06 16:12:42 +0200
committerOfir Sonsino <ofir.sonsino@intl.att.com>2020-04-07 14:45:34 +0000
commit2c2588f0c02254d490b9f542844e75b33134da2a (patch)
treebf93ff11917730adc4c1264e128048e02200e582
parente69b87493fb84ef585d02b03d02ec8cc1f819381 (diff)
Added more tests to increase coverage
Removed redundant tests Change-Id: I7776639d435267c4c38a32a7c19d925b0e715b15 Issue-ID: SDC-2869 Signed-off-by: Dmitry Puzikov <d.puzikov2@partner.samsung.com>
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml5
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java20
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java8
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ArtifactCategoryTest.java57
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfoTest.java74
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentProcessInfoTest.java1
6 files changed, 143 insertions, 22 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml
index 48f98a0b01..a4c5852983 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/pom.xml
@@ -60,6 +60,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.jmockit</groupId>
+ <artifactId>jmockit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java
index 555debfd34..c037832e58 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/ArtifactCategory.java
@@ -23,8 +23,11 @@ package org.openecomp.core.enrichment.types;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+@AllArgsConstructor
public enum ArtifactCategory {
INFORMATIONAL("Informational"),
@@ -32,11 +35,9 @@ public enum ArtifactCategory {
private static final Map<String, ArtifactCategory> mMap =
Collections.unmodifiableMap(initializeMapping());
- private String displayName;
- ArtifactCategory(String displayName) {
- this.displayName = displayName;
- }
+ @Getter
+ private String displayName;
/**
* Initialize mapping map.
@@ -63,15 +64,4 @@ public enum ArtifactCategory {
}
return null;
}
-
- /**
- * Gets display name.
- *
- * @return the display name
- */
- public String getDisplayName() {
- return displayName;
- }
-
-
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java
index 172dbc92e3..f85100b038 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/main/java/org/openecomp/core/enrichment/types/CeilometerMetrics.java
@@ -17,13 +17,9 @@
package org.openecomp.core.enrichment.types;
import java.util.List;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Data;
-
-@Getter
-@Setter
+@Data
public class CeilometerMetrics {
private List<CeilometerMetric> ceilometerMetricList;
-
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ArtifactCategoryTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ArtifactCategoryTest.java
new file mode 100644
index 0000000000..93ed5258aa
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ArtifactCategoryTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2020 Samsung
+ *
+ * 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.
+ */
+
+package org.openecomp.core.enrichment.types;
+
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import org.junit.Test;
+
+public class ArtifactCategoryTest {
+ public static final String DISPLAY_NAME_INFO = "Informational";
+ public static final String DISPLAY_NAME_DEPL = "Deployment";
+ public static final String DISPLAY_NAME_NON_EXIST = "NonExistentName";
+
+ @Test
+ public void testCtor() {
+ ArtifactCategory artifactCategoryInf = ArtifactCategory.INFORMATIONAL;
+ ArtifactCategory artifactCategoryDepl = ArtifactCategory.DEPLOYMENT;
+
+ assertThat(artifactCategoryInf.getDisplayName(), is(DISPLAY_NAME_INFO));
+ assertThat(artifactCategoryDepl.getDisplayName(), is(DISPLAY_NAME_DEPL));
+ }
+
+ @Test
+ public void testGetArtifactTypeByDisplayName() {
+ ArtifactCategory result = ArtifactCategory.getArtifactTypeByDisplayName(DISPLAY_NAME_INFO);
+ assertThat(result, is(ArtifactCategory.INFORMATIONAL));
+ }
+
+ @Test
+ public void testGetArtifactTypeByDisplayNameNonExistentName() {
+ ArtifactCategory result = ArtifactCategory.getArtifactTypeByDisplayName(DISPLAY_NAME_NON_EXIST);
+ assertThat(result, nullValue());
+ }
+
+ @Test
+ public void testGetArtifactTypeByDisplayNameNullName() {
+ ArtifactCategory result = ArtifactCategory.getArtifactTypeByDisplayName(null);
+ assertThat(result, nullValue());
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfoTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfoTest.java
new file mode 100644
index 0000000000..b857d0cc04
--- /dev/null
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentMonitoringUploadInfoTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2020 Samsung
+ *
+ * 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.
+ */
+
+package org.openecomp.core.enrichment.types;
+
+import static org.hamcrest.CoreMatchers.isA;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import mockit.Deencapsulation;
+import org.junit.Test;
+
+public class ComponentMonitoringUploadInfoTest {
+
+ @Test
+ public void testGetSnmpTrap() {
+ ComponentMonitoringUploadInfo uploadInfo = new ComponentMonitoringUploadInfo();
+ setInternals(uploadInfo);
+
+ assertThat(uploadInfo.getSnmpTrap(), isA(MonitoringArtifactInfo.class));
+ }
+
+ @Test
+ public void testGetSnmpPoll() {
+ ComponentMonitoringUploadInfo uploadInfo = new ComponentMonitoringUploadInfo();
+ setInternals(uploadInfo);
+
+ assertThat(uploadInfo.getSnmpPoll(), isA(MonitoringArtifactInfo.class));
+ }
+
+ @Test
+ public void testGetVesEvent() {
+ ComponentMonitoringUploadInfo uploadInfo = new ComponentMonitoringUploadInfo();
+ setInternals(uploadInfo);
+
+ assertThat(uploadInfo.getVesEvent(), isA(MonitoringArtifactInfo.class));
+ }
+
+ @Test
+ public void testSetMonitoringArtifactFile() {
+ ComponentMonitoringUploadInfo uploadInfo = new ComponentMonitoringUploadInfo();
+
+ uploadInfo.setMonitoringArtifactFile(MonitoringUploadType.SNMP_POLL, new MonitoringArtifactInfo());
+
+ assertThat(getInternal(uploadInfo).containsKey(MonitoringUploadType.SNMP_POLL), is(true));
+ }
+
+ private Map<MonitoringUploadType, MonitoringArtifactInfo> getInternal(ComponentMonitoringUploadInfo componentMonitoringUploadInfo) {
+ return Deencapsulation.getField(componentMonitoringUploadInfo, "infoByType");
+ }
+
+ private void setInternals(ComponentMonitoringUploadInfo componentMonitoringUploadInfo) {
+ Map<MonitoringUploadType, MonitoringArtifactInfo> infoMap = new HashMap<>();
+ infoMap.put(MonitoringUploadType.SNMP_POLL, new MonitoringArtifactInfo());
+ infoMap.put(MonitoringUploadType.SNMP_TRAP, new MonitoringArtifactInfo());
+ infoMap.put(MonitoringUploadType.VES_EVENTS, new MonitoringArtifactInfo());
+ Deencapsulation.setField(componentMonitoringUploadInfo, "infoByType", infoMap);
+ }
+} \ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentProcessInfoTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentProcessInfoTest.java
index 383cd49806..8d06ebae20 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentProcessInfoTest.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-api/src/test/java/org/openecomp/core/enrichment/types/ComponentProcessInfoTest.java
@@ -15,7 +15,6 @@
*/
package org.openecomp.core.enrichment.types;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;