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=ab75e0602da85982a7d513cf520547f59453fb85;hb=953aee4dbbed4ce9edae8ca9914290b3164b077a;hp=a38c26e29cdea4bc40cbf84329a1ae86205a987f;hpb=8b3c9e2b928e3a0308974482e2645ace4838c468;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 a38c26e..ab75e06 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,57 +16,51 @@
 
 package org.onap.holmes.common.utils;
 
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
-import javax.ws.rs.QueryParam;
 import org.easymock.EasyMock;
 import org.junit.Rule;
 import org.junit.Test;
-import org.onap.holmes.common.msb.MicroserviceBusRest;
-import org.onap.holmes.common.api.entity.ServiceRegisterEntity;
 import org.onap.holmes.common.config.MicroServiceConfig;
+import org.onap.holmes.common.exception.CorrelationException;
+import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo;
+import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
+import org.onap.msb.sdk.httpclient.msb.MSBServiceClient;
 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({MicroServiceConfig.class, MSBServiceClient.class, MSBRegisterUtil.class})
+@PowerMockIgnore({"javax.ws.*"})
 public class MSBRegisterUtilTest {
 
     @Rule
     public PowerMockRule powerMockRule = new PowerMockRule();
+
     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();
+    public void test_register2Msb_normal() throws Exception {
+        MicroServiceInfo msi = new MicroServiceInfo();
+        String[] msbAddrInfo = {"127.0.0.1", "80"};
 
-        msbRegisterUtil.register(initServiceEntity());
+        PowerMock.mockStatic(MicroServiceConfig.class);
+        EasyMock.expect(MicroServiceConfig.getMsbIpAndPort()).andReturn(msbAddrInfo);
 
-        PowerMock.verifyAll();
-    }
+        MSBServiceClient client = PowerMock.createMock(MSBServiceClient.class);
+        PowerMock.expectNew(MSBServiceClient.class, msbAddrInfo[0], Integer.parseInt(msbAddrInfo[1])).andReturn(client);
 
-    private ServiceRegisterEntity initServiceEntity() {
-        ServiceRegisterEntity serviceRegisterEntity = new ServiceRegisterEntity();
-        serviceRegisterEntity.setServiceName("holmes-rule-mgmt");
-        serviceRegisterEntity.setProtocol("REST");
-        serviceRegisterEntity.setVersion("v1");
-        serviceRegisterEntity.setUrl("/onapapi/holmes-rule-mgmt/v1");
-        serviceRegisterEntity.setSingleNode(MicroServiceConfig.getServiceIp(), "9101", 0);
-        serviceRegisterEntity.setVisualRange("1|0");
-        return serviceRegisterEntity;
-    }
+        EasyMock.expect(client.registerMicroServiceInfo(msi, false)).andReturn(null);
 
-    class MicroserviceBusRestProxy implements MicroserviceBusRest {
+        EasyMock.expect(client.registerMicroServiceInfo(msi, false)).andReturn(new MicroServiceFullInfo());
 
-        @Override
-        public ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,
-                ServiceRegisterEntity entity) {
-            return null;
+        PowerMock.replayAll();
+
+        try {
+            msbRegisterUtil.register2Msb(msi);
+        } catch (CorrelationException e) {
+            // Do nothing
         }
+
+        PowerMock.verifyAll();
     }
 }
\ No newline at end of file