X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Futils%2FMSBRegisterUtilTest.java;h=ab2554fc6dab73a1c25daa3d60b5c972d49e4dc3;hb=9d2cccba20f32fe54e4ccf1f433f68b5cee95bd5;hp=72d9a613e2902a8eee9dd44ebf2563644b2ef135;hpb=8eedabbb6faf3bc2ba10df850e68cf719cd6c8ad;p=holmes%2Fcommon.git

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
--- 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 @@
 
 package org.onap.holmes.common.utils;
 
+import static org.onap.holmes.common.config.MicroServiceConfig.HOSTNAME;
+
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 import javax.ws.rs.QueryParam;
 import org.easymock.EasyMock;
@@ -25,10 +27,12 @@ import org.onap.holmes.common.msb.MicroserviceBusRest;
 import org.onap.holmes.common.api.entity.ServiceRegisterEntity;
 import org.onap.holmes.common.config.MicroServiceConfig;
 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.rule.PowerMockRule;
 
-@PrepareForTest(ConsumerFactory.class)
+@PrepareForTest({ConsumerFactory.class, MicroServiceConfig.class})
+@PowerMockIgnore({"javax.ws.*"})
 public class MSBRegisterUtilTest {
 
     @Rule
@@ -36,27 +40,14 @@ public class MSBRegisterUtilTest {
     private MSBRegisterUtil msbRegisterUtil = new MSBRegisterUtil();
     private MicroserviceBusRest microserviceBusRest = new MicroserviceBusRestProxy();
 
-    @Test
-    public void registerTest() throws Exception {
-        ServiceRegisterEntity entity = initServiceEntity();
-        PowerMock.mockStatic(ConsumerFactory.class);
-        EasyMock.expect(ConsumerFactory
-                .createConsumer(EasyMock.anyObject(String.class), EasyMock.anyObject(Class.class)))
-                .andReturn(microserviceBusRest);
-        PowerMock.replayAll();
-
-        msbRegisterUtil.register(initServiceEntity());
-
-        PowerMock.verifyAll();
-    }
-
     private ServiceRegisterEntity initServiceEntity() {
+        String[] serviceAddrInfo = MicroServiceConfig.getServiceAddrInfo();
         ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();
         serviceRegisterEntity.setServiceName("holmes-rule-mgmt");
         serviceRegisterEntity.setProtocol("REST");
         serviceRegisterEntity.setVersion("v1");
         serviceRegisterEntity.setUrl("/api/holmes-rule-mgmt/v1");
-        serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9101", 0);
+        serviceRegisterEntity.setSingleNode(serviceAddrInfo[0], serviceAddrInfo[1], 0);
         serviceRegisterEntity.setVisualRange("1|0");
         return serviceRegisterEntity;
     }