Code Review / holmes / common.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Refactored AaiQuery4Ccvpn and related classes
[holmes/common.git] / holmes-actions / src / test / java / org / onap / holmes / common / config / MicroServiceConfigTest.java
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 (file)
--- 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 @@
 /**\r
- * Copyright 2017-2020 ZTE Corporation.\r
+ * Copyright 2017-2021 ZTE Corporation.\r
  * <p>\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -18,28 +18,35 @@ package org.onap.holmes.common.config;
 \r
 import org.apache.commons.lang3.StringUtils;\r
 import org.easymock.EasyMock;\r
+import org.junit.Before;\r
 import org.junit.Ignore;\r
 import org.junit.Test;\r
 import org.junit.runner.RunWith;\r
+import org.onap.holmes.common.utils.JerseyClient;\r
 import org.powermock.api.easymock.PowerMock;\r
-import org.powermock.core.classloader.annotations.PowerMockIgnore;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
+import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r
-import org.powermock.reflect.internal.WhiteboxImpl;\r
 \r
+import static org.easymock.EasyMock.anyString;\r
 import static org.hamcrest.core.Is.is;\r
 import static org.hamcrest.core.IsEqual.equalTo;\r
 import static org.hamcrest.core.IsNull.nullValue;\r
 import static org.junit.Assert.assertThat;\r
 import static org.onap.holmes.common.config.MicroServiceConfig.*;\r
 \r
-@PrepareForTest(MicroServiceConfig.class)\r
-@PowerMockIgnore({"javax.ws.*"})\r
 @RunWith(PowerMockRunner.class)\r
+@PrepareForTest({JerseyClient.class, MicroServiceConfig.class})\r
+@SuppressStaticInitializationFor("org.onap.holmes.common.utils.JerseyClient")\r
 public class MicroServiceConfigTest {\r
 \r
     private static String ACTUAL_HOSTNAME = System.getenv(HOSTNAME);\r
 \r
+    @Before\r
+    public void before() {\r
+        PowerMock.mockStatic(JerseyClient.class);\r
+    }\r
+\r
     @Test\r
     public void getMsbServerAddrTest() {\r
         System.setProperty(MSB_IAG_SERVICE_HOST, "test");\r
@@ -67,14 +74,22 @@ public class MicroServiceConfigTest {
 \r
     @Test\r
     public void getServiceIpTest() {\r
+        mockGet(null);\r
+\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String hostname = String.format("http://%s", ip);\r
         System.setProperty(HOSTNAME, hostname);\r
-        assertThat(ip, equalTo(getMicroServiceIpAndPort()[0]));\r
-        assertThat("80", equalTo(getMicroServiceIpAndPort()[1]));\r
+\r
+        PowerMock.replayAll();\r
+        String ret[] = getMicroServiceIpAndPort();\r
+        PowerMock.verifyAll();\r
+\r
+        assertThat(ip, equalTo(ret[0]));\r
+        assertThat("80", equalTo(ret[1]));\r
         System.clearProperty(HOSTNAME);\r
     }\r
 \r
+\r
     @Test\r
     public void getConsulAddrInfoTest() {\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
@@ -85,9 +100,8 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andThrow(new RuntimeException("Invalid URL."));\r
+\r
+        mockGet(null);\r
 \r
         PowerMock.replayAll();\r
 \r
@@ -101,9 +115,7 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
+        mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
         PowerMock.replayAll();\r
@@ -120,11 +132,10 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[]");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
+        mockGet("[]");\r
+\r
         PowerMock.replayAll();\r
 \r
         assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
@@ -139,11 +150,10 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[{\"ServiceAddress\": \"127.0.0.2\"}]");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
+        mockGet("[{\"ServiceAddress\": \"127.0.0.2\"}]");\r
+\r
         PowerMock.replayAll();\r
 \r
         assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
@@ -156,10 +166,9 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfoFromCBS_consul_not_exist() throws Exception {\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andThrow(new RuntimeException("Invalid URL.")).times(2);\r
+    public void getServiceAddrInfoFromCBS_consul_not_exist() {\r
+        mockGet(null);\r
+        mockGet(null);\r
 \r
         PowerMock.replayAll();\r
 \r
@@ -170,12 +179,12 @@ public class MicroServiceConfigTest {
 \r
     @Test\r
     public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception {\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[]");\r
+        mockGet("[]");\r
 \r
         PowerMock.replayAll();\r
+\r
         assertThat(getServiceAddrInfoFromDcaeConsulByHostName(HOSTNAME), is(nullValue()));\r
+\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -224,9 +233,8 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception {\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
+\r
+        mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
@@ -244,9 +252,8 @@ public class MicroServiceConfigTest {
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[]");\r
+\r
+        mockGet("[]");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
@@ -264,9 +271,8 @@ public class MicroServiceConfigTest {
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{}");\r
+\r
+        mockGet("{}");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
@@ -283,9 +289,8 @@ public class MicroServiceConfigTest {
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String hostname = String.format("http://%s", ip);\r
         System.setProperty(HOSTNAME, hostname);\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{}");\r
+\r
+        mockGet("{}");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
@@ -302,9 +307,8 @@ public class MicroServiceConfigTest {
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String hostname = String.format("http://%s", ip);\r
         System.setProperty(HOSTNAME, hostname);\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{}");\r
+\r
+        mockGet("{}");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
@@ -322,9 +326,8 @@ public class MicroServiceConfigTest {
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "execQuery", String.class);\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("[]");\r
+\r
+        mockGet("[]");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
@@ -335,4 +338,10 @@ public class MicroServiceConfigTest {
 \r
         System.clearProperty(HOSTNAME);\r
     }\r
+\r
+    private void mockGet(String ret) {\r
+        JerseyClient client = PowerMock.createMock(JerseyClient.class);\r
+        EasyMock.expect(JerseyClient.newInstance()).andReturn(client);\r
+        EasyMock.expect(client.get(anyString())).andReturn(ret);\r
+    }\r
 }
\ No newline at end of file
It provides some common tools in support of other modules of Holmes.