commit 315d6c8b89c4d950443ee3d71f9bbb133c68d190
author Pavlin Radoslavov <pavlin@onlab.us> Tue Nov 04 15:36:04 2014 -0800
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Nov 04 15:36:04 2014 -0800
tree 9fb20ac11212e534f48e38dfd186be199184b8bd
parent f182f015a544e729dfb5735a7677345e9abb8abf

Minor refactoring (for code consistency).
No functional changes.

utils/misc/src/test/java/org/onlab/packet/Ip4AddressTest.java

diff --git a/utils/misc/src/test/java/org/onlab/packet/Ip4AddressTest.java b/utils/misc/src/test/java/org/onlab/packet/Ip4AddressTest.java
index dd4c2d0..3bbf000 100644
--- a/utils/misc/src/test/java/org/onlab/packet/Ip4AddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/Ip4AddressTest.java
@@ -136,18 +136,19 @@
     @Test
     public void testValueOfByteArrayIPv4() {
         Ip4Address ipAddress;
+        byte[] value;
 
-        final byte[] value1 = new byte[] {1, 2, 3, 4};
-        ipAddress = Ip4Address.valueOf(value1);
+        value = new byte[] {1, 2, 3, 4};
+        ipAddress = Ip4Address.valueOf(value);
         assertThat(ipAddress.toString(), is("1.2.3.4"));
 
-        final byte[] value2 = new byte[] {0, 0, 0, 0};
-        ipAddress = Ip4Address.valueOf(value2);
+        value = new byte[] {0, 0, 0, 0};
+        ipAddress = Ip4Address.valueOf(value);
         assertThat(ipAddress.toString(), is("0.0.0.0"));
 
-        final byte[] value3 = new byte[] {(byte) 0xff, (byte) 0xff,
-                                          (byte) 0xff, (byte) 0xff};
-        ipAddress = Ip4Address.valueOf(value3);
+        value = new byte[] {(byte) 0xff, (byte) 0xff,
+                            (byte) 0xff, (byte) 0xff};
+        ipAddress = Ip4Address.valueOf(value);
         assertThat(ipAddress.toString(), is("255.255.255.255"));
     }
 
@@ -157,9 +158,10 @@
     @Test(expected = NullPointerException.class)
     public void testInvalidValueOfNullArrayIPv4() {
         Ip4Address ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = null;
-        ipAddress = Ip4Address.valueOf(fromArray);
+        value = null;
+        ipAddress = Ip4Address.valueOf(value);
     }
 
     /**
@@ -169,9 +171,10 @@
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidValueOfShortArrayIPv4() {
         Ip4Address ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = new byte[] {1, 2, 3};
-        ipAddress = Ip4Address.valueOf(fromArray);
+        value = new byte[] {1, 2, 3};
+        ipAddress = Ip4Address.valueOf(value);
     }
 
     /**

utils/misc/src/test/java/org/onlab/packet/Ip6AddressTest.java

diff --git a/utils/misc/src/test/java/org/onlab/packet/Ip6AddressTest.java b/utils/misc/src/test/java/org/onlab/packet/Ip6AddressTest.java
index c33cf1a..e7d017d 100644
--- a/utils/misc/src/test/java/org/onlab/packet/Ip6AddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/Ip6AddressTest.java
@@ -154,9 +154,10 @@
     @Test(expected = NullPointerException.class)
     public void testInvalidValueOfNullArrayIPv6() {
         Ip6Address ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = null;
-        ipAddress = Ip6Address.valueOf(fromArray);
+        value = null;
+        ipAddress = Ip6Address.valueOf(value);
     }
 
     /**
@@ -166,9 +167,10 @@
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidValueOfShortArrayIPv6() {
         Ip6Address ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9};
-        ipAddress = Ip6Address.valueOf(fromArray);
+        value = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9};
+        ipAddress = Ip6Address.valueOf(value);
     }
 
     /**

utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java

diff --git a/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java b/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
index abc1cc5..fd0eac4 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IpAddressTest.java
@@ -234,9 +234,10 @@
     @Test(expected = NullPointerException.class)
     public void testInvalidValueOfNullArrayIPv4() {
         IpAddress ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = null;
-        ipAddress = IpAddress.valueOf(IpAddress.Version.INET, fromArray);
+        value = null;
+        ipAddress = IpAddress.valueOf(IpAddress.Version.INET, value);
     }
 
     /**
@@ -245,9 +246,10 @@
     @Test(expected = NullPointerException.class)
     public void testInvalidValueOfNullArrayIPv6() {
         IpAddress ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = null;
-        ipAddress = IpAddress.valueOf(IpAddress.Version.INET6, fromArray);
+        value = null;
+        ipAddress = IpAddress.valueOf(IpAddress.Version.INET6, value);
     }
 
     /**
@@ -257,9 +259,10 @@
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidValueOfShortArrayIPv4() {
         IpAddress ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = new byte[] {1, 2, 3};
-        ipAddress = IpAddress.valueOf(IpAddress.Version.INET, fromArray);
+        value = new byte[] {1, 2, 3};
+        ipAddress = IpAddress.valueOf(IpAddress.Version.INET, value);
     }
 
     /**
@@ -269,9 +272,10 @@
     @Test(expected = IllegalArgumentException.class)
     public void testInvalidValueOfShortArrayIPv6() {
         IpAddress ipAddress;
+        byte[] value;
 
-        final byte[] fromArray = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9};
-        ipAddress = IpAddress.valueOf(IpAddress.Version.INET6, fromArray);
+        value = new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9};
+        ipAddress = IpAddress.valueOf(IpAddress.Version.INET6, value);
     }
 
     /**