move HTTP related test utils from ITNeutronE2E to (new) HttpUtils

[neutron.git] / integration / test / src / test / java / org / opendaylight / neutron / e2etest / NeutronLBListenerTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
index 052d67a62eb259d61c8550d1bdce99c634b9bf58..42590203c260e20eaf37ca0a1fcf19d942a06692 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
@@ -8,15 +8,6 @@
 
 package org.opendaylight.neutron.e2etest;
 
-import java.io.OutputStreamWriter;
-
-import java.lang.Thread;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.junit.Assert;
-
 public class NeutronLBListenerTests {
     String base;
 
@@ -26,81 +17,83 @@ public class NeutronLBListenerTests {
 
     public void listener_collection_get_test() {
         String url = base + "/lbaas/listeners";
-        ITNeutronE2E.test_fetch(url, "LB Listener Collection GET failed");
+        HttpUtils.test_fetch(url, "LB Listener Collection GET failed");
     }
 
     //TODO handle SB check
     public String singleton_lb_listener_create_test() {
         String url = base + "/lbaas/listeners";
-        String content = "{ \"listener\": { " +
-            "\"admin_state_up\": true, " +
-            "\"connection_limit\": 100, " +
-            "\"default_pool_id\": null, " +
-            "\"description\": \"listener one\", " +
-            "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\", " +
-            "\"loadbalancers\": [ { " +
-                "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ], " +
-            "\"name\": \"listener1\", " +
-            "\"protocol\": \"HTTP\", " +
-            "\"protocol_port\": 80, " +
-            "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
-        ITNeutronE2E.test_create(url, content, "Singleton LB Listener Post Failed NB");
+        String content = "{ \"listener\": { " + "\"admin_state_up\": true, " + "\"connection_limit\": 100, "
+                + "\"default_pool_id\": null, " + "\"description\": \"listener one\", "
+                + "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\", " + "\"loadbalancers\": [ { "
+                + "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ], " + "\"name\": \"listener1\", "
+                + "\"protocol\": \"HTTP\", " + "\"protocol_port\": 80, "
+                + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
+        HttpUtils.test_create(url, content, "Singleton LB Listener Post Failed NB");
         return content;
     }
 
     public void singleton_lb_listener_get_with_one_query_item_test(String createJsonString) {
         String url = base + "/lbaas/listeners";
-        ITNeutronE2E.test_fetch_with_one_query_item(url, createJsonString, "listeners");
+        HttpUtils.test_fetch_with_one_query_item(url, createJsonString, "listeners");
     }
 
     public void listener_update_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        String content = " { \"listener\": { \"admin_state_up\": false," +
-            "\"connection_limit\": 200," +
-            "\"default_pool_id\": null," +
-            "\"description\": \"listener two\"," +
-            "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\"," +
-            "\"loadbalancers\": [ {" +
-                    "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ]," +
-            "\"name\": \"listener2\"," +
-            "\"protocol\": \"HTTP\"," +
-            "\"protocol_port\": 80," +
-            "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" } }";
-        ITNeutronE2E.test_modify(url, content,"LB Listener Put Failed");
+        String content = " { \"listener\": { \"admin_state_up\": false," + "\"connection_limit\": 200,"
+                + "\"default_pool_id\": null," + "\"description\": \"listener two\","
+                + "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\"," + "\"loadbalancers\": [ {"
+                + "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ]," + "\"name\": \"listener2\","
+                + "\"protocol\": \"HTTP\"," + "\"protocol_port\": 80,"
+                + "\"tenant_id\": \"1a3e005cf9ce40308c900bcb08e5320c\" } }";
+        HttpUtils.test_modify(url, content, "LB Listener Put Failed");
     }
-   
+
     public void listener_element_get_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        ITNeutronE2E.test_fetch(url, true ,"LB Listener Element Get Failed");
+        HttpUtils.test_fetch(url, true, "LB Listener Element Get Failed");
     }
 
     public void listener_element_get_with_query_test() {
-        String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829" +
-            "?fields=id&fields=tenant_id&fields=name&fields=description" +
-            "&fields=default_pool_id&fields=protocol&fields=protocol_port" +
-            "&fields=admin_state_up&fields=limit&fields=marker&fields=page_reverse";
-        ITNeutronE2E.test_fetch(url, true ,"LB Listener Element Get With Query Failed");
+        String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829"
+                + "?fields=id&fields=tenant_id&fields=name&fields=description"
+                + "&fields=default_pool_id&fields=protocol&fields=protocol_port"
+                + "&fields=admin_state_up&fields=limit&fields=marker&fields=page_reverse";
+        HttpUtils.test_fetch(url, true, "LB Listener Element Get With Query Failed");
     }
 
     public void listener_element_negative_get_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        ITNeutronE2E.test_fetch(url, false ,"LB Listener Element Negative Get Failed");
+        HttpUtils.test_fetch(url, false, "LB Listener Element Negative Get Failed");
     }
 
     public void listener_delete_test() {
         String url = base + "/lbaas/listeners/39de4d56-d663-46e5-85a1-5b9d5fa17829";
-        ITNeutronE2E.test_delete(url, "LB Listener Element Delete Failed");
+        HttpUtils.test_delete(url, "LB Listener Element Delete Failed");
+    }
+
+    public String test_bug6398_lb_listener_create_test() {
+        String url = base + "/lbaas/listeners";
+        String content = "{ \"listener\": { " + "\"admin_state_up\": true, " + "\"connection_limit\": 100, "
+                + "\"default_pool_id\": null, " + "\"description\": \"listener one\", "
+                + "\"id\": \"39de4d56-d663-46e5-85a1-5b9d5fa17829\", " + "\"loadbalancers\": [ { "
+                + "\"id\": \"a36c20d0-18e9-42ce-88fd-82a35977ee8c\" } ], " + "\"name\": \"listener1\", "
+                + "\"protocol\": \"http\", " + "\"protocol_port\": 80, "
+                + "\"tenant_id\": \"b7c1a69e88bf4b21a8148f787aef2081\" } }";
+        HttpUtils.test_create(url, 400, content, "LB Listener Post Bug 6398 regressed");
+        return content;
     }
 
     public static void runTests(String base) {
-        NeutronLBListenerTests listener_tester = new NeutronLBListenerTests(base);
-        String createJsonString = listener_tester.singleton_lb_listener_create_test();
-        listener_tester.singleton_lb_listener_get_with_one_query_item_test(createJsonString);
-        listener_tester.listener_update_test();
-        listener_tester.listener_element_get_test();
-        listener_tester.listener_element_get_with_query_test();
-        listener_tester.listener_collection_get_test();
-        listener_tester.listener_delete_test();
-        listener_tester.listener_element_negative_get_test();
+        NeutronLBListenerTests listenerTester = new NeutronLBListenerTests(base);
+        String createJsonString = listenerTester.singleton_lb_listener_create_test();
+        listenerTester.singleton_lb_listener_get_with_one_query_item_test(createJsonString);
+        listenerTester.listener_update_test();
+        listenerTester.listener_element_get_test();
+        listenerTester.listener_element_get_with_query_test();
+        listenerTester.listener_collection_get_test();
+        listenerTester.listener_delete_test();
+        listenerTester.listener_element_negative_get_test();
+        listenerTester.test_bug6398_lb_listener_create_test();
     }
 }