Fixes for ObjectiveTrackerTest and IntentServiceTest

Change-Id: I10acda2220c2012e0aa07493c2dc91b1a6a81109

@@ -31,9 +31,9 @@ import java.util.concurrent.Executors;
  */
  */
 public class FakeIntentManager implements TestableIntentService {
 public class FakeIntentManager implements TestableIntentService {
 
 
-    private final Map<IntentId, Intent> intents = new HashMap<>();
-    private final Map<IntentId, IntentState> intentStates = new HashMap<>();
-    private final Map<IntentId, List<Intent>> installables = new HashMap<>();
+    private final Map<Key, Intent> intents = new HashMap<>();
+    private final Map<Key, IntentState> intentStates = new HashMap<>();
+    private final Map<Key, List<Intent>> installables = new HashMap<>();
     private final Set<IntentListener> listeners = new HashSet<>();
     private final Set<IntentListener> listeners = new HashSet<>();
 
 
     private final Map<Class<? extends Intent>, IntentCompiler<? extends Intent>> compilers = new HashMap<>();
     private final Map<Class<? extends Intent>, IntentCompiler<? extends Intent>> compilers = new HashMap<>();
@@ -69,7 +69,7 @@ public class FakeIntentManager implements TestableIntentService {
             @Override
             @Override
             public void run() {
             public void run() {
                 try {
                 try {
-                    List<Intent> installable = getInstallable(intent.id());
+                    List<Intent> installable = getInstallable(intent.key());
                     executeWithdrawingPhase(intent, installable);
                     executeWithdrawingPhase(intent, installable);
                 } catch (IntentException e) {
                 } catch (IntentException e) {
                     exceptions.add(e);
                     exceptions.add(e);
@@ -123,7 +123,7 @@ public class FakeIntentManager implements TestableIntentService {
                 getInstaller(ii).install(ii);
                 getInstaller(ii).install(ii);
             }
             }
             setState(intent, IntentState.INSTALLED);
             setState(intent, IntentState.INSTALLED);
-            putInstallable(intent.id(), installable);
+            putInstallable(intent.key(), installable);
             dispatch(new IntentEvent(IntentEvent.Type.INSTALLED, intent));
             dispatch(new IntentEvent(IntentEvent.Type.INSTALLED, intent));
 
 
         } catch (IntentException e) {
         } catch (IntentException e) {
@@ -139,7 +139,7 @@ public class FakeIntentManager implements TestableIntentService {
             for (Intent ii : installable) {
             for (Intent ii : installable) {
                 getInstaller(ii).uninstall(ii);
                 getInstaller(ii).uninstall(ii);
             }
             }
-            removeInstallable(intent.id());
+            removeInstallable(intent.key());
             setState(intent, IntentState.WITHDRAWN);
             setState(intent, IntentState.WITHDRAWN);
             dispatch(new IntentEvent(IntentEvent.Type.WITHDRAWN, intent));
             dispatch(new IntentEvent(IntentEvent.Type.WITHDRAWN, intent));
         } catch (IntentException e) {
         } catch (IntentException e) {
@@ -151,19 +151,19 @@ public class FakeIntentManager implements TestableIntentService {
 
 
     // Sets the internal state for the given intent and dispatches an event
     // Sets the internal state for the given intent and dispatches an event
     private void setState(Intent intent, IntentState state) {
     private void setState(Intent intent, IntentState state) {
-        intentStates.put(intent.id(), state);
+        intentStates.put(intent.key(), state);
     }
     }
 
 
-    private void putInstallable(IntentId id, List<Intent> installable) {
-        installables.put(id, installable);
+    private void putInstallable(Key key, List<Intent> installable) {
+        installables.put(key, installable);
     }
     }
 
 
-    private void removeInstallable(IntentId id) {
-        installables.remove(id);
+    private void removeInstallable(Key key) {
+        installables.remove(key);
     }
     }
 
 
-    private List<Intent> getInstallable(IntentId id) {
-        List<Intent> installable = installables.get(id);
+    private List<Intent> getInstallable(Key key) {
+        List<Intent> installable = installables.get(key);
         if (installable != null) {
         if (installable != null) {
             return installable;
             return installable;
         } else {
         } else {
@@ -173,7 +173,7 @@ public class FakeIntentManager implements TestableIntentService {
 
 
     @Override
     @Override
     public void submit(Intent intent) {
     public void submit(Intent intent) {
-        intents.put(intent.id(), intent);
+        intents.put(intent.key(), intent);
         setState(intent, IntentState.INSTALL_REQ);
         setState(intent, IntentState.INSTALL_REQ);
         dispatch(new IntentEvent(IntentEvent.Type.INSTALL_REQ, intent));
         dispatch(new IntentEvent(IntentEvent.Type.INSTALL_REQ, intent));
         executeSubmit(intent);
         executeSubmit(intent);
@@ -181,7 +181,7 @@ public class FakeIntentManager implements TestableIntentService {
 
 
     @Override
     @Override
     public void withdraw(Intent intent) {
     public void withdraw(Intent intent) {
-        intents.remove(intent.id());
+        intents.remove(intent.key());
         executeWithdraw(intent);
         executeWithdraw(intent);
     }
     }
 
 

@@ -33,7 +33,6 @@ import java.util.Set;
 
 
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.net.flow.FlowRuleBatchOperation;
 import org.onosproject.net.flow.FlowRuleBatchOperation;
@@ -42,7 +41,6 @@ import org.onosproject.net.resource.LinkResourceAllocations;
 /**
 /**
  * Suite of tests for the intent service contract.
  * Suite of tests for the intent service contract.
  */
  */
-@Ignore
 public class IntentServiceTest {
 public class IntentServiceTest {
 
 
     public static final int IID = 123;
     public static final int IID = 123;

@@ -24,7 +24,6 @@ import java.util.concurrent.TimeUnit;
 
 
 import org.junit.After;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.Test;
 import org.onlab.junit.TestUtils;
 import org.onlab.junit.TestUtils;
 import org.onlab.junit.TestUtils.TestUtilsException;
 import org.onlab.junit.TestUtils.TestUtilsException;