commit 244f81f0139b1a5fe465bed495789047894dc8c8
author Yi Tseng <a86487817@gmail.com> Tue May 23 14:34:53 2017 -0700
committer Ray Milkey <ray@onlab.us> Wed May 24 14:37:27 2017 +0000
tree f871c6975699b39b250e2db1c3c4645ad7370e5f
parent f25adf0bcc8feb949a4318f7f381140543dff2e7

[ONOS-6505] Fix Incorrect Intent id generator from VPLS Intent test

Change-Id: I9d67eebce197b118e36bfc4a40a10791ad91121f

apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java

diff --git a/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java b/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java
index 7ee9292..3c10000 100644
--- a/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java
+++ b/apps/vpls/src/test/java/org/onosproject/vpls/VplsIntentTest.java
@@ -40,6 +40,7 @@
 import org.onosproject.net.intent.IntentServiceAdapter;
 import org.onosproject.net.intent.IntentUtils;
 import org.onosproject.net.intent.Key;
+import org.onosproject.net.intent.MockIdGenerator;
 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
 import org.onosproject.net.intent.SinglePointToMultiPointIntent;
 import org.onosproject.vpls.api.VplsData;
@@ -73,9 +74,7 @@
 
     @Before
     public void setUp() throws Exception {
-        idGenerator = new TestIdGenerator();
-        Intent.unbindIdGenerator(idGenerator);
-        Intent.bindIdGenerator(idGenerator);
+        MockIdGenerator.cleanBind();
         hostsAvailable = Sets.newHashSet();
         intentService = new TestIntentService();
         interfaceService = createMock(InterfaceService.class);
@@ -86,7 +85,7 @@
 
     @After
     public void tearDown() {
-        Intent.unbindIdGenerator(idGenerator);
+        MockIdGenerator.unbind();
     }
 
     /**