summaryrefslogtreecommitdiffstats
path: root/holmes-actions/src/test/java
diff options
context:
space:
mode:
authorGuangrongFu <fu.guangrong@zte.com.cn>2021-06-10 11:40:40 +0800
committerGuangrongFu <fu.guangrong@zte.com.cn>2021-06-10 15:13:48 +0800
commit6f99775bd30cea7a2471ba37b875067a40bd5aeb (patch)
treee67685ff4eb7da225491a7c73f1df134bd96616b /holmes-actions/src/test/java
parentc08c42c56caaa197f950f6479944bf95593063bc (diff)
Refactored AaiQuery4Ccvpn and related classes
Change-Id: Ie2971a4f03a0b8e1897e66430b2e0880abd2abcb Issue-ID: HOLMES-442 Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'holmes-actions/src/test/java')
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java250
-rw-r--r--holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java97
2 files changed, 91 insertions, 256 deletions
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
index f1855f9..55e7b6b 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
@@ -1,5 +1,5 @@
/**
- * Copyright 2018-2020 ZTE Corporation.
+ * Copyright 2018-2021 ZTE Corporation.
* <p>
* 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
@@ -17,34 +17,30 @@ package org.onap.holmes.common.aai;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import org.easymock.EasyMock;
-import org.glassfish.jersey.client.HttpUrlConnectorProvider;
import org.junit.*;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.onap.holmes.common.aai.config.AaiConfig;
import org.onap.holmes.common.exception.CorrelationException;
+import org.onap.holmes.common.utils.JerseyClient;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.reflect.Whitebox;
-import javax.ws.rs.client.*;
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
import java.io.*;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.HashMap;
+import java.util.Map;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.onap.holmes.common.config.MicroServiceConfig.MSB_ADDR;
@RunWith(PowerMockRunner.class)
-@PrepareForTest({ClientBuilder.class, Client.class, Builder.class, WebTarget.class, Response.class})
+@PrepareForTest(JerseyClient.class)
public class AaiQuery4CcvpnTest {
@Rule
@@ -54,11 +50,9 @@ public class AaiQuery4CcvpnTest {
private static AaiQuery4Ccvpn aai = AaiQuery4Ccvpn.newInstance();
- private static MultivaluedMap<String, Object> headers = new MultivaluedHashMap<>();
- private static Client client;
- private static WebTarget webTarget;
- private static Builder builder;
- private static Response response;
+ private static Map<String, Object> headers = new HashMap<>();
+
+ private static JerseyClient client;
@BeforeClass
static public void beforeClass() {
@@ -85,21 +79,19 @@ public class AaiQuery4CcvpnTest {
}
}
- headers.add("X-TransactionId", AaiConfig.X_TRANSACTION_ID);
- headers.add("X-FromAppId", AaiConfig.X_FROMAPP_ID);
- headers.add("Authorization", AaiConfig.getAuthenticationCredentials());
- headers.add("Accept", "application/json");
- headers.add("Content-Type", "application/json");
+ headers.put("X-TransactionId", AaiConfig.X_TRANSACTION_ID);
+ headers.put("X-FromAppId", AaiConfig.X_FROMAPP_ID);
+ headers.put("Authorization", AaiConfig.getAuthenticationCredentials());
+ headers.put("Accept", "application/json");
+ headers.put("Content-Type", "application/json");
Whitebox.setInternalState(aai, "headers", headers);
}
@Before
public void before() {
- PowerMock.mockStatic(ClientBuilder.class);
- client = PowerMock.createMock(Client.class);
- webTarget = PowerMock.createMock(WebTarget.class);
- builder = PowerMock.createMock(Builder.class);
- response = PowerMock.createMock(Response.class);
+ PowerMock.mockStatic(JerseyClient.class);
+ client = PowerMock.createMock(JerseyClient.class);
+ EasyMock.expect(JerseyClient.newInstance()).andReturn(client).anyTimes();
}
@After
@@ -108,25 +100,15 @@ public class AaiQuery4CcvpnTest {
}
@Test
- public void test_getPath() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ public void test_getPath() throws Exception {
String path = "/aai/v14/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-instance-id={servId}";
-
- Method method = AaiQuery4Ccvpn.class.getDeclaredMethod("getPath", String.class);
- method.setAccessible(true);
-
- String ret = (String) method.invoke(aai, path);
-
+ String ret = Whitebox.invokeMethod(aai, "getPath", path);
assertThat(ret, equalTo("/api/aai-business/v14/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances?service-instance-id={servId}"));
-
}
@Test
- public void test_getLogicLink_exception() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
- EasyMock.expect(response.readEntity(String.class)).andReturn("Error!");
-
- thrown.expect(CorrelationException.class);
+ public void test_getLogicLink() {
+ mockGetMethod(data.get("logic-link").toString());
PowerMock.replayAll();
@@ -138,77 +120,13 @@ public class AaiQuery4CcvpnTest {
}
- @Test
- public void test_getLogicLink() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("logic-link").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- PowerMock.replayAll();
-
- String linkId = aai.getLogicLink("network-1", "pnf-1", "interface-1", "DOWN");
-
- PowerMock.verifyAll();
-
- assertThat(linkId, equalTo("logic-link-1"));
-
- }
-
- @Test
- public void test_getServiceInstances_exception() {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("vpn-binding").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("connectivity").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class))
- .andReturn(data.get("service-instance-by-connectivity").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class))
- .andReturn(data.get("service-instances-by-service-type").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("service-instance").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(RuntimeException.class);
-
- PowerMock.replayAll();
-
- JsonObject instance = aai.getServiceInstance("network-1", "pnf-1", "interface-1", "DOWN");
-
- PowerMock.verifyAll();
-
- assertThat(instance, equalTo("logic-link-1"));
-
- }
@Test
public void test_getServiceInstance() {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("vpn-binding").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.get("connectivity").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class))
- .andReturn(data.get("service-instance-by-connectivity").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class))
- .andReturn(data.get("service-instances-by-service-type").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+ mockGetMethod(data.get("vpn-binding").toString());
+ mockGetMethod(data.get("connectivity").toString());
+ mockGetMethod(data.get("service-instance-by-connectivity").toString());
+ mockGetMethod(data.get("service-instances-by-service-type").toString());
PowerMock.replayAll();
@@ -222,50 +140,9 @@ public class AaiQuery4CcvpnTest {
}
@Test
- public void test_getServiceInstance_1() throws Exception {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class))
- .andReturn(data.get("service-instances-by-service-type").toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- PowerMock.replayAll();
-
- JsonObject instance = Whitebox.invokeMethod(aai, "getServiceInstance",
- "custom-1", "service-type-1");
-
- PowerMock.verifyAll();
-
- assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 1"));
- }
-
- @Test
- public void test_getServiceInstance_1_exception() throws Exception {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to get the service instance by type.");
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
-
- thrown.expect(CorrelationException.class);
-
- PowerMock.replayAll();
-
- JsonObject instance = Whitebox.invokeMethod(aai, "getServiceInstance",
- "custom-1", "service-type-1");
-
- PowerMock.verifyAll();
-
- assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 1"));
- assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 2"));
- assertThat(instance.get("service-instance-id").getAsString(), equalTo("some id 3"));
- }
-
- @Test
public void test_updateTerminalPointStatus() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+ mockGetMethod(data.toString());
+ mockPutMethod("ok");
PowerMock.replayAll();
@@ -274,79 +151,28 @@ public class AaiQuery4CcvpnTest {
PowerMock.verifyAll();
}
- @Test
- public void test_updateTerminalPointStatus_exception() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
- EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to update the TP information.");
-
- thrown.expect(CorrelationException.class);
-
- PowerMock.replayAll();
-
- aai.updateTerminalPointStatus("network-1", "pnf-1", "if-1", new HashMap<>());
-
- PowerMock.verifyAll();
- }
-
- @Test
- public void test_updateLogicLinkStatus() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- PowerMock.replayAll();
-
- aai.updateLogicLinkStatus("link-1", new HashMap<>());
-
- PowerMock.verifyAll();
- }
@Test
- public void test_updateLogicLinkStatus_exception() throws CorrelationException {
- mockGetMethod();
- EasyMock.expect(response.readEntity(String.class)).andReturn(data.toString());
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
-
- mockPatchMethod();
- EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
- EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to update the logic link information.");
-
- thrown.expect(CorrelationException.class);
+ public void test_updateLogicLinkStatus() {
+ mockGetMethod(data.toString());
+ mockPutMethod("ok");
PowerMock.replayAll();
aai.updateLogicLinkStatus("link-1", new HashMap<>());
PowerMock.verifyAll();
-
- }
-
- private void mockGetMethod() {
- initCommonMock();
- EasyMock.expect(builder.get()).andReturn(response);
}
- private void mockPatchMethod() {
- initCommonMock();
- Invocation invocation = PowerMock.createMock(Invocation.class);
- EasyMock.expect(builder.build(EasyMock.anyObject(String.class), EasyMock.anyObject(Entity.class))).andReturn(invocation);
- EasyMock.expect(invocation.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true)).andReturn(invocation);
- EasyMock.expect(invocation.invoke()).andReturn(response);
+ private void mockGetMethod(String ret) {
+ EasyMock.expect(client.path(anyString())).andReturn(client);
+ EasyMock.expect(client.headers(anyObject())).andReturn(client);
+ EasyMock.expect(client.get(anyString())).andReturn(ret);
}
- private void initCommonMock() {
- EasyMock.expect(ClientBuilder.newClient()).andReturn(client);
- EasyMock.expect(client.target(EasyMock.anyObject(String.class))).andReturn(webTarget);
- EasyMock.expect(webTarget.path(EasyMock.anyObject(String.class))).andReturn(webTarget);
- EasyMock.expect(webTarget.request()).andReturn(builder);
- EasyMock.expect(builder.headers(headers)).andReturn(builder);
+ private void mockPutMethod(String ok) {
+ EasyMock.expect(client.path(anyString())).andReturn(client);
+ EasyMock.expect(client.headers(anyObject())).andReturn(client);
+ EasyMock.expect(client.put(anyString(), anyObject())).andReturn(ok);
}
} \ No newline at end of file
diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
index 1fdc335..dd0c71a 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/config/MicroServiceConfigTest.java
@@ -1,5 +1,5 @@
/**
- * Copyright 2017-2020 ZTE Corporation.
+ * Copyright 2017-2021 ZTE Corporation.
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,28 +18,35 @@ package org.onap.holmes.common.config;
import org.apache.commons.lang3.StringUtils;
import org.easymock.EasyMock;
+import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.onap.holmes.common.utils.JerseyClient;
import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import org.powermock.modules.junit4.PowerMockRunner;
-import org.powermock.reflect.internal.WhiteboxImpl;
+import static org.easymock.EasyMock.anyString;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
import static org.hamcrest.core.IsNull.nullValue;
import static org.junit.Assert.assertThat;
import static org.onap.holmes.common.config.MicroServiceConfig.*;
-@PrepareForTest(MicroServiceConfig.class)
-@PowerMockIgnore({"javax.ws.*"})
@RunWith(PowerMockRunner.class)
+@PrepareForTest({JerseyClient.class, MicroServiceConfig.class})
+@SuppressStaticInitializationFor("org.onap.holmes.common.utils.JerseyClient")
public class MicroServiceConfigTest {
private static String ACTUAL_HOSTNAME = System.getenv(HOSTNAME);
+ @Before
+ public void before() {
+ PowerMock.mockStatic(JerseyClient.class);
+ }
+
@Test
public void getMsbServerAddrTest() {
System.setProperty(MSB_IAG_SERVICE_HOST, "test");
@@ -67,14 +74,22 @@ public class MicroServiceConfigTest {
@Test
public void getServiceIpTest() {
+ mockGet(null);
+
String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
String hostname = String.format("http://%s", ip);
System.setProperty(HOSTNAME, hostname);
- assertThat(ip, equalTo(getMicroServiceIpAndPort()[0]));
- assertThat("80", equalTo(getMicroServiceIpAndPort()[1]));
+
+ PowerMock.replayAll();
+ String ret[] = getMicroServiceIpAndPort();
+ PowerMock.verifyAll();
+
+ assertThat(ip, equalTo(ret[0]));
+ assertThat("80", equalTo(ret[1]));
System.clearProperty(HOSTNAME);
}
+
@Test
public void getConsulAddrInfoTest() {
System.setProperty(CONSUL_HOST, "127.0.0.1");
@@ -85,9 +100,8 @@ public class MicroServiceConfigTest {
@Test
public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception {
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andThrow(new RuntimeException("Invalid URL."));
+
+ mockGet(null);
PowerMock.replayAll();
@@ -101,9 +115,7 @@ public class MicroServiceConfigTest {
@Test
public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception {
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");
+ mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");
System.setProperty(CONSUL_HOST, "127.0.0.1");
PowerMock.replayAll();
@@ -120,11 +132,10 @@ public class MicroServiceConfigTest {
@Test
public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[]");
System.setProperty(CONSUL_HOST, "127.0.0.1");
+ mockGet("[]");
+
PowerMock.replayAll();
assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),
@@ -139,11 +150,10 @@ public class MicroServiceConfigTest {
@Test
public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {
System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[{\"ServiceAddress\": \"127.0.0.2\"}]");
System.setProperty(CONSUL_HOST, "127.0.0.1");
+ mockGet("[{\"ServiceAddress\": \"127.0.0.2\"}]");
+
PowerMock.replayAll();
assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),
@@ -156,10 +166,9 @@ public class MicroServiceConfigTest {
}
@Test
- public void getServiceAddrInfoFromCBS_consul_not_exist() throws Exception {
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andThrow(new RuntimeException("Invalid URL.")).times(2);
+ public void getServiceAddrInfoFromCBS_consul_not_exist() {
+ mockGet(null);
+ mockGet(null);
PowerMock.replayAll();
@@ -170,12 +179,12 @@ public class MicroServiceConfigTest {
@Test
public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception {
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[]");
+ mockGet("[]");
PowerMock.replayAll();
+
assertThat(getServiceAddrInfoFromDcaeConsulByHostName(HOSTNAME), is(nullValue()));
+
PowerMock.verifyAll();
}
@@ -224,9 +233,8 @@ public class MicroServiceConfigTest {
@Test
public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception {
System.setProperty(HOSTNAME, "rule-mgmt");
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");
+
+ mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");
PowerMock.replayAll();
String[] msbInfo = getMicroServiceIpAndPort();
@@ -244,9 +252,8 @@ public class MicroServiceConfigTest {
String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";
String hostname = String.format("http://%s:%s", ip, port);
System.setProperty(HOSTNAME, hostname);
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[]");
+
+ mockGet("[]");
PowerMock.replayAll();
String[] msbInfo = getMicroServiceIpAndPort();
@@ -264,9 +271,8 @@ public class MicroServiceConfigTest {
String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";
String hostname = String.format("http://%s:%s", ip, port);
System.setProperty(HOSTNAME, hostname);
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("{}");
+
+ mockGet("{}");
PowerMock.replayAll();
String[] msbInfo = getMicroServiceIpAndPort();
@@ -283,9 +289,8 @@ public class MicroServiceConfigTest {
String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
String hostname = String.format("http://%s", ip);
System.setProperty(HOSTNAME, hostname);
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("{}");
+
+ mockGet("{}");
PowerMock.replayAll();
String[] msbInfo = getMicroServiceIpAndPort();
@@ -302,9 +307,8 @@ public class MicroServiceConfigTest {
String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;
String hostname = String.format("http://%s", ip);
System.setProperty(HOSTNAME, hostname);
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("{}");
+
+ mockGet("{}");
PowerMock.replayAll();
String[] msbInfo = getMicroServiceIpAndPort();
@@ -322,9 +326,8 @@ public class MicroServiceConfigTest {
String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";
String hostname = String.format("http://%s:%s", ip, port);
System.setProperty(HOSTNAME, hostname);
- PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);
- PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())
- .andReturn("[]");
+
+ mockGet("[]");
PowerMock.replayAll();
String[] msbInfo = getMicroServiceIpAndPort();
@@ -335,4 +338,10 @@ public class MicroServiceConfigTest {
System.clearProperty(HOSTNAME);
}
+
+ private void mockGet(String ret) {
+ JerseyClient client = PowerMock.createMock(JerseyClient.class);
+ EasyMock.expect(JerseyClient.newInstance()).andReturn(client);
+ EasyMock.expect(client.get(anyString())).andReturn(ret);
+ }
} \ No newline at end of file