commit 97e8a8bd552f11b65b56412551e16ece90cf3a43
author Pavlin Radoslavov <pavlin@onlab.us> Mon Nov 24 17:51:28 2014 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Nov 25 06:05:29 2014 +0000
tree dc68e4d3239b8c84a354721edb3e68c8dbccaa3a
parent fe4367a708a73dc54a35c5c140ccc53fa68586d9

Fix the SDN-IP unit tests after changing the Intent IDs to use
explicit ID assignment.

Change-Id: I50bc20188922193cfa47bf0ec324a69929744745

apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java

diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
index 12fc6cb..f15d50f 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
@@ -31,7 +31,6 @@
 import java.util.Set;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.onlab.junit.TestUtils;
 import org.onlab.junit.TestUtils.TestUtilsException;
@@ -50,10 +49,12 @@
 import org.onlab.onos.net.host.HostListener;
 import org.onlab.onos.net.host.HostService;
 import org.onlab.onos.net.host.InterfaceIpAddress;
+import org.onlab.onos.net.intent.Intent;
 import org.onlab.onos.net.intent.IntentService;
 import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
 import org.onlab.onos.net.intent.AbstractIntentTest;
 import org.onlab.onos.net.provider.ProviderId;
+import org.onlab.onos.sdnip.IntentSynchronizer.IntentKey;
 import org.onlab.onos.sdnip.config.BgpPeer;
 import org.onlab.onos.sdnip.config.Interface;
 import org.onlab.onos.sdnip.config.SdnIpConfigService;
@@ -232,7 +233,7 @@
     /**
      * This method tests adding a route entry.
      */
-    @Test @Ignore("needs fix from intents")
+    @Test
     public void testProcessRouteAdd() throws TestUtilsException {
         // Construct a route entry
         RouteEntry routeEntry = new RouteEntry(
@@ -260,7 +261,7 @@
 
         // Set up test expectation
         reset(intentService);
-        intentService.submit(intent);
+        intentService.submit(TestIntentServiceHelper.eqExceptId(intent));
         replay(intentService);
 
         // Call the processRouteAdd() method in Router class
@@ -272,8 +273,11 @@
         assertEquals(router.getRoutes().size(), 1);
         assertTrue(router.getRoutes().contains(routeEntry));
         assertEquals(intentSynchronizer.getRouteIntents().size(), 1);
-        assertEquals(intentSynchronizer.getRouteIntents().iterator().next(),
-                intent);
+        Intent firstIntent =
+            intentSynchronizer.getRouteIntents().iterator().next();
+        IntentKey firstIntentKey = new IntentKey(firstIntent);
+        IntentKey intentKey = new IntentKey(intent);
+        assertTrue(firstIntentKey.equals(intentKey));
         verify(intentService);
     }
 
@@ -282,7 +286,7 @@
      *
      * @throws TestUtilsException
      */
-    @Test @Ignore("needs fix from intents")
+    @Test
     public void testRouteUpdate() throws TestUtilsException {
         // Firstly add a route
         testProcessRouteAdd();
@@ -339,8 +343,8 @@
 
         // Set up test expectation
         reset(intentService);
-        intentService.withdraw(intent);
-        intentService.submit(intentNew);
+        intentService.withdraw(TestIntentServiceHelper.eqExceptId(intent));
+        intentService.submit(TestIntentServiceHelper.eqExceptId(intentNew));
         replay(intentService);
 
         // Call the processRouteAdd() method in Router class
@@ -352,15 +356,18 @@
         assertEquals(router.getRoutes().size(), 1);
         assertTrue(router.getRoutes().contains(routeEntryUpdate));
         assertEquals(intentSynchronizer.getRouteIntents().size(), 1);
-        assertEquals(intentSynchronizer.getRouteIntents().iterator().next(),
-                intentNew);
+        Intent firstIntent =
+            intentSynchronizer.getRouteIntents().iterator().next();
+        IntentKey firstIntentKey = new IntentKey(firstIntent);
+        IntentKey intentNewKey = new IntentKey(intentNew);
+        assertTrue(firstIntentKey.equals(intentNewKey));
         verify(intentService);
     }
 
     /**
      * This method tests deleting a route entry.
      */
-    @Test @Ignore("needs fix from intents")
+    @Test
     public void testProcessRouteDelete() throws TestUtilsException {
         // Firstly add a route
         testProcessRouteAdd();
@@ -391,7 +398,7 @@
 
         // Set up expectation
         reset(intentService);
-        intentService.withdraw(intent);
+        intentService.withdraw(TestIntentServiceHelper.eqExceptId(intent));
         replay(intentService);
 
         // Call route deleting method in Router class