Add more tests to improve Code Coverage

Adding new test get with query achieved more functional coverage.
Moving the collection_get_test later after the nodes were created
helped getting more condition coverage in list functions.
These changes improve code coverage by 12% for these files

Change-Id: Ib80bd954ce2373fc13d36191d27e2bdb06f74a39
Signed-off-by: Ritu Sood <ritu.sood@intel.com>

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIPTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIPTests.java
index 473355f84721acf97dcee1c8a80c730b354f44d8..c1ae88f1510ac7c273cf28cab71df20dc7f81c2c 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIPTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIPTests.java
@@ -73,6 +73,14 @@ public class NeutronFloatingIPTests {
         ITNeutronE2E.test_fetch(url, true, "Floating IP Element Get Test");
     }
 
+    public void floatingIP_element_get_with_query_test() {
+        String url = base + "/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7" +
+            "?fields=id&fields=floating_network_id&fields=port_id&fields=status" +
+            "&fields=fixed_ip_address&fields=floating_ip_address&fields=tenant_id" +
+            "&fields=router_id&fields=limit&fields=marker&fields=page_reverse";
+        ITNeutronE2E.test_fetch(url, true, "Floating IP Element Get Query Test");
+    }
+
     public void floatingIP_delete_test() {
         String url = base + "/floatingips/2f245a7b-796b-4f26-9cf9-9e82d248fda7";
         ITNeutronE2E.test_delete(url, "Floating IP Delete Test");
@@ -85,10 +93,11 @@ public class NeutronFloatingIPTests {
 
     public static void runTests(String base) {
         NeutronFloatingIPTests floatingIP_tester = new NeutronFloatingIPTests(base);
-        floatingIP_tester.floatingIP_collection_get_test();
         floatingIP_tester.singleton_floatingIP_create_test();
         floatingIP_tester.update_floatingIP_test();
         floatingIP_tester.floatingIP_element_get_test();
+        floatingIP_tester.floatingIP_element_get_with_query_test();
+        floatingIP_tester.floatingIP_collection_get_test();
         floatingIP_tester.floatingIP_delete_test();
         floatingIP_tester.floatingIP_element_negative_get_test();
     }

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
index 920d415344593be6447e894e854785f1d5d654c4..a50f32657288233b401a46c31d482477d44a30e5 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
@@ -127,6 +127,15 @@ public class NeutronPortTests {
         ITNeutronE2E.test_fetch(url, true, "Port Element Get Failed");
     }
 
+
+    public void port_element_get_with_query_test() {
+        String url = base + "/ports/43c831e0-19ce-4a76-9a49-57b57e69428b" +
+            "?fields=id&fields=network_id&fields=name&fields=admin_state_up" +
+            "&fields=status&fields=mac_address&fields=device_id&fields=tenant_id" +
+            "&fields=device_owner&fields=limit&fields=marker&fields=page_reverse";
+        ITNeutronE2E.test_fetch(url, true, "Port Element Get With Query Failed");
+    }
+
     public void port_delete_test() {
         String url = base + "/ports/43c831e0-19ce-4a76-9a49-57b57e69428b";
         ITNeutronE2E.test_delete(url, "Port Element Delete Failed");
@@ -139,12 +148,13 @@ public class NeutronPortTests {
 
     public static void runTests(String base) {
         NeutronPortTests port_tester = new NeutronPortTests(base);
-        port_tester.port_collection_get_test();
         port_tester.singleton_port_create_test();
         port_tester.router_interface_port_create_test(); //needed for router test
         port_tester.bulk_port_create_test();
         port_tester.port_update_test();
         port_tester.port_element_get_test();
+        port_tester.port_element_get_with_query_test();
+        port_tester.port_collection_get_test();
         port_tester.port_delete_test();
         port_tester.port_element_negative_get_test();
     }

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java
index 6fee081225c15630154f5cd968dba06af1ff1468..c87c40daf3f4b0f9ea43fb5bdd741b5ad6d2d5e1 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java
@@ -111,6 +111,14 @@ public class NeutronRouterTests {
         ITNeutronE2E.test_fetch(url, true, "Router Element Get Test");
     }
 
+    public void router_element_get_with_query_test() {
+        String url = base + "/routers/8604a0de-7f6b-409a-a47c-a1cc7bc77b2f"+
+            "?fields=id&fields=admin_state_up&fields=name&fields=status" +
+            "&fields=tenant_id&fields=external_gateway_info" +
+            "&fields=limit&fields=marker&fields=page_reverse";;
+        ITNeutronE2E.test_fetch(url, true, "Router Element Get With Query Test");
+    }
+
     public void router_delete_test() {
         String url = base + "/routers/8604a0de-7f6b-409a-a47c-a1cc7bc77b2f";
         ITNeutronE2E.test_delete(url, "Router Delete Test");
@@ -123,13 +131,14 @@ public class NeutronRouterTests {
 
     public static void runTests(String base) {
         NeutronRouterTests router_tester = new NeutronRouterTests(base);
-        router_tester.router_collection_get_test();
         router_tester.singleton_router_create_test();
         router_tester.router_add_interface_test();
         router_tester.update_router_test();
         router_tester.create_router(); // needed for following tests
         router_tester.router_add_interface();
         router_tester.router_element_get_test();
+        router_tester.router_element_get_with_query_test();
+        router_tester.router_collection_get_test();
         router_tester.router_remove_interface_test();
         router_tester.router_delete_test();
         router_tester.router_element_negative_get_test();

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java
index bb4b559f978d21b84ee97529a5eb1895f95294cc..bd5998868970c83fb4ad0f2b618cda4b3f001fc2 100644 (file)
--- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java
+++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java
@@ -130,6 +130,15 @@ public class NeutronSubnetTests {
         ITNeutronE2E.test_fetch(url, true, "Subnet Element Get Failed");
     }
 
+    public void subnet_element_get_with_query_test() {
+        String url = base + "/subnets/b0e7435c-1512-45fb-aa9e-9a7c5932fb30" +
+            "?fields=id&fields=network_id&fields=name&fields=ip_version" +
+            "&fields=cidr&fields=gateway_ip&fields=enable_dhcp" +
+            "&fields=tenant_id&fields=ipv6_address_mode&fields=ipv6_ra_mode" +
+            "&fields=limit&fields=marker&fields=page_reverse";
+        ITNeutronE2E.test_fetch(url, true, "Subnet Element Get with Query Failed");
+    }
+
     public void subnet_delete_test() {
         String url = base + "/subnets/b0e7435c-1512-45fb-aa9e-9a7c5932fb30";
         ITNeutronE2E.test_delete(url, "Subnet Element Delete Failed");
@@ -142,12 +151,13 @@ public class NeutronSubnetTests {
 
     public static void runTests(String base) {
         NeutronSubnetTests subnet_tester = new NeutronSubnetTests(base);
-        subnet_tester.subnet_collection_get_test();
         subnet_tester.singleton_subnet_create_test();
         subnet_tester.external_subnet_create_test(); //needed for router test
         subnet_tester.bulk_subnet_create_test();
         subnet_tester.subnet_update_test();
         subnet_tester.subnet_element_get_test();
+        subnet_tester.subnet_element_get_with_query_test();
+        subnet_tester.subnet_collection_get_test();
         subnet_tester.subnet_delete_test();
         subnet_tester.subnet_element_negative_get_test();
     }