diff options
Diffstat (limited to 'src/test')
5 files changed, 201 insertions, 3 deletions
diff --git a/src/test/java/org/onap/msb/sdk/discovery/MSBServiceTest.java b/src/test/java/org/onap/msb/sdk/discovery/MSBServiceTest.java index fc8f483..e214bf1 100644 --- a/src/test/java/org/onap/msb/sdk/discovery/MSBServiceTest.java +++ b/src/test/java/org/onap/msb/sdk/discovery/MSBServiceTest.java @@ -13,17 +13,17 @@ */ package org.onap.msb.sdk.discovery; +import java.util.Date; import java.util.HashSet; import java.util.Set; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.msb.sdk.discovery.common.RouteConst; import org.onap.msb.sdk.discovery.common.RouteException; import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo; import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; -import org.onap.msb.sdk.discovery.entity.Node; +import org.onap.msb.sdk.discovery.entity.NodeInfo; import org.onap.msb.sdk.discovery.util.HttpClientUtil; import org.onap.msb.sdk.discovery.util.JacksonJsonUtil; import org.powermock.api.mockito.PowerMockito; @@ -43,7 +43,7 @@ public class MSBServiceTest { "http://127.0.0.1:10081/api/microservices/v1/services/aai/version/v8"; private static final String MOCK_REG_SERVICE_JSON = - "{\"serviceName\":\"aai\",\"version\":\"v8\",\"url\":\"/aai/v8\",\"protocol\":\"REST\",\"visualRange\":\"1\",\"lb_policy\":\"\",\"path\":\"/aai/v8\",\"nodes\":[{\"ip\":\"10.74.44.1\",\"port\":\"8443\",\"ttl\":\"\"}],\"metadata\":null}"; + "{\"serviceName\":\"aai\",\"version\":\"v8\",\"url\":\"/aai/v8\",\"protocol\":\"REST\",\"visualRange\":\"1\",\"lb_policy\":\"\",\"path\":\"/aai/v8\",\"nodes\":[{\"ip\":\"10.74.44.1\",\"port\":\"8443\",\"ttl\":\"20\"}],\"metadata\":[{\"key\":\"key1\",\"value\":\"value1\"}]}"; @Test public void test_registration_update_true() throws RouteException { @@ -51,6 +51,8 @@ public class MSBServiceTest { MicroServiceInfo microServiceInfo = (MicroServiceInfo) JacksonJsonUtil.jsonToBean(MOCK_REG_SERVICE_JSON, MicroServiceInfo.class); MicroServiceFullInfo microServiceFullInfo = mockMicroServiceFullInfo(microServiceInfo); + System.out.println(microServiceFullInfo.toString()); + System.out.println(microServiceInfo.toString()); mockHttpPost(MOCK_MSB_URL_REG_UPDATE_TRUE, JacksonJsonUtil.beanToJson(microServiceFullInfo)); MSBService msbService = new MSBService(); microServiceFullInfo = msbService.registerMicroServiceInfo(msbAddress, microServiceInfo); @@ -112,6 +114,18 @@ public class MSBServiceTest { MSBService msbService = new MSBService(); msbService.cancelMicroServiceInfo(msbAddress, "aai", "v8", "10.74.44.1", "8443"); } + + @Test + public void test_healthCheckbyTTL(){ + try{ + PowerMockito.mockStatic(HttpClientUtil.class); + MSBService msbService = new MSBService(); + msbService.healthCheckbyTTL("127.0.0.1:10081","aai", "v8", "10.74.44.1", "8443"); + } + catch (Exception e) { + Assert.assertTrue(e instanceof RouteException); + } + } private MicroServiceFullInfo mockMicroServiceFullInfo(MicroServiceInfo info) { MicroServiceFullInfo serviceInfo = new MicroServiceFullInfo(); @@ -122,6 +136,20 @@ public class MSBServiceTest { serviceInfo.setVisualRange(info.getVisualRange()); serviceInfo.setLb_policy(info.getLb_policy()); serviceInfo.setPath(info.getPath()); + + Set<NodeInfo> nodes=new HashSet<NodeInfo>(); + NodeInfo node=new NodeInfo(); + node.setCreated_at(new Date()); + node.setExpiration(new Date()); + node.setIp("10.74.44.1"); + node.setNodeId("10.74.44.1_8443"); + node.setPort("8443"); + node.setStatus("1"); + node.setTtl("20"); + node.setUpdated_at(new Date()); + + nodes.add(node); + serviceInfo.setNodes(nodes); return serviceInfo; } diff --git a/src/test/java/org/onap/msb/sdk/discovery/common/RouteConstTest.java b/src/test/java/org/onap/msb/sdk/discovery/common/RouteConstTest.java new file mode 100644 index 0000000..05ed2a1 --- /dev/null +++ b/src/test/java/org/onap/msb/sdk/discovery/common/RouteConstTest.java @@ -0,0 +1,41 @@ +/** + * Copyright 2017 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.onap.msb.sdk.discovery.common; + +import org.junit.Assert; +import org.junit.Test; + +public class RouteConstTest { + + @Test + public void test_checkExistProtocol(){ + + Assert.assertTrue(RouteConst.checkExistProtocol("FTP")); + Assert.assertFalse(RouteConst.checkExistProtocol("FTTP")); + } + + @Test + public void test_checkExist(){ + + Assert.assertTrue(RouteConst.checkExist("test,tt,ss","tt")); + Assert.assertFalse(RouteConst.checkExist("test,tt,ss","ee")); + } + + @Test + public void test_listProtocol(){ + String list="REST | HTTP | MQ | FTP | SNMP | TCP | UDP | UI | "; + Assert.assertEquals(list, RouteConst.listProtocol()); + } +} diff --git a/src/test/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtilTest.java b/src/test/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtilTest.java index 90f2fd5..9ed4cec 100644 --- a/src/test/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtilTest.java +++ b/src/test/java/org/onap/msb/sdk/discovery/util/JacksonJsonUtilTest.java @@ -20,6 +20,7 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; +import org.onap.msb.sdk.discovery.common.RouteException; import org.onap.msb.sdk.discovery.entity.NodeAddress; @@ -46,4 +47,15 @@ public class JacksonJsonUtilTest { Assert.fail("Exception" + e.getMessage()); } } + + @Test + public void testJsonToBean_fail() { + try { + String json = "{\"ip\":\"127.0.0.1,\"port\":\"80\"}"; + NodeAddress address = (NodeAddress) JacksonJsonUtil.jsonToBean(json, NodeAddress.class); + Assert.assertEquals("127.0.0.1", address.getIp()); + } catch (Exception e) { + Assert.assertTrue(e instanceof RouteException); + } + } } diff --git a/src/test/java/org/onap/msb/sdk/discovery/util/MsbUtilTest.java b/src/test/java/org/onap/msb/sdk/discovery/util/MsbUtilTest.java new file mode 100644 index 0000000..c6df741 --- /dev/null +++ b/src/test/java/org/onap/msb/sdk/discovery/util/MsbUtilTest.java @@ -0,0 +1,99 @@ +/** + * Copyright 2017 ZTE Corporation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except + * in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + */ + +package org.onap.msb.sdk.discovery.util; + +import java.util.Set; + +import org.junit.Assert; +import org.junit.Test; +import org.onap.msb.sdk.discovery.common.RouteException; +import org.onap.msb.sdk.discovery.entity.Node; +import org.onap.msb.sdk.discovery.entity.NodeInfo; + +public class MsbUtilTest { + + @Test + public void test_getConsulServiceName(){ + Assert.assertEquals("test", MsbUtil.getConsulServiceName("test","")); + Assert.assertEquals("test-ns", MsbUtil.getConsulServiceName("test","ns")); + } + + @Test + public void test_getLbNodes(){ + + Node node=new Node(); + node.setIp("127.0.0.1"); + node.setPort("8089"); + + Set<NodeInfo> nodes=MsbUtil.getLbNodes(node); + Assert.assertEquals(1, nodes.size()); + } + + @Test + public void test_checkServiceName(){ + try { + MsbUtil.checkServiceName("testName"); + MsbUtil.checkServiceName(""); + + } catch (RouteException e) { + Assert.assertTrue(e instanceof RouteException); + + } + + } + + @Test + public void test_checkVersion(){ + try { + Assert.assertEquals("v1", MsbUtil.checkVersion("v1")); + Assert.assertEquals("null", MsbUtil.checkVersion("")); + MsbUtil.checkVersion("version"); + + } catch (RouteException e) { + Assert.assertTrue(e instanceof RouteException); + + } + + } + + @Test + public void test_checkHost(){ + try { + MsbUtil.checkHost("127.0.0.1","2565"); + MsbUtil.checkHost("127.0.0.1",""); + } catch (RouteException e) { + Assert.assertTrue(e instanceof RouteException); + Assert.assertEquals("DATA_FORMAT_ERROR",e.getErrorCode()); + Assert.assertNotEquals("ERROR",e.getErrorMsg()); + + e.setErrorCode("DATA_FORMAT_ERROR_TEST"); + e.setErrorMsg("ERROR"); + Assert.assertNotEquals("DATA_FORMAT_ERROR",e.getErrorCode()); + Assert.assertEquals("ERROR",e.getErrorMsg()); + + } + } + + @Test + public void test_checkIp(){ + try { + MsbUtil.checkHost("","2565"); + } catch (RouteException e) { + Assert.assertTrue(e instanceof RouteException); + + + } + } +} diff --git a/src/test/java/org/onap/msb/sdk/httpclient/ServiceHttpEndPointObjectTest.java b/src/test/java/org/onap/msb/sdk/httpclient/ServiceHttpEndPointObjectTest.java index 9ee875d..c1d5242 100644 --- a/src/test/java/org/onap/msb/sdk/httpclient/ServiceHttpEndPointObjectTest.java +++ b/src/test/java/org/onap/msb/sdk/httpclient/ServiceHttpEndPointObjectTest.java @@ -13,6 +13,9 @@ */ package org.onap.msb.sdk.httpclient; +import java.util.HashSet; +import java.util.Set; + import org.junit.Assert; import org.junit.Test; import org.onap.msb.sdk.discovery.entity.MicroServiceFullInfo; @@ -30,12 +33,27 @@ public class ServiceHttpEndPointObjectTest { cloneFullInfo.setServiceName("aai"); cloneFullInfo.setVersion("v8"); cloneFullInfo.setVisualRange("1"); + + Set<NodeInfo> nodes=new HashSet<NodeInfo>(); + nodes.add(nodeInfo); + cloneFullInfo.setNodes(nodes); ServiceHttpEndPointObject endPointOjb = new ServiceHttpEndPointObject("aai", "v8", nodeInfo, cloneFullInfo); Assert.assertEquals(endPointOjb.getIp(), "127.0.0.1"); Assert.assertEquals(endPointOjb.getPort(), "80"); Assert.assertEquals(endPointOjb.getServiceName(), "aai"); Assert.assertEquals(endPointOjb.getServiceVersion(), "v8"); + + System.out.println(endPointOjb.hashCode()); + ServiceHttpEndPointObject endPointOjb2 = new ServiceHttpEndPointObject("aai", "v8", nodeInfo, cloneFullInfo); + Assert.assertTrue(endPointOjb2.equals(endPointOjb)); + + endPointOjb.setProtocl("HTTP"); + endPointOjb.setNameSpace("ns"); + System.out.println(endPointOjb.toString()); + Assert.assertEquals("HTTP", endPointOjb.getProtocl()); + Assert.assertEquals("ns", endPointOjb.getNameSpace()); + } } |