Get the MSB info from DCAE Consul

[holmes/common.git] / holmes-actions / src / test / java / org / onap / holmes / common / utils / MSBRegisterUtilTest.java

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
index 72d9a61..ab2554f 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/MSBRegisterUtilTest.java
@@ -16,6 +16,8 @@
 \r
 package org.onap.holmes.common.utils;\r
 \r
+import static org.onap.holmes.common.config.MicroServiceConfig.HOSTNAME;\r
+\r
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
 import javax.ws.rs.QueryParam;\r
 import org.easymock.EasyMock;\r
@@ -25,10 +27,12 @@ import org.onap.holmes.common.msb.MicroserviceBusRest;
 import org.onap.holmes.common.api.entity.ServiceRegisterEntity;\r
 import org.onap.holmes.common.config.MicroServiceConfig;\r
 import org.powermock.api.easymock.PowerMock;\r
+import org.powermock.core.classloader.annotations.PowerMockIgnore;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
 import org.powermock.modules.junit4.rule.PowerMockRule;\r
 \r
-@PrepareForTest(ConsumerFactory.class)\r
+@PrepareForTest({ConsumerFactory.class, MicroServiceConfig.class})\r
+@PowerMockIgnore({"javax.ws.*"})\r
 public class MSBRegisterUtilTest {\r
 \r
     @Rule\r
@@ -36,27 +40,14 @@ public class MSBRegisterUtilTest {
     private MSBRegisterUtil msbRegisterUtil = new MSBRegisterUtil();\r
     private MicroserviceBusRest microserviceBusRest = new MicroserviceBusRestProxy();\r
 \r
-    @Test\r
-    public void registerTest() throws Exception {\r
-        ServiceRegisterEntity entity = initServiceEntity();\r
-        PowerMock.mockStatic(ConsumerFactory.class);\r
-        EasyMock.expect(ConsumerFactory\r
-                .createConsumer(EasyMock.anyObject(String.class), EasyMock.anyObject(Class.class)))\r
-                .andReturn(microserviceBusRest);\r
-        PowerMock.replayAll();\r
-\r
-        msbRegisterUtil.register(initServiceEntity());\r
-\r
-        PowerMock.verifyAll();\r
-    }\r
-\r
     private ServiceRegisterEntity initServiceEntity() {\r
+        String[] serviceAddrInfo = MicroServiceConfig.getServiceAddrInfo();\r
         ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();\r
         serviceRegisterEntity.setServiceName("holmes-rule-mgmt");\r
         serviceRegisterEntity.setProtocol("REST");\r
         serviceRegisterEntity.setVersion("v1");\r
         serviceRegisterEntity.setUrl("/api/holmes-rule-mgmt/v1");\r
-        serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9101", 0);\r
+        serviceRegisterEntity.setSingleNode(serviceAddrInfo[0], serviceAddrInfo[1], 0);\r
         serviceRegisterEntity.setVisualRange("1|0");\r
         return serviceRegisterEntity;\r
     }\r