commit 7531a34ddcd952d678c011f1dd18207ed4e7a048
author Ray Milkey <ray@onlab.us> Fri Apr 11 15:08:12 2014 -0700
committer Ray Milkey <ray@onlab.us> Fri Apr 11 15:13:27 2014 -0700
tree ff97ce9acec6a47961f9991982a984eee3b39c50
parent 816512cdba673a2c583854b9edf14018b04ce4da

Enable checkstyle rule to verify method names

Enabled checkstyle rule "MethodName" which checks
if method names adhere to a naming convention and
fixed the violations it found.

Change-Id: I87448a1fa857e78f33c42090d485bf21a8986ba7

src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java

diff --git a/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java b/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java
index ba25903..a789f1c 100644
--- a/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java
+++ b/src/test/java/net/onrc/onos/core/datastore/topology/KVSwitchTest.java
@@ -40,7 +40,7 @@
         try {
             final KVSwitch sw = new KVSwitch(dpid);
             sw.read();
-            assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+            assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
             assertEquals(dpid, sw.getDpid());
             assertEquals(status, sw.getStatus());
             return sw;
@@ -67,7 +67,7 @@
             KVSwitch sw = new KVSwitch(dpid);
             sw.setStatus(STATUS.ACTIVE);
             sw.create();
-            assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+            assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
             expected.put(sw.getDpid(), sw);
         }
 
@@ -88,7 +88,7 @@
     public void testCreate() throws ObjectExistsException {
         sw1.setStatus(STATUS.ACTIVE);
         sw1.create();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
 
         assertEquals(dpid1, sw1.getDpid());
         assertEquals(STATUS.ACTIVE, sw1.getStatus());
@@ -101,7 +101,7 @@
         // setup pre-existing Switch
         KVSwitch sw = new KVSwitch(dpid1);
         sw.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
         assertSwitchInDataStore(dpid1, STATUS.INACTIVE);
 
         sw1.setStatus(STATUS.ACTIVE);
@@ -114,13 +114,13 @@
         // setup pre-existing Switch
         KVSwitch sw = new KVSwitch(dpid1);
         sw.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
         assertSwitchInDataStore(dpid1, STATUS.INACTIVE);
 
 
         sw1.setStatus(STATUS.ACTIVE);
         sw1.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
 
         assertEquals(dpid1, sw1.getDpid());
         assertEquals(STATUS.ACTIVE, sw1.getStatus());
@@ -133,11 +133,11 @@
         KVSwitch sw = new KVSwitch(dpid1);
         sw.setStatus(STATUS.ACTIVE);
         sw.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
         assertSwitchInDataStore(dpid1, STATUS.ACTIVE);
 
         sw1.read();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
         assertEquals(sw.getVersion(), sw1.getVersion());
         assertEquals(dpid1, sw1.getDpid());
         assertEquals(STATUS.ACTIVE, sw1.getStatus());
@@ -156,16 +156,16 @@
         KVSwitch sw = new KVSwitch(dpid1);
         sw.setStatus(STATUS.ACTIVE);
         sw.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
         assertSwitchInDataStore(dpid1, STATUS.ACTIVE);
 
 
         sw1.read();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
 
         sw1.setStatus(STATUS.INACTIVE);
         sw1.update();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
         assertNotEquals(sw.getVersion(), sw1.getVersion());
         assertEquals(dpid1, sw1.getDpid());
         assertEquals(STATUS.INACTIVE, sw1.getStatus());
@@ -177,7 +177,7 @@
         KVSwitch sw = new KVSwitch(dpid1);
         sw.setStatus(STATUS.ACTIVE);
         sw.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
         assertSwitchInDataStore(dpid1, STATUS.ACTIVE);
 
 
@@ -186,7 +186,7 @@
         } catch (ObjectDoesntExistException e) {
             fail("Failed reading switch to delete");
         }
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
         sw1.delete();
         assertSwitchNotInDataStore(dpid1);
     }
@@ -197,12 +197,12 @@
         KVSwitch sw = new KVSwitch(dpid1);
         sw.setStatus(STATUS.ACTIVE);
         sw.forceCreate();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw.getVersion());
         assertSwitchInDataStore(dpid1, STATUS.ACTIVE);
 
 
         sw1.forceDelete();
-        assertNotEquals(DataStoreClient.getClient().VERSION_NONEXISTENT(), sw1.getVersion());
+        assertNotEquals(DataStoreClient.getClient().getVersionNonexistant(), sw1.getVersion());
     }
 
 }