Update the logic for MSB addr retrieving

[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 13064c5..23dd075 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
@@ -41,15 +41,28 @@ 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
         System.clearProperty(MicroServiceConfig.MSB_ADDR);\r
     }\r
 \r
     @Test\r
     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
+                .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
+        System.clearProperty(MicroServiceConfig.HOSTNAME);\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
@@ -160,11 +173,10 @@ public class MicroServiceConfigTest {
     @Test\r
     public void getMsbAddrInfo_msb_registered() throws Exception {\r
         System.setProperty(MSB_ADDR, "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("{\"" + MSB_ADDR + "\": \"[\\\"127.0.0.3:5432\\\"]\"}");\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\": \"127.0.0.3:5432\"}");\r
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMsbAddrInfo();\r
@@ -173,16 +185,16 @@ public class MicroServiceConfigTest {
         assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
         assertThat(msbInfo[1], equalTo("5432"));\r
 \r
+        System.clearProperty(HOSTNAME);\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
     @Test\r
     public void getMsbAddrInfo_msb_not_registered() throws Exception {\r
         System.setProperty(MSB_ADDR, "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
+        System.setProperty(HOSTNAME, "rule-mgmt");\r
+        PowerMock.mockStaticPartial(MicroServiceConfig.class, "getServiceAddrInfoFromCBS", String.class);\r
+        EasyMock.expect(MicroServiceConfig.getServiceAddrInfoFromCBS(System.getProperty(HOSTNAME)))\r
                 .andReturn("{}");\r
 \r
         PowerMock.replayAll();\r
@@ -192,6 +204,7 @@ public class MicroServiceConfigTest {
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("1545"));\r
 \r
+        System.clearProperty(HOSTNAME);\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r