commit 44a0b3517a7521e27212df30668e0122d5198c80
author Yuta HIGUCHI <y-higuchi@onlab.us> Wed May 14 21:32:48 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Fri May 16 15:15:18 2014 -0700
tree 1325aba4b13bfce025149195514e7a4246154e60
parent 6dd9b942b2cc1302738641286a44b19f315588f9

Checkstyle fixes for tests

- Fixed some checkstyle errors which seemed easier to fix.

Change-Id: I9dadd2e8f98b560fadcc2b704ac52ff8f8b93913

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

diff --git a/src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java b/src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java
index de71490..7921099 100644
--- a/src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java
+++ b/src/test/java/net/onrc/onos/core/datastore/topology/KVTopologyTest.java
@@ -74,7 +74,7 @@
     }
 
     @Test
-    public void basic_switch_test() {
+    public void basicSwitchTest() {
         // create switch 0x1
         try {
             KVSwitch sw = new KVSwitch(DPID1);
@@ -145,13 +145,13 @@
     }
 
     @Test
-    public void topology_setup_and_tear_down() {
-        topology_setup();
-        topology_walk();
-        topology_delete();
+    public void topologySetupAndTeardown() {
+        topologySetup();
+        topologyWalk();
+        topologyDelete();
     }
 
-    private static void topology_setup() {
+    private static void topologySetup() {
 
         // d1 - s1p1 - s1 - s1p2 - s2p1 - s2 - s2p2
 
@@ -298,7 +298,7 @@
     }
 
 
-    private static void topology_walk() {
+    private static void topologyWalk() {
         Iterable<KVSwitch> swIt = KVSwitch.getAllSwitches();
         List<Long> switchesExpected = new ArrayList<>(Arrays.asList(DPID1, DPID2));
 
@@ -336,10 +336,10 @@
 
         // DPID -> [port_no]
         @SuppressWarnings("serial")
-        Map<Long, List<Long>> expectedPorts = new HashMap<Long, List<Long>>() {{
+        Map<Long, List<Long>> expectedPorts = new HashMap<Long, List<Long>>() { {
             put(DPID1, new ArrayList<>(Arrays.asList(SW1_PORTNO1, SW1_PORTNO2)));
             put(DPID2, new ArrayList<>(Arrays.asList(SW2_PORTNO1, SW2_PORTNO2)));
-        }};
+        } };
 
         for (KVPort port : KVPort.getAllPorts()) {
             System.out.println(port + " @ " + port.getVersion());
@@ -355,10 +355,10 @@
 
         // DeviceID -> PortID
         @SuppressWarnings("serial")
-        Map<byte[], byte[]> expectedDevice = new TreeMap<byte[], byte[]>(ByteArrayComparator.BYTEARRAY_COMPARATOR) {{
+        Map<byte[], byte[]> expectedDevice = new TreeMap<byte[], byte[]>(ByteArrayComparator.BYTEARRAY_COMPARATOR) { {
             put(DEVICE1_MAC_SW1P1, KVPort.getPortID(DPID1, SW1_PORTNO1));
             put(DEVICE2_MAC_SW2P2, KVPort.getPortID(DPID2, SW2_PORTNO2));
-        }};
+        } };
 
         for (KVDevice device : KVDevice.getAllDevices()) {
             System.out.println(device + " @ " + device.getVersion());
@@ -383,7 +383,7 @@
     }
 
 
-    private static void topology_delete() {
+    private static void topologyDelete() {
 
         for (KVSwitch sw : KVSwitch.getAllSwitches()) {
             try {
@@ -426,9 +426,9 @@
 
     public static void main(final String[] argv) {
 
-        topology_setup();
-        topology_walk();
-        topology_delete();
+        topologySetup();
+        topologyWalk();
+        topologyDelete();
 
         System.exit(0);
     }