From 33b81f296794568e0b5919c110259a56cad6bf41 Mon Sep 17 00:00:00 2001
From: Jonathan Hart <jono@onlab.us>
Date: Fri, 5 Feb 2016 09:25:50 -0800
Subject: [PATCH] Move TestIntentServiceHelper to routing-api bundle

Change-Id: I4c476cb89400e2eb14e0fc5f3db96c2886708244
---
 apps/routing-api/pom.xml                              |  6 ++++++
 .../onosproject/routing}/TestIntentServiceHelper.java | 11 +++++------
 .../sdnip/PeerConnectivityManagerTest.java            |  2 +-
 .../test/java/org/onosproject/sdnip/SdnIpFibTest.java |  2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)
 rename apps/{sdnip/src/test/java/org/onosproject/sdnip => routing-api/src/test/java/org/onosproject/routing}/TestIntentServiceHelper.java (91%)

diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index a7f806a855..d24580b567 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -78,5 +78,11 @@
             <artifactId>onlab-junit</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java b/apps/routing-api/src/test/java/org/onosproject/routing/TestIntentServiceHelper.java
similarity index 91%
rename from apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
rename to apps/routing-api/src/test/java/org/onosproject/routing/TestIntentServiceHelper.java
index da17c78686..69db68162f 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
+++ b/apps/routing-api/src/test/java/org/onosproject/routing/TestIntentServiceHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 Open Networking Laboratory
+ * Copyright 2016 Open Networking Laboratory
  *
  * Licensed under the Apache License, Version 2.0 (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
  * limitations under the License.
  */
-package org.onosproject.sdnip;
+package org.onosproject.routing;
 
+import org.easymock.EasyMock;
 import org.easymock.IArgumentMatcher;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentUtils;
 
-import static org.easymock.EasyMock.reportMatcher;
-
 /**
  * Helper class for testing operations submitted to the IntentService.
  */
@@ -38,8 +37,8 @@ public final class TestIntentServiceHelper {
      * @param intent the expected 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;
     }
 
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
index 0dcc969d45..cfb0c79379 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
@@ -68,7 +68,7 @@ import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
-import static org.onosproject.sdnip.TestIntentServiceHelper.eqExceptId;
+import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
 
 /**
  * Unit tests for PeerConnectivityManager.
diff --git a/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
index 5c3243ff63..1c70276dfd 100644
--- a/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
+++ b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
@@ -61,7 +61,7 @@ import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
 import static org.easymock.EasyMock.verify;
-import static org.onosproject.sdnip.TestIntentServiceHelper.eqExceptId;
+import static org.onosproject.routing.TestIntentServiceHelper.eqExceptId;
 
 /**
  * Unit tests for SdnIpFib.