Move TestIntentServiceHelper to routing-api bundle

Change-Id: I4c476cb89400e2eb14e0fc5f3db96c2886708244

@@ -78,5 +78,11 @@
             <artifactId>onlab-junit</artifactId>
             <artifactId>onlab-junit</artifactId>
             <scope>test</scope>
             <scope>test</scope>
         </dependency>
         </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     </dependencies>
 </project>
 </project>

 /*
 /*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2016 Open Networking Laboratory
  *
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.sdnip;
+package org.onosproject.routing;
 
 
+import org.easymock.EasyMock;
 import org.easymock.IArgumentMatcher;
 import org.easymock.IArgumentMatcher;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentUtils;
 import org.onosproject.net.intent.IntentUtils;
 
 
-import static org.easymock.EasyMock.reportMatcher;
-
 /**
 /**
  * Helper class for testing operations submitted to the IntentService.
  * Helper class for testing operations submitted to the IntentService.
  */
  */
@@ -38,8 +37,8 @@ public final class TestIntentServiceHelper {
      * @param intent the expected Intent
      * @param intent the expected Intent
      * @return the submitted Intent
      * @return the submitted Intent
      */
      */
-    static Intent eqExceptId(Intent intent) {
-        reportMatcher(new IdAgnosticIntentMatcher(intent));
+    public static Intent eqExceptId(Intent intent) {
+        EasyMock.reportMatcher(new IdAgnosticIntentMatcher(intent));
         return intent;
         return intent;
     }
     }
 
 

@@ -68,7 +68,7 @@ import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
 import static org.easymock.EasyMock.verify;
-import static org.onosproject.sdnip.TestIntentServiceHelper.eqExceptId;
+import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
 
 
 /**
 /**
  * Unit tests for PeerConnectivityManager.
  * Unit tests for PeerConnectivityManager.

@@ -61,7 +61,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
 import static org.easymock.EasyMock.verify;
-import static org.onosproject.sdnip.TestIntentServiceHelper.eqExceptId;
+import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
 
 
 /**
 /**
  * Unit tests for SdnIpFib.
  * Unit tests for SdnIpFib.