commit 1d56fe4dbe68b307376b27a2a5ba0123db64dfae
author Ayaka Koshibe <ayaka@onlab.us> Fri Sep 19 16:51:58 2014 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Fri Sep 19 16:51:58 2014 -0700
tree 94df61505ba7a75cc68c5f02776645cfc3380705
parent e2efe72bcb651cc6d55201a62425428503cd6bf3

renamed IpAddress to IpPrefix

Change-Id: I35990622e5b1c29ab6f6a0a0227088cd5d6c7294

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

diff --git a/utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java b/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
similarity index 65%
rename from utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java
rename to utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
index d503229..f6bf6f1 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IpPrefixTest.java
@@ -7,11 +7,11 @@
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.onlab.packet.IpAddress.Version;
+import org.onlab.packet.IpPrefix.Version;
 
 import com.google.common.testing.EqualsTester;
 
-public class IPAddressTest {
+public class IpPrefixTest {
 
     private static final byte [] BYTES1 = new byte [] {0xa, 0x0, 0x0, 0xa};
     private static final byte [] BYTES2 = new byte [] {0xa, 0x0, 0x0, 0xb};
@@ -22,11 +22,11 @@
 
     @Test
     public void testEquality() {
-        IpAddress ip1 = IpAddress.valueOf(BYTES1);
-        IpAddress ip2 = IpAddress.valueOf(INTVAL1);
-        IpAddress ip3 = IpAddress.valueOf(BYTES2);
-        IpAddress ip4 = IpAddress.valueOf(INTVAL2);
-        IpAddress ip5 = IpAddress.valueOf(STRVAL);
+        IpPrefix ip1 = IpPrefix.valueOf(BYTES1);
+        IpPrefix ip2 = IpPrefix.valueOf(INTVAL1);
+        IpPrefix ip3 = IpPrefix.valueOf(BYTES2);
+        IpPrefix ip4 = IpPrefix.valueOf(INTVAL2);
+        IpPrefix ip5 = IpPrefix.valueOf(STRVAL);
 
         new EqualsTester().addEqualityGroup(ip1, ip2)
         .addEqualityGroup(ip3, ip4)
@@ -34,16 +34,16 @@
         .testEquals();
 
         // string conversions
-        IpAddress ip6 = IpAddress.valueOf(BYTES1, MASK);
-        IpAddress ip7 = IpAddress.valueOf("10.0.0.10/16");
-        IpAddress ip8 = IpAddress.valueOf(new byte [] {0xa, 0x0, 0x0, 0xc});
+        IpPrefix ip6 = IpPrefix.valueOf(BYTES1, MASK);
+        IpPrefix ip7 = IpPrefix.valueOf("10.0.0.10/16");
+        IpPrefix ip8 = IpPrefix.valueOf(new byte [] {0xa, 0x0, 0x0, 0xc});
         assertEquals("incorrect address conversion", ip6, ip7);
         assertEquals("incorrect address conversion", ip5, ip8);
     }
 
     @Test
     public void basics() {
-        IpAddress ip1 = IpAddress.valueOf(BYTES1, MASK);
+        IpPrefix ip1 = IpPrefix.valueOf(BYTES1, MASK);
         final byte [] bytes = new byte [] {0xa, 0x0, 0x0, 0xa};
 
         //check fields
@@ -57,29 +57,29 @@
     @Test
     public void netmasks() {
         // masked
-        IpAddress ip1 = IpAddress.valueOf(BYTES1, MASK);
+        IpPrefix ip1 = IpPrefix.valueOf(BYTES1, MASK);
 
-        IpAddress host = IpAddress.valueOf("0.0.0.10/16");
-        IpAddress network = IpAddress.valueOf("10.0.0.0/16");
+        IpPrefix host = IpPrefix.valueOf("0.0.0.10/16");
+        IpPrefix network = IpPrefix.valueOf("10.0.0.0/16");
         assertEquals("incorrect host address", host, ip1.host());
         assertEquals("incorrect network address", network, ip1.network());
         assertEquals("incorrect netmask", "255.255.0.0", ip1.netmask().toString());
 
         //unmasked
-        IpAddress ip2 = IpAddress.valueOf(BYTES1);
-        IpAddress umhost = IpAddress.valueOf("10.0.0.10/0");
-        IpAddress umnet = IpAddress.valueOf("0.0.0.0/0");
+        IpPrefix ip2 = IpPrefix.valueOf(BYTES1);
+        IpPrefix umhost = IpPrefix.valueOf("10.0.0.10/0");
+        IpPrefix umnet = IpPrefix.valueOf("0.0.0.0/0");
         assertEquals("incorrect host address", umhost, ip2.host());
         assertEquals("incorrect host address", umnet, ip2.network());
         assertTrue("incorrect netmask",
-                Arrays.equals(IpAddress.ANY, ip2.netmask().toOctets()));
+                Arrays.equals(IpPrefix.ANY, ip2.netmask().toOctets()));
     }
 
     @Test
     public void testContains() {
-        IpAddress slash31 = IpAddress.valueOf(BYTES1, 31);
-        IpAddress slash32 = IpAddress.valueOf(BYTES1, 32);
-        IpAddress differentSlash32 = IpAddress.valueOf(BYTES2, 32);
+        IpPrefix slash31 = IpPrefix.valueOf(BYTES1, 31);
+        IpPrefix slash32 = IpPrefix.valueOf(BYTES1, 32);
+        IpPrefix differentSlash32 = IpPrefix.valueOf(BYTES2, 32);
 
         assertTrue(slash31.contains(differentSlash32));
         assertFalse(differentSlash32.contains(slash31));
@@ -88,11 +88,11 @@
         assertFalse(slash32.contains(differentSlash32));
         assertFalse(differentSlash32.contains(slash32));
 
-        IpAddress zero = IpAddress.valueOf("0.0.0.0/0");
+        IpPrefix zero = IpPrefix.valueOf("0.0.0.0/0");
         assertTrue(zero.contains(differentSlash32));
         assertFalse(differentSlash32.contains(zero));
 
-        IpAddress slash8 = IpAddress.valueOf("10.0.0.0/8");
+        IpPrefix slash8 = IpPrefix.valueOf("10.0.0.0/8");
         assertTrue(slash8.contains(slash31));
         assertFalse(slash31.contains(slash8));
     }

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

diff --git a/utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
similarity index 97%
rename from utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java
rename to utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
index 17d888c..dde9c3c 100644
--- a/utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/VlanIdTest.java
@@ -6,7 +6,7 @@
 
 import com.google.common.testing.EqualsTester;
 
-public class VLANIDTest {
+public class VlanIdTest {
 
     @Test
     public void testEquality() {