update link to upper-constraints.txt

[holmes/engine-management.git] / engine-d / src / test / java / org / onap / holmes / dsa / dmaappolling / SubscriberTest.java

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 4cf1caf..96794ce 100644 (file)
--- 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2020 ZTE Corporation.
+ * Copyright 2017-2021 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,31 +15,31 @@
  */
 package org.onap.holmes.dsa.dmaappolling;
 
-import org.glassfish.hk2.api.ServiceLocator;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.onap.holmes.common.api.stat.AlarmAdditionalField;
 import org.onap.holmes.common.api.stat.VesAlarm;
-import org.onap.holmes.common.dropwizard.ioc.utils.ServiceLocatorHolder;
 import org.onap.holmes.common.exception.CorrelationException;
 import org.onap.holmes.common.utils.JerseyClient;
+import org.onap.holmes.common.utils.SpringContextUtil;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static org.easymock.EasyMock.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ServiceLocatorHolder.class, ServiceLocator.class, Subscriber.class})
+@PrepareForTest({SpringContextUtil.class, JerseyClient.class})
 @PowerMockIgnore("javax.net.ssl.*")
 public class SubscriberTest {
 
@@ -50,10 +50,8 @@ public class SubscriberTest {
 
     @Before
     public void init() {
-        PowerMock.mockStatic(ServiceLocatorHolder.class);
-        ServiceLocator serviceLocator = PowerMock.createMock(ServiceLocator.class);
-        expect(ServiceLocatorHolder.getLocator()).andReturn(serviceLocator).anyTimes();
-        expect(serviceLocator.getService(DMaaPResponseUtil.class)).andReturn(util).anyTimes();
+        PowerMock.mockStatic(SpringContextUtil.class);
+        expect(SpringContextUtil.getBean(DMaaPResponseUtil.class)).andReturn(util).anyTimes();
     }
 
     @Test
@@ -73,19 +71,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.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 +99,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 +155,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.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 +183,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 +192,7 @@ public class SubscriberTest {
                 "\"eventCategory\": \"eventCategory\"," +
                 "\"eventSeverity\": \"eventSeverity\"," +
                 "\"eventSourceType\": \"eventSourceType\"," +
-                "\"faultFieldsVersion\": 1," +
+                "\"faultFieldsVersion\": \"2.0\"," +
                 "\"specificProblem\": \"specificProblem\"," +
                 "\"vfStatus\": \"vfStatus\"" +
                 "}}}";
@@ -220,7 +212,8 @@ public class SubscriberTest {
         subscriber.setUrl("https://www.onap.org");
         subscriber.setConsumerGroup("group");
         subscriber.setConsumer("consumer");
-        List<VesAlarm> vesAlarms = subscriber.subscribe();
+
+        subscriber.subscribe();
 
         PowerMock.verifyAll();
     }
@@ -256,4 +249,4 @@ public class SubscriberTest {
         PowerMock.verifyAll();
     }
 
-}
\ No newline at end of file
+}