mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-14 17:01:02 +02:00
Code Issues Projects Releases Wiki Activity

Move TestIntentServiceHelper to routing-api bundle

Browse Source 
Change-Id: I4c476cb89400e2eb14e0fc5f3db96c2886708244
This commit is contained in:
Jonathan Hart 2016-02-05 09:25:50 -08:00 committed by Gerrit Code Review
parent 0db36e7abd
commit 33b81f2967
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/routing-api/pom.xml
View File

@ -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>

11
apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java → apps/routing-api/src/test/java/org/onosproject/routing/TestIntentServiceHelper.java
View File

@ -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"); * 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) { public static Intent eqExceptId(Intent intent) {
reportMatcher(new IdAgnosticIntentMatcher(intent)); EasyMock.reportMatcher(new IdAgnosticIntentMatcher(intent));
return intent; return intent;
} }

2
apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
View File

@ -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.

2
apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpFibTest.java
View File

@ -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.