From c073e7c959231d9873d465e47b1eae1ff5cfc265 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Thu, 2 Dec 2021 19:42:55 +0800 Subject: Fixed some bugs Issue-ID: HOLMES-488 Signed-off-by: Guangrong Fu Change-Id: I7f113a7f4d753c3c3e8d1f780e00c5fce9aab3de --- .../common/config/MicroServiceConfigTest.java | 81 +++------------------- .../onap/holmes/common/utils/JerseyClientTest.java | 30 ++------ 2 files changed, 15 insertions(+), 96 deletions(-) (limited to 'holmes-actions/src/test') 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 dd0c71a..3e28464 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 @@ -74,8 +74,6 @@ 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); @@ -98,7 +96,7 @@ public class MicroServiceConfigTest { } @Test - public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception { + public void getConfigBindingServiceAddrInfoTest_consul_not_exist() { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); mockGet(null); @@ -113,7 +111,7 @@ public class MicroServiceConfigTest { } @Test - public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception { + public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]"); System.setProperty(CONSUL_HOST, "127.0.0.1"); @@ -130,7 +128,7 @@ public class MicroServiceConfigTest { } @Test - public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception { + public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); System.setProperty(CONSUL_HOST, "127.0.0.1"); @@ -148,7 +146,7 @@ public class MicroServiceConfigTest { } @Test - public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception { + public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() { System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service"); System.setProperty(CONSUL_HOST, "127.0.0.1"); @@ -178,7 +176,7 @@ public class MicroServiceConfigTest { } @Test - public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception { + public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() { mockGet("[]"); PowerMock.replayAll(); @@ -189,7 +187,7 @@ public class MicroServiceConfigTest { } @Ignore - public void getMsbAddrInfo_msb_registered() throws Exception { + public void getMsbAddrInfo_msb_registered() { System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8"); System.setProperty(MSB_IAG_SERVICE_PORT, "1545"); System.setProperty(HOSTNAME, "rule-mgmt"); @@ -210,7 +208,7 @@ public class MicroServiceConfigTest { } @Ignore - public void getMsbAddrInfo_msb_not_registered() throws Exception { + public void getMsbAddrInfo_msb_not_registered() { System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8"); System.setProperty(MSB_IAG_SERVICE_PORT, "1545"); System.setProperty(HOSTNAME, "rule-mgmt"); @@ -231,49 +229,12 @@ public class MicroServiceConfigTest { } @Test - public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception { - System.setProperty(HOSTNAME, "rule-mgmt"); - - mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]"); - - PowerMock.replayAll(); - String[] msbInfo = getMicroServiceIpAndPort(); - PowerMock.verifyAll(); - - assertThat(msbInfo[0], equalTo("127.0.0.3")); - assertThat(msbInfo[1], equalTo("5432")); - - System.clearProperty(HOSTNAME); - } - - @Test - public void getMicroServiceIpAndPort_service_not_registered_to_consul() throws Exception { - String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; - String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80"; - String hostname = String.format("http://%s:%s", ip, port); - System.setProperty(HOSTNAME, hostname); - - mockGet("[]"); - - PowerMock.replayAll(); - String[] msbInfo = getMicroServiceIpAndPort(); - PowerMock.verifyAll(); - - assertThat(msbInfo[0], equalTo(ip)); - assertThat(msbInfo[1], equalTo(port)); - - System.clearProperty(HOSTNAME); - } - - @Test - public void getMicroServiceIpAndPort_service_not_registered_full_addr() throws Exception { + public void getMicroServiceIpAndPort_full_addr() { String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80"; String hostname = String.format("http://%s:%s", ip, port); System.setProperty(HOSTNAME, hostname); - mockGet("{}"); - PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); PowerMock.verifyAll(); @@ -285,13 +246,11 @@ public class MicroServiceConfigTest { } @Test - public void getMicroServiceIpAndPort_service_not_registered_no_port() throws Exception { + public void getMicroServiceIpAndPort_no_port() { String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; String hostname = String.format("http://%s", ip); System.setProperty(HOSTNAME, hostname); - mockGet("{}"); - PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); PowerMock.verifyAll(); @@ -303,32 +262,12 @@ public class MicroServiceConfigTest { } @Test - public void getMicroServiceIpAndPort_service_not_registered_only_ip() throws Exception { - String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; - String hostname = String.format("http://%s", ip); - System.setProperty(HOSTNAME, hostname); - - mockGet("{}"); - - PowerMock.replayAll(); - String[] msbInfo = getMicroServiceIpAndPort(); - PowerMock.verifyAll(); - - assertThat(msbInfo[0], equalTo(ip)); - assertThat(msbInfo[1], equalTo("80")); - - System.clearProperty(HOSTNAME); - } - - @Test - public void getMicroServiceIpAndPort_service_not_registered_full_addr_https() throws Exception { + public void getMicroServiceIpAndPort_full_addr_https() { String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME; String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80"; String hostname = String.format("http://%s:%s", ip, port); System.setProperty(HOSTNAME, hostname); - mockGet("[]"); - PowerMock.replayAll(); String[] msbInfo = getMicroServiceIpAndPort(); PowerMock.verifyAll(); diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java index b0b5714..ef4b3db 100644 --- a/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java +++ b/holmes-actions/src/test/java/org/onap/holmes/common/utils/JerseyClientTest.java @@ -37,20 +37,16 @@ import java.util.HashMap; import java.util.Map; import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertThat; @RunWith(PowerMockRunner.class) @PowerMockIgnore({"javax.net.ssl.*", "javax.security.*"}) public class JerseyClientTest { - private final String ERROR_MSG = "Failed to get response from the server. \nURL: http://www.onap.org/holmes/test" + - "\nCause: Not Found\nResponse body: Error"; private JerseyClient jerseyClient = JerseyClient.newInstance(); private String url = "http://www.onap.org/holmes/test"; - @Rule - private ExpectedException exception = ExpectedException.none(); - @Test public void get_normal() { Client mockedClient = PowerMock.createMock(Client.class); @@ -134,18 +130,14 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.get()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(404); EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); - exception.expect(HttpException.class); - exception.expectMessage(ERROR_MSG); - PowerMock.replayAll(); - jerseyClient.get(url); + assertThat(jerseyClient.get(url), nullValue()); PowerMock.verifyAll(); } @@ -182,18 +174,14 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.post(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(404); EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); - exception.expect(HttpException.class); - exception.expectMessage(ERROR_MSG); - PowerMock.replayAll(); - jerseyClient.post(url); + assertThat(jerseyClient.post(url), nullValue()); PowerMock.verifyAll(); } @@ -300,18 +288,14 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.put(null)).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(404); EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); - exception.expect(HttpException.class); - exception.expectMessage(ERROR_MSG); - PowerMock.replayAll(); - jerseyClient.put(url, null, null); + assertThat(jerseyClient.put(url, null, null), nullValue()); PowerMock.verifyAll(); } @@ -394,18 +378,14 @@ public class JerseyClientTest { EasyMock.expect(mockedClient.target(url)).andReturn(mockedTarget); EasyMock.expect(mockedTarget.request()).andReturn(mockedBuilder); EasyMock.expect(mockedBuilder.delete()).andReturn(mockedResponse); - EasyMock.expect(mockedResponse.getStatus()).andReturn(404); EasyMock.expect(mockedResponse.getStatusInfo()).andReturn(Response.Status.NOT_FOUND); EasyMock.expect(mockedResponse.readEntity(String.class)).andReturn("Error"); WhiteboxImpl.setInternalState(jerseyClient, "client", mockedClient); - exception.expect(HttpException.class); - exception.expectMessage(ERROR_MSG); - PowerMock.replayAll(); - jerseyClient.delete(url); + assertThat(jerseyClient.delete(url), nullValue()); PowerMock.verifyAll(); } -- cgit 1.2.3-korg