commit 111b42b7a33b3751cc771db0835ec8177a2638cf
author Jonathan Hart <jono@onlab.us> Tue Jul 14 13:28:05 2015 -0700
committer Jonathan Hart <jono@onlab.us> Thu Jul 23 10:25:54 2015 -0700
tree 979c24d482c91813e79a51eab7e152a5a745558f
parent cab114c7c90e1bff35b780c1d4c9e20b042173de

Move address-bindings config to new config system

Change-Id: I6d87ddbf98789dbe8355c453a3263f50fbc5d99c

core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java b/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
index b82da45..6120b7c 100644
--- a/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
+++ b/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
@@ -54,22 +54,28 @@
         // Regular interface address with default broadcast address
         fromAddr = new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS);
         toAddr = new InterfaceIpAddress(fromAddr);
-        assertThat(toAddr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16}"));
+        assertThat(toAddr.ipAddress(), is(fromAddr.ipAddress()));
+        assertThat(toAddr.subnetAddress(), is(fromAddr.subnetAddress()));
+        assertThat(toAddr.broadcastAddress(), is(fromAddr.broadcastAddress()));
+        assertThat(toAddr.peerAddress(), is(fromAddr.peerAddress()));
 
         // Interface address with non-default broadcast address
         fromAddr = new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS,
                                           BROADCAST_ADDRESS);
         toAddr = new InterfaceIpAddress(fromAddr);
-        assertThat(toAddr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16, broadcastAddress=1.2.0.255}"));
+        assertThat(toAddr.ipAddress(), is(fromAddr.ipAddress()));
+        assertThat(toAddr.subnetAddress(), is(fromAddr.subnetAddress()));
+        assertThat(toAddr.broadcastAddress(), is(fromAddr.broadcastAddress()));
+        assertThat(toAddr.peerAddress(), is(fromAddr.peerAddress()));
 
         // Point-to-point address with peer IP address
         fromAddr = new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS, null,
                                           PEER_ADDRESS);
         toAddr = new InterfaceIpAddress(fromAddr);
-        assertThat(toAddr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16, peerAddress=5.6.7.8}"));
+        assertThat(toAddr.ipAddress(), is(fromAddr.ipAddress()));
+        assertThat(toAddr.subnetAddress(), is(fromAddr.subnetAddress()));
+        assertThat(toAddr.broadcastAddress(), is(fromAddr.broadcastAddress()));
+        assertThat(toAddr.peerAddress(), is(fromAddr.peerAddress()));
     }
 
     /**
@@ -89,8 +95,10 @@
     public void testConstructorForDefaultBroadcastAddress() {
         InterfaceIpAddress addr =
             new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS);
-        assertThat(addr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16}"));
+        assertThat(addr.ipAddress(), is(IP_ADDRESS));
+        assertThat(addr.subnetAddress(), is(SUBNET_ADDRESS));
+        assertThat(addr.broadcastAddress(), nullValue());
+        assertThat(addr.peerAddress(), nullValue());
     }
 
     /**
@@ -102,8 +110,11 @@
         InterfaceIpAddress addr =
             new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS,
                                    BROADCAST_ADDRESS);
-        assertThat(addr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16, broadcastAddress=1.2.0.255}"));
+
+        assertThat(addr.ipAddress(), is(IP_ADDRESS));
+        assertThat(addr.subnetAddress(), is(SUBNET_ADDRESS));
+        assertThat(addr.broadcastAddress(), is(BROADCAST_ADDRESS));
+        assertThat(addr.peerAddress(), nullValue());
     }
 
     /**
@@ -115,8 +126,11 @@
         InterfaceIpAddress addr =
             new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS, null,
                                    PEER_ADDRESS);
-        assertThat(addr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16, peerAddress=5.6.7.8}"));
+
+        assertThat(addr.ipAddress(), is(IP_ADDRESS));
+        assertThat(addr.subnetAddress(), is(SUBNET_ADDRESS));
+        assertThat(addr.broadcastAddress(), nullValue());
+        assertThat(addr.peerAddress(), is(PEER_ADDRESS));
     }
 
     /**
@@ -229,28 +243,4 @@
         assertThat(addr3, is(not(addr4)));
     }
 
-    /**
-     * Tests object string representation.
-     */
-    @Test
-    public void testToString() {
-        InterfaceIpAddress addr;
-
-        // Regular interface address with default broadcast address
-        addr = new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS);
-        assertThat(addr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16}"));
-
-        // Interface address with non-default broadcast address
-        addr = new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS,
-                                      BROADCAST_ADDRESS);
-        assertThat(addr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16, broadcastAddress=1.2.0.255}"));
-
-        // Point-to-point address with peer IP address
-        addr = new InterfaceIpAddress(IP_ADDRESS, SUBNET_ADDRESS, null,
-                                      PEER_ADDRESS);
-        assertThat(addr.toString(),
-                   is("InterfaceIpAddress{ipAddress=1.2.3.4, subnetAddress=1.2.0.0/16, peerAddress=5.6.7.8}"));
-    }
 }