add httpsutil and modify query from aai

[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 4b697b0..13064c5 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
@@ -135,9 +135,7 @@ public class MicroServiceConfigTest {
                 .andReturn("{}");\r
 \r
         PowerMock.replayAll();\r
-\r
         assertThat(getServiceAddrInfoFromCBS(HOSTNAME), is(nullValue()));\r
-\r
         PowerMock.verifyAll();\r
     }\r
 \r
@@ -170,11 +168,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMsbAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
         assertThat(msbInfo[1], equalTo("5432"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
@@ -189,11 +187,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getMsbAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("1545"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
@@ -208,11 +206,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getServiceAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
         assertThat(msbInfo[1], equalTo("5432"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(HOSTNAME);\r
     }\r
 \r
@@ -227,11 +225,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getServiceAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("1545"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(HOSTNAME);\r
     }\r
 \r
@@ -246,11 +244,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getServiceAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("1545"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
@@ -265,11 +263,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getServiceAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("80"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
@@ -284,11 +282,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getServiceAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("80"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 \r
@@ -303,11 +301,11 @@ public class MicroServiceConfigTest {
 \r
         PowerMock.replayAll();\r
         String[] msbInfo = getServiceAddrInfo();\r
+        PowerMock.verifyAll();\r
+\r
         assertThat(msbInfo[0], equalTo("10.74.5.8"));\r
         assertThat(msbInfo[1], equalTo("5432"));\r
 \r
-        PowerMock.verifyAll();\r
-\r
         System.clearProperty(MSB_ADDR);\r
     }\r
 }
\ No newline at end of file