commit a9c199f4028ce95784cf2f94eb031351d71c18ba
author Ayaka Koshibe <ayaka@onlab.us> Tue Sep 16 16:21:40 2014 -0700
committer Ayaka Koshibe <ayaka@onlab.us> Tue Sep 16 16:21:40 2014 -0700
tree a63212d622b7625a7a35cac6fba0b2798fcd882a
parent a33c2b03cc30d566ea879c4aef5a634f49a444fa

renamed VLAN, IP, and MACAddress classes

Change-Id: Ib4df413db1f3d9ee96213fc487519536d7993c5b

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 35c8271..a0757cd 100644
--- a/utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/IPAddressTest.java
@@ -5,7 +5,7 @@
 import java.util.Arrays;
 
 import org.junit.Test;
-import org.onlab.packet.IPAddress.Version;
+import org.onlab.packet.IpAddress.Version;
 
 import com.google.common.testing.EqualsTester;
 
@@ -19,11 +19,11 @@
 
     @Test
     public void testEquality() {
-        IPAddress ip1 = IPAddress.valueOf(BYTES1);
-        IPAddress ip2 = IPAddress.valueOf(BYTES2);
-        IPAddress ip3 = IPAddress.valueOf(INTVAL1);
-        IPAddress ip4 = IPAddress.valueOf(INTVAL2);
-        IPAddress ip5 = IPAddress.valueOf(STRVAL);
+        IpAddress ip1 = IpAddress.valueOf(BYTES1);
+        IpAddress ip2 = IpAddress.valueOf(BYTES2);
+        IpAddress ip3 = IpAddress.valueOf(INTVAL1);
+        IpAddress ip4 = IpAddress.valueOf(INTVAL2);
+        IpAddress ip5 = IpAddress.valueOf(STRVAL);
 
         new EqualsTester().addEqualityGroup(ip1, ip3)
         .addEqualityGroup(ip2, ip5)
@@ -33,7 +33,7 @@
 
     @Test
     public void basics() {
-        IPAddress ip4 = IPAddress.valueOf(BYTES1);
+        IpAddress ip4 = IpAddress.valueOf(BYTES1);
         assertEquals("incorrect IP Version", Version.INET, ip4.version());
         assertEquals("faulty toOctets()", Arrays.equals(
                 new byte [] {0x0, 0x0, 0x0, 0xa}, ip4.toOctets()), true);

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
index 88fb9c8..17d888c 100644
--- a/utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java
+++ b/utils/misc/src/test/java/org/onlab/packet/VLANIDTest.java
@@ -11,28 +11,28 @@
     @Test
     public void testEquality() {
 
-        VLANID vlan1 = VLANID.vlanId((short) -1);
-        VLANID vlan2 = VLANID.vlanId((short) 100);
-        VLANID vlan3 = VLANID.vlanId((short) 100);
+        VlanId vlan1 = VlanId.vlanId((short) -1);
+        VlanId vlan2 = VlanId.vlanId((short) 100);
+        VlanId vlan3 = VlanId.vlanId((short) 100);
 
-        new EqualsTester().addEqualityGroup(VLANID.vlanId(), vlan1)
+        new EqualsTester().addEqualityGroup(VlanId.vlanId(), vlan1)
         .addEqualityGroup(vlan2, vlan3)
-        .addEqualityGroup(VLANID.vlanId((short) 10));
+        .addEqualityGroup(VlanId.vlanId((short) 10));
 
     }
 
     @Test
     public void basics() {
         // purposefully create UNTAGGED VLAN
-        VLANID vlan1 = VLANID.vlanId((short) 10);
-        VLANID vlan2 = VLANID.vlanId((short) -1);
+        VlanId vlan1 = VlanId.vlanId((short) 10);
+        VlanId vlan2 = VlanId.vlanId((short) -1);
 
         assertEquals("incorrect VLAN value", 10, vlan1.toShort());
-        assertEquals("invalid untagged value", VLANID.UNTAGGED, vlan2.toShort());
+        assertEquals("invalid untagged value", VlanId.UNTAGGED, vlan2.toShort());
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testIllicitVLAN() {
-        VLANID.vlanId((short) 5000);
+        VlanId.vlanId((short) 5000);
     }
 }