X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Fconfig%2FMicroServiceConfigTest.java;h=13064c5be6adffaf0f7aa8a87686c75308bea6a2;hb=4eaf0290dd2572f40526da9cfd09a1ccee4da76d;hp=4b697b0cc3986b3a6df689236990d1ac5110e3fe;hpb=680b0cc11beb6a8dd6daeda860ddad74cd709d43;p=holmes%2Fcommon.git

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