Changing Intent Ids to use explicit id assignment
Change-Id: I5a4bff87842c37a869e7691b353529eaefc929db
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentOperationsTest.java b/core/api/src/test/java/org/onlab/onos/net/intent/IntentOperationsTest.java
index eea5fec..a2c5f09 100644
--- a/core/api/src/test/java/org/onlab/onos/net/intent/IntentOperationsTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/intent/IntentOperationsTest.java
@@ -17,7 +17,10 @@
import java.util.List;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
+import org.onlab.onos.core.IdGenerator;
import org.onlab.onos.net.ConnectPoint;
import org.onlab.onos.net.NetTestTools;
import org.onlab.onos.net.flow.TrafficSelector;
@@ -40,11 +43,24 @@
final TrafficSelector selector = new IntentTestsMocks.MockSelector();
final IntentTestsMocks.MockTreatment treatment = new IntentTestsMocks.MockTreatment();
- final Intent intent = new PointToPointIntent(NetTestTools.APP_ID,
- selector,
- treatment,
- ingress,
- egress);
+ private Intent intent;
+ protected IdGenerator idGenerator = new MockIdGenerator();
+
+ @Before
+ public void setUp() {
+ Intent.bindIdGenerator(idGenerator);
+
+ intent = new PointToPointIntent(NetTestTools.APP_ID,
+ selector,
+ treatment,
+ ingress,
+ egress);
+ }
+
+ @After
+ public void tearDown() {
+ Intent.unbindIdGenerator(idGenerator);
+ }
/**
* Checks that the IntentOperation and IntentOperations classes are immutable.