From: Sam Hague <shague@redhat.com>
Date: Thu, 20 Nov 2014 21:45:18 +0000 (-0500)
Subject: Make method names consistent
X-Git-Tag: release/lithium~450
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=b1f804e812e5617aacf0303209fc1f05a278f862;p=ovsdb.git

Make method names consistent

Change-Id: I4c410970cceb8cc6d2a78fafe6615cea6d1d4f5a
Signed-off-by: Sam Hague <shague@redhat.com>
---

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
index 5f95d307d..9b020a3d8 100644
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
@@ -517,7 +517,7 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assertTrue(isExceptionRaised);
     }
 
-    public void testFlowSampleCollectorSetInsert () throws ExecutionException, InterruptedException {
+    public void flowSampleCollectorSetInsert () throws ExecutionException, InterruptedException {
         // Don't run this test if the table is not supported
         assumeTrue(schemaVersion.compareTo(flowSampleCollectorSetFromVersion) >= 0);
 
@@ -548,7 +548,7 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
                 monitoredflowSampleCollectorSet.getIdColumn().getData());
     }
 
-    public void testFlowSampleCollectorSetDelete () throws ExecutionException, InterruptedException {
+    public void flowSampleCollectorSetDelete () throws ExecutionException, InterruptedException {
         assumeTrue(schemaVersion.compareTo(flowSampleCollectorSetFromVersion) >= 0);
 
         FlowSampleCollectorSet flowSampleCollectorSet = getClient().getTypedRowWrapper(FlowSampleCollectorSet.class, null);
@@ -568,8 +568,8 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assumeTrue(schemaVersion.compareTo(flowSampleCollectorSetFromVersion) >= 0);
 
         testBridgeUuid = bridgeInsert();
-        testFlowSampleCollectorSetInsert();
-        testFlowSampleCollectorSetDelete();
+        flowSampleCollectorSetInsert();
+        flowSampleCollectorSetDelete();
         bridgeDelete(testBridgeUuid);
     }
 
@@ -587,7 +587,7 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assertTrue(isExceptionRaised);
     }
 
-    public void testFlowTableInsert () throws ExecutionException, InterruptedException {
+    public void flowTableInsert () throws ExecutionException, InterruptedException {
         // Don't run this test if the table is not supported
         assumeTrue(schemaVersion.compareTo(flowTableFromVersion) >= 0);
 
@@ -633,7 +633,7 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assertEquals(flowTable.getNameColumn().getData(), monitoredFlowTable.getNameColumn().getData());
     }
 
-    public void testFlowTableDelete () throws ExecutionException, InterruptedException {
+    public void flowTableDelete () throws ExecutionException, InterruptedException {
         // Don't run this test if the table is not supported
         assumeTrue(schemaVersion.compareTo(flowTableFromVersion) >= 0);
 
@@ -660,8 +660,8 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assumeTrue(schemaVersion.compareTo(flowTableFromVersion) >= 0);
 
         UUID testBridgeUuid = bridgeInsert();
-        testFlowTableInsert();
-        testFlowTableDelete();
+        flowTableInsert();
+        flowTableDelete();
         bridgeDelete(testBridgeUuid);
     }
 
@@ -679,7 +679,7 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assertTrue(isExceptionRaised);
     }
 
-    public void testIpfixInsert () throws ExecutionException, InterruptedException {
+    public void ipfixInsert () throws ExecutionException, InterruptedException {
         // Don't run this test if the table is not supported
         assumeTrue(schemaVersion.compareTo(ipfixFromVersion) >= 0);
 
@@ -726,7 +726,7 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assertEquals(testIpfixUuid, monitoredIPFIX.getUuidColumn().getData());
     }
 
-    public void testIpfixDelete () throws ExecutionException, InterruptedException {
+    public void ipfixDelete () throws ExecutionException, InterruptedException {
         // Don't run this test if the table is not supported
         assumeTrue(schemaVersion.compareTo(ipfixFromVersion) >= 0);
 
@@ -753,8 +753,8 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         assumeTrue(schemaVersion.compareTo(ipfixFromVersion) >= 0);
 
         testBridgeUuid = bridgeInsert();
-        testIpfixInsert();
-        testIpfixDelete();
+        ipfixInsert();
+        ipfixDelete();
         bridgeDelete(testBridgeUuid);
     }