commit f9af43c2ea2fefc6afc4e0d908c91985e9bae569
author Ray Milkey <ray@onlab.us> Mon Feb 09 16:45:48 2015 -0800
committer Brian O'Connor <bocon@onlab.us> Fri Feb 13 14:10:55 2015 -0800
tree 7bc97c87be2d53be4f5dffaefc3709cfa1d0ca04
parent 5811ac22857adc77a16e4cf8d504010ae1ad5d2a

Refactoring of IntentId based APIs

- getIntent
- getIntentState
- getInstallableIntents

Change-Id: I6d2073dfa165e0e5adcef46fe5908b563b481a43

core/net/src/test/java/org/onosproject/net/intent/impl/ObjectiveTrackerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/ObjectiveTrackerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/ObjectiveTrackerTest.java
index 02d206a..b324ae8 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/ObjectiveTrackerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/ObjectiveTrackerTest.java
@@ -32,7 +32,7 @@
 import org.onosproject.net.Link;
 import org.onosproject.net.NetworkResource;
 import org.onosproject.net.intent.Intent;
-import org.onosproject.net.intent.IntentId;
+import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.net.link.LinkEvent;
 import org.onosproject.net.resource.LinkResourceEvent;
@@ -49,6 +49,7 @@
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
+import static org.onosproject.net.NetTestTools.APP_ID;
 import static org.onosproject.net.NetTestTools.link;
 
 /**
@@ -99,13 +100,13 @@
     static class TestTopologyChangeDelegate implements TopologyChangeDelegate {
 
         CountDownLatch latch = new CountDownLatch(1);
-        List<IntentId> intentIdsFromEvent;
+        List<Key> intentIdsFromEvent;
         boolean compileAllFailedFromEvent;
 
         @Override
-        public void triggerCompile(Iterable<IntentId> intentIds,
+        public void triggerCompile(Iterable<Key> intentKeys,
                                    boolean compileAllFailed) {
-            intentIdsFromEvent = Lists.newArrayList(intentIds);
+            intentIdsFromEvent = Lists.newArrayList(intentKeys);
             compileAllFailedFromEvent = compileAllFailed;
             latch.countDown();
         }
@@ -199,9 +200,9 @@
                 topology,
                 reasons);
 
-        final IntentId intentId = IntentId.valueOf(0x333L);
+        final Key key = Key.of(0x333L, APP_ID);
         Collection<NetworkResource> resources = ImmutableSet.of(link);
-        tracker.addTrackedResources(intentId, resources);
+        tracker.addTrackedResources(key, resources);
 
         listener.event(event);
         assertThat(