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/apps/sdnip/PatriciaTreeTest.java

diff --git a/src/test/java/net/onrc/onos/apps/sdnip/PatriciaTreeTest.java b/src/test/java/net/onrc/onos/apps/sdnip/PatriciaTreeTest.java
index 686971e..c5138c1 100644
--- a/src/test/java/net/onrc/onos/apps/sdnip/PatriciaTreeTest.java
+++ b/src/test/java/net/onrc/onos/apps/sdnip/PatriciaTreeTest.java
@@ -48,7 +48,7 @@
 
     @Test
     public void testPut() {
-        IPatriciaTree<RibEntry> ptree = new PatriciaTree<RibEntry>(32);
+        ptree = new PatriciaTree<RibEntry>(32);
 
         Prefix p1 = new Prefix("192.168.240.0", 20);
         RibEntry r1 = new RibEntry("192.168.10.101", "192.168.60.2");

src/test/java/net/onrc/onos/apps/sdnip/PrefixTest.java

diff --git a/src/test/java/net/onrc/onos/apps/sdnip/PrefixTest.java b/src/test/java/net/onrc/onos/apps/sdnip/PrefixTest.java
index d1e5f9a..a000564 100644
--- a/src/test/java/net/onrc/onos/apps/sdnip/PrefixTest.java
+++ b/src/test/java/net/onrc/onos/apps/sdnip/PrefixTest.java
@@ -69,9 +69,9 @@
     public void testPrefixReturnsSame() {
         //Create a prefix of all 1s for each prefix length.
         //Check that Prefix doesn't mangle it
-        int MAX_PREFIX_LENGTH = 32;
+        final int MAX_PREFIX_LENGTH = 32;
         for (int prefixLength = 1; prefixLength <= MAX_PREFIX_LENGTH; prefixLength++) {
-            byte address[] = new byte[MAX_PREFIX_LENGTH / Byte.SIZE];
+            byte[] address = new byte[MAX_PREFIX_LENGTH / Byte.SIZE];
 
             int lastByte = (prefixLength - 1) / Byte.SIZE;
             int lastBit = (prefixLength - 1) % Byte.SIZE;

src/test/java/net/onrc/onos/apps/sdnip/PtreeTest.java

diff --git a/src/test/java/net/onrc/onos/apps/sdnip/PtreeTest.java b/src/test/java/net/onrc/onos/apps/sdnip/PtreeTest.java
index 4fac2f2..ad36811 100644
--- a/src/test/java/net/onrc/onos/apps/sdnip/PtreeTest.java
+++ b/src/test/java/net/onrc/onos/apps/sdnip/PtreeTest.java
@@ -182,8 +182,8 @@
     @Test
     public void testMisc() {
         int bitIndex = -1;
-        int index = (int) (bitIndex / Byte.SIZE);
-        int bit = (int) (bitIndex % Byte.SIZE);
+        int index = bitIndex / Byte.SIZE;
+        int bit = bitIndex % Byte.SIZE;
 
         log.debug("index {} bit {}", index, bit);
         log.debug("percent {}", 1 % 8);
@@ -199,7 +199,7 @@
     }
 
     @Test
-    public void testIteration() {
+    public void testIteration() throws UnknownHostException {
         Iterator<IPatriciaTree.Entry<RibEntry>> it = ooPtree.iterator();
 
         while (it.hasNext()) {
@@ -207,13 +207,9 @@
             log.debug("PatriciaTree prefix {} \t {}", entry.getPrefix(), entry.getPrefix().printAsBits());
         }
 
-        try {
-            PtreeNode node;
-            for (node = ptree.begin(); node != null; node = ptree.next(node)) {
-                log.debug("Ptree prefix {}/{}", InetAddress.getByAddress(node.key).getHostAddress(), node.keyBits);
-            }
-        } catch (UnknownHostException e) {
-
+        PtreeNode node;
+        for (node = ptree.begin(); node != null; node = ptree.next(node)) {
+            log.debug("Ptree prefix {}/{}", InetAddress.getByAddress(node.key).getHostAddress(), node.keyBits);
         }
     }