Fixed some bugs

[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 dd0c71a..3e28464 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
@@ -74,8 +74,6 @@ 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
@@ -98,7 +96,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_not_exist() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_not_exist() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
 \r
         mockGet(null);\r
@@ -113,7 +111,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() throws Exception {\r
+    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         mockGet("[{\"ServiceAddress\": \"127.0.0.2\", \"ServicePort\": \"8080\"}]");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
@@ -130,7 +128,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_return_empty_array() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
@@ -148,7 +146,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() throws Exception {\r
+    public void getConfigBindingServiceAddrInfoTest_consul_exists_property_not_exist() {\r
         System.setProperty(CONFIG_BINDING_SERVICE, "config_binding_service");\r
         System.setProperty(CONSUL_HOST, "127.0.0.1");\r
 \r
@@ -178,7 +176,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() throws Exception {\r
+    public void getServiceAddrInfoFromDcaeConsulByHostName_consul_exists_service_not_exist() {\r
         mockGet("[]");\r
 \r
         PowerMock.replayAll();\r
@@ -189,7 +187,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Ignore\r
-    public void getMsbAddrInfo_msb_registered() throws Exception {\r
+    public void getMsbAddrInfo_msb_registered() {\r
         System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8");\r
         System.setProperty(MSB_IAG_SERVICE_PORT, "1545");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
@@ -210,7 +208,7 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Ignore\r
-    public void getMsbAddrInfo_msb_not_registered() throws Exception {\r
+    public void getMsbAddrInfo_msb_not_registered() {\r
         System.setProperty(MSB_IAG_SERVICE_HOST, "10.74.5.8");\r
         System.setProperty(MSB_IAG_SERVICE_PORT, "1545");\r
         System.setProperty(HOSTNAME, "rule-mgmt");\r
@@ -231,49 +229,12 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getMicroServiceIpAndPort_service_registered_to_consul() throws Exception {\r
-        System.setProperty(HOSTNAME, "rule-mgmt");\r
-\r
-        mockGet("[{\"ServiceAddress\": \"127.0.0.3\", \"ServicePort\": \"5432\"}]");\r
-\r
-        PowerMock.replayAll();\r
-        String[] msbInfo = getMicroServiceIpAndPort();\r
-        PowerMock.verifyAll();\r
-\r
-        assertThat(msbInfo[0], equalTo("127.0.0.3"));\r
-        assertThat(msbInfo[1], equalTo("5432"));\r
-\r
-        System.clearProperty(HOSTNAME);\r
-    }\r
-\r
-    @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_to_consul() throws Exception {\r
-        String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
-        String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
-        String hostname = String.format("http://%s:%s", ip, port);\r
-        System.setProperty(HOSTNAME, hostname);\r
-\r
-        mockGet("[]");\r
-\r
-        PowerMock.replayAll();\r
-        String[] msbInfo = getMicroServiceIpAndPort();\r
-        PowerMock.verifyAll();\r
-\r
-        assertThat(msbInfo[0], equalTo(ip));\r
-        assertThat(msbInfo[1], equalTo(port));\r
-\r
-        System.clearProperty(HOSTNAME);\r
-    }\r
-\r
-    @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_full_addr() throws Exception {\r
+    public void getMicroServiceIpAndPort_full_addr() {\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
 \r
-        mockGet("{}");\r
-\r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
@@ -285,13 +246,11 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_no_port() throws Exception {\r
+    public void getMicroServiceIpAndPort_no_port() {\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
 \r
-        mockGet("{}");\r
-\r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r
@@ -303,32 +262,12 @@ public class MicroServiceConfigTest {
     }\r
 \r
     @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_only_ip() throws Exception {\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
-\r
-        mockGet("{}");\r
-\r
-        PowerMock.replayAll();\r
-        String[] msbInfo = getMicroServiceIpAndPort();\r
-        PowerMock.verifyAll();\r
-\r
-        assertThat(msbInfo[0], equalTo(ip));\r
-        assertThat(msbInfo[1], equalTo("80"));\r
-\r
-        System.clearProperty(HOSTNAME);\r
-    }\r
-\r
-    @Test\r
-    public void getMicroServiceIpAndPort_service_not_registered_full_addr_https() throws Exception {\r
+    public void getMicroServiceIpAndPort_full_addr_https() {\r
         String ip = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "10.74.5.8" : ACTUAL_HOSTNAME;\r
         String port = StringUtils.isEmpty(ACTUAL_HOSTNAME) ? "1545" : "80";\r
         String hostname = String.format("http://%s:%s", ip, port);\r
         System.setProperty(HOSTNAME, hostname);\r
 \r
-        mockGet("[]");\r
-\r
         PowerMock.replayAll();\r
         String[] msbInfo = getMicroServiceIpAndPort();\r
         PowerMock.verifyAll();\r