Code Review / holmes / common.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Modify the Service Addr Query Logic
[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 23dd075..59af9d3 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
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
 import static org.onap.holmes.common.config.MicroServiceConfig.*;\r
 \r
 import org.easymock.EasyMock;\r
+import org.junit.Ignore;\r
 import org.junit.Rule;\r
 import org.junit.Test;\r
 import org.powermock.api.easymock.PowerMock;\r
@@ -41,14 +42,7 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getMsbServerAddrTest() {\r
         System.setProperty(MSB_ADDR, "test:80");\r
-        System.setProperty(HOSTNAME, "rule-mgmt");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceAddrInfoFromCBS", String.class);\r
-        EasyMock.expect(MicroServiceConfig.getServiceAddrInfoFromCBS(System.getProperty(HOSTNAME)))\r
-                .andReturn("{\"msb.hostname\": \"test:80\"}");\r
-        PowerMock.replayAll();\r
-        assertThat("http://test:80", equalTo(getMsbServerAddr()));\r
-        PowerMock.verifyAll();\r
-        System.clearProperty(MicroServiceConfig.HOSTNAME);\r
+        assertThat("http://test:80", equalTo(getMsbServerAddrWithHttpPrefix()));\r
         System.clearProperty(MicroServiceConfig.MSB_ADDR);\r
     }\r
 \r
@@ -56,12 +50,12 @@ public class MicroServiceConfigTest {
     public void getMsbServerIpTest() {\r
         System.setProperty(MSB_ADDR, "10.54.23.79:80");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceAddrInfoFromCBS", String.class);\r
-        EasyMock.expect(MicroServiceConfig.getServiceAddrInfoFromCBS(System.getProperty(HOSTNAME)))\r
+        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceConfigInfoFromCBS", String.class);\r
+        EasyMock.expect(MicroServiceConfig.getServiceConfigInfoFromCBS(System.getProperty(HOSTNAME)))\r
                 .andReturn("{\"msb.hostname\": \"10.54.23.79:80\"}").times(2);\r
         PowerMock.replayAll();\r
-        assertThat("10.54.23.79", equalTo(getMsbAddrInfo()[0]));\r
-        assertThat("80", equalTo(getMsbAddrInfo()[1]));\r
+        assertThat("10.54.23.79", equalTo(getMsbIpAndPort()[0]));\r
+        assertThat("80", equalTo(getMsbIpAndPort()[1]));\r
         System.clearProperty(MicroServiceConfig.HOSTNAME);\r
         System.clearProperty(MSB_ADDR);\r
     }\r
@@ -69,33 +63,37 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getServiceIpTest() {\r
         System.setProperty(HOSTNAME, "127.0.0.1");\r
-        assertThat("127.0.0.1", equalTo(getServiceAddrInfo()[0]));\r
-        assertThat("80", equalTo(getServiceAddrInfo()[1]));\r
+        assertThat("127.0.0.1", equalTo(getMicroServiceIpAndPort()[0]));\r
+        assertThat("80", equalTo(getMicroServiceIpAndPort()[1]));\r
         System.clearProperty(HOSTNAME);\r
     }\r
 \r
     @Test\r
     public void getConsulAddrInfoTest() {\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
-        assertThat("127.0.0.1:8500/v1/catalog/service/", equalTo(getConsulAddrInfo()));\r
+        assertThat("http://127.0.0.1:8500/v1/catalog/service/", equalTo(getConsulAddrInfo()));\r
         System.clearProperty(CONSUL_HOST);\r
     }\r
 \r
     @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
         PowerMock.replayAll();\r
 \r
-        assertThat(getConfigBindingServiceAddrInfo(), is(nullValue()));\r
+        assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE))\r
+                , is(nullValue()));\r
 \r
         PowerMock.verifyAll();\r
+        System.clearProperty(CONFIG_BINDING_SERVICE);\r
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_exists() throws Exception {\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
@@ -103,15 +101,18 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
 \r
-        assertThat(getConfigBindingServiceAddrInfo(), equalTo("127.0.0.2:8080"));\r
+        assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
+                equalTo("http://127.0.0.2:8080"));\r
 \r
         PowerMock.verifyAll();\r
 \r
         System.clearProperty(CONSUL_HOST);\r
+        System.clearProperty(CONFIG_BINDING_SERVICE);\r
     }\r
 \r
     @Test\r
     public void getConfigBindingServiceAddrInfoTest_consul_exists_propertie_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
@@ -119,11 +120,13 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
 \r
-        assertThat(getConfigBindingServiceAddrInfo(), is(nullValue()));\r
+        assertThat(getServiceAddrInfoFromDcaeConsulByHostName(System.getProperty(CONFIG_BINDING_SERVICE)),\r
+                is(nullValue()));\r
 \r
         PowerMock.verifyAll();\r
 \r
         System.clearProperty(CONSUL_HOST);\r
+        System.clearProperty(CONFIG_BINDING_SERVICE);\r
     }\r
 \r
     @Test\r
@@ -134,52 +137,32 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
 \r
-        assertThat(getServiceAddrInfoFromCBS(HOSTNAME), is(nullValue()));\r
+        assertThat(getServiceConfigInfoFromCBS(HOSTNAME), is(nullValue()));\r
 \r
         PowerMock.verifyAll();\r
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfoFromCBS_consul_exists_service_not_exist() throws Exception {\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("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{}");\r
+                .andReturn("[]");\r
 \r
         PowerMock.replayAll();\r
-        assertThat(getServiceAddrInfoFromCBS(HOSTNAME), is(nullValue()));\r
-        PowerMock.verifyAll();\r
-    }\r
-\r
-    @Test\r
-    public void getServiceAddrInfoFromCBS_normal() 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.2\", \"ServicePort\": \"8080\"}]");\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{\"rule-mgmt\": \"[\\\"127.0.0.3:5432\\\"]\"}");\r
-\r
-        PowerMock.replayAll();\r
-\r
-        assertThat(getServiceAddrInfoFromCBS("rule-mgmt"), equalTo("127.0.0.3:5432"));\r
-\r
+        assertThat(getServiceAddrInfoFromDcaeConsulByHostName(HOSTNAME), is(nullValue()));\r
         PowerMock.verifyAll();\r
-\r
-        System.clearProperty(HOSTNAME);\r
     }\r
 \r
-    @Test\r
+    @Ignore\r
     public void getMsbAddrInfo_msb_registered() throws Exception {\r
         System.setProperty(MSB_ADDR, "10.74.5.8:1545");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceAddrInfoFromCBS", String.class);\r
-        EasyMock.expect(MicroServiceConfig.getServiceAddrInfoFromCBS(System.getProperty(HOSTNAME)))\r
+        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceConfigInfoFromCBS", String.class);\r
+        EasyMock.expect(MicroServiceConfig.getServiceConfigInfoFromCBS(System.getProperty(HOSTNAME)))\r
                 .andReturn("{\"msb.hostname\": \"127.0.0.3:5432\"}");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getMsbAddrInfo();\r
+        String[] msbInfo = getMsbIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
@@ -189,16 +172,16 @@ public class MicroServiceConfigTest {
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
-    @Test\r
+    @Ignore\r
     public void getMsbAddrInfo_msb_not_registered() throws Exception {\r
         System.setProperty(MSB_ADDR, "10.74.5.8:1545");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
-        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceAddrInfoFromCBS", String.class);\r
-        EasyMock.expect(MicroServiceConfig.getServiceAddrInfoFromCBS(System.getProperty(HOSTNAME)))\r
+        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceConfigInfoFromCBS", String.class);\r
+        EasyMock.expect(MicroServiceConfig.getServiceConfigInfoFromCBS(System.getProperty(HOSTNAME)))\r
                 .andReturn("{}");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getMsbAddrInfo();\r
+        String[] msbInfo = getMsbIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
@@ -209,16 +192,14 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfo_msb_registered() throws Exception {\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.2\", \"ServicePort\": \"8080\"}]");\r
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{\"rule-mgmt\": \"[\\\"127.0.0.3:5432\\\"]\"}");\r
+                .andReturn("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getServiceAddrInfo();\r
+        String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
@@ -228,16 +209,14 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfo_msb_not_registered() throws Exception {\r
+    public void getMicroServiceIpAndPort_service_not_registered_to_consul() throws Exception {\r
         System.setProperty(HOSTNAME, "10.74.5.8:1545");\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
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{}");\r
+                .andReturn("[]");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getServiceAddrInfo();\r
+        String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
@@ -247,16 +226,14 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfo_msb_not_registered_full_addr() throws Exception {\r
+    public void getMicroServiceIpAndPort_service_not_registered_full_addr() throws Exception {\r
         System.setProperty(HOSTNAME, "http://10.74.5.8:1545");\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
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
                 .andReturn("{}");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getServiceAddrInfo();\r
+        String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
@@ -266,16 +243,14 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfo_msb_not_registered_no_port() throws Exception {\r
+    public void getMicroServiceIpAndPort_service_not_registered_no_port() throws Exception {\r
         System.setProperty(HOSTNAME, "http://10.74.5.8");\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
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
                 .andReturn("{}");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getServiceAddrInfo();\r
+        String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
@@ -285,16 +260,14 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfo_msb_not_registered_only_ip() throws Exception {\r
+    public void getMicroServiceIpAndPort_service_not_registered_only_ip() throws Exception {\r
         System.setProperty(HOSTNAME, "10.74.5.8");\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
         PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
                 .andReturn("{}");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getServiceAddrInfo();\r
+        String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
@@ -304,16 +277,14 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfo_msb_not_registered_full_addr_https() throws Exception {\r
+    public void getMicroServiceIpAndPort_service_not_registered_full_addr_https() throws Exception {\r
         System.setProperty(HOSTNAME, "https://10.74.5.8:5432");\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
-        PowerMock.expectPrivate(MicroServiceConfig.class, "execQuery", EasyMock.anyObject())\r
-                .andReturn("{}");\r
+                .andReturn("[]");\r
 \r
         PowerMock.replayAll();\r
-        String[] msbInfo = getServiceAddrInfo();\r
+        String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
 \r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
It provides some common tools in support of other modules of Holmes.