X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fdsa%2Fdmaappolling%2FSubscriberTest.java;h=339a23eb229c8eaede3e442f58a3d2dcb3cf2875;hb=97afdabeb7d1f2095f3fa170f0f78fb366c91644;hp=f88ddfbf82a7fa11e878a52d92078cb8cfc11192;hpb=a2d41239cd468bd2894336353b31007dfe99bf81;p=holmes%2Fengine-management.git

diff --git a/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java b/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
index f88ddfb..339a23e 100644
--- a/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
+++ b/engine-d/src/test/java/org/onap/holmes/dsa/dmaappolling/SubscriberTest.java
@@ -33,6 +33,8 @@ import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
 import static org.easymock.EasyMock.*;
 import static org.hamcrest.CoreMatchers.*;
@@ -73,19 +75,16 @@ public class SubscriberTest {
         vesAlarm.setSourceId("Source-123");
         vesAlarm.setSourceName("Source-123");
         vesAlarm.setStartEpochMicrosec(500L);
-        vesAlarm.setVersion(1L);
-        List<AlarmAdditionalField> alarmAdditionalFields = new ArrayList<>();
-        AlarmAdditionalField field = new AlarmAdditionalField();
-        field.setName("addInfo");
-        field.setValue("addInfo");
-        alarmAdditionalFields.add(field);
-        vesAlarm.setAlarmAdditionalInformation(alarmAdditionalFields);
-        vesAlarm.setAlarmCondition("alarmCondition");
+        vesAlarm.setVersion("4.0");
+        Map alarmAdditionalFields = new HashMap<String, String>();
+	alarmAdditionalFields.put("addInfo", "addInfo");
+	vesAlarm.setAlarmAdditionalInformation(alarmAdditionalFields);
+	vesAlarm.setAlarmCondition("alarmCondition");
         vesAlarm.setAlarmInterfaceA("alarmInterfaceA");
         vesAlarm.setEventCategory("eventCategory");
         vesAlarm.setEventSeverity("eventSeverity");
         vesAlarm.setEventSourceType("eventSourceType");
-        vesAlarm.setFaultFieldsVersion(1L);
+        vesAlarm.setFaultFieldsVersion("2.0");
         vesAlarm.setSpecificProblem("specificProblem");
         vesAlarm.setVfStatus("vfStatus");
 
@@ -104,16 +103,16 @@ public class SubscriberTest {
                 "\"sourceId\": \"Source-123\"," +
                 "\"sourceName\": \"Source-123\"," +
                 "\"startEpochMicrosec\": 500," +
-                "\"version\": 1" +
+                "\"version\": \"4.0\"" +
                 "}," +
                 " \"faultFields\" : {" +
-                "\"alarmAdditionalInformation\": [{\"name\":\"addInfo\", \"value\":\"addInfo\"}]," +
+                "\"alarmAdditionalInformatiddon\":[{\"name\":\"addInfo\", \"value\":\"addInfo\"}]," +
                 "\"alarmCondition\": \"alarmCondition\"," +
                 "\"alarmInterfaceA\": \"alarmInterfaceA\"," +
                 "\"eventCategory\": \"eventCategory\"," +
                 "\"eventSeverity\": \"eventSeverity\"," +
                 "\"eventSourceType\": \"eventSourceType\"," +
-                "\"faultFieldsVersion\": 1," +
+                "\"faultFieldsVersion\": \"2.0\"," +
                 "\"specificProblem\": \"specificProblem\"," +
                 "\"vfStatus\": \"vfStatus\"" +
                 "}}}";
@@ -160,19 +159,16 @@ public class SubscriberTest {
         vesAlarm.setSourceId("Source-123");
         vesAlarm.setSourceName("Source-123");
         vesAlarm.setStartEpochMicrosec(500L);
-        vesAlarm.setVersion(1L);
-        List<AlarmAdditionalField> alarmAdditionalFields = new ArrayList<>();
-        AlarmAdditionalField field = new AlarmAdditionalField();
-        field.setName("addInfo");
-        field.setValue("addInfo");
-        alarmAdditionalFields.add(field);
-        vesAlarm.setAlarmAdditionalInformation(alarmAdditionalFields);
-        vesAlarm.setAlarmCondition("alarmCondition");
+        vesAlarm.setVersion("4.0");
+        Map alarmAdditionalFields = new HashMap<String, String>();
+	alarmAdditionalFields.put("addInfo", "addInfo");
+	vesAlarm.setAlarmAdditionalInformation(alarmAdditionalFields);
+	vesAlarm.setAlarmCondition("alarmCondition");
         vesAlarm.setAlarmInterfaceA("alarmInterfaceA");
         vesAlarm.setEventCategory("eventCategory");
         vesAlarm.setEventSeverity("eventSeverity");
         vesAlarm.setEventSourceType("eventSourceType");
-        vesAlarm.setFaultFieldsVersion(1L);
+        vesAlarm.setFaultFieldsVersion("2.0");
         vesAlarm.setSpecificProblem("specificProblem");
         vesAlarm.setVfStatus("vfStatus");
 
@@ -191,7 +187,7 @@ public class SubscriberTest {
                 "\"sourceId\": \"Source-123\"," +
                 "\"sourceName\": \"Source-123\"," +
                 "\"startEpochMicrosec\": 500," +
-                "\"version\": 1" +
+                "\"version\": \"4.0\"" +
                 "}," +
                 " \"faultFields\" : {" +
                 "\"alarmAdditionalInformation\": [{\"name\":\"addInfo\", \"value\":\"addInfo\"}]," +
@@ -200,7 +196,7 @@ public class SubscriberTest {
                 "\"eventCategory\": \"eventCategory\"," +
                 "\"eventSeverity\": \"eventSeverity\"," +
                 "\"eventSourceType\": \"eventSourceType\"," +
-                "\"faultFieldsVersion\": 1," +
+                "\"faultFieldsVersion\": \"2.0\"," +
                 "\"specificProblem\": \"specificProblem\"," +
                 "\"vfStatus\": \"vfStatus\"" +
                 "}}}";
@@ -257,4 +253,4 @@ public class SubscriberTest {
         PowerMock.verifyAll();
     }
 
-}
\ No newline at end of file
+}