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/SdnIpTest.java

diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
index 0078650..ab26766 100644
--- a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
+++ b/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
@@ -22,7 +22,6 @@
 
 import org.easymock.IAnswer;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.onlab.junit.IntegrationTest;
@@ -200,7 +199,7 @@
      * @throws InterruptedException if interrupted while waiting on a latch
      * @throws TestUtilsException if exceptions when using TestUtils
      */
-    @Test @Ignore("needs fix from intents")
+    @Test
     public void testAddRoutes() throws InterruptedException, TestUtilsException {
         int numRoutes = 100;
 
@@ -220,7 +219,7 @@
             MultiPointToSinglePointIntent intent = getIntentForUpdate(update,
                     generateMacAddress(nextHopAddress),
                     egressConnectPoint);
-            intentService.submit(intent);
+            intentService.submit(TestIntentServiceHelper.eqExceptId(intent));
 
             expectLastCall().andAnswer(new IAnswer<Object>() {
                 @Override
@@ -262,7 +261,7 @@
      * @throws InterruptedException if interrupted while waiting on a latch
      * @throws TestUtilsException exceptions when using TestUtils
      */
-    @Test @Ignore("needs fix from intents")
+    @Test
     public void testDeleteRoutes() throws InterruptedException, TestUtilsException {
         int numRoutes = 100;
         List<RouteUpdate> routeUpdates = generateRouteUpdates(numRoutes);
@@ -281,7 +280,7 @@
             MultiPointToSinglePointIntent intent = getIntentForUpdate(update,
                     generateMacAddress(nextHopAddress),
                     egressConnectPoint);
-            intentService.submit(intent);
+            intentService.submit(TestIntentServiceHelper.eqExceptId(intent));
             expectLastCall().andAnswer(new IAnswer<Object>() {
                 @Override
                 public Object answer() throws Throwable {
@@ -289,7 +288,7 @@
                     return null;
                 }
             }).once();
-            intentService.withdraw(intent);
+            intentService.withdraw(TestIntentServiceHelper.eqExceptId(intent));
             expectLastCall().andAnswer(new IAnswer<Object>() {
                 @Override
                 public Object answer() throws Throwable {