commit 2048c1f81ba3293553921be3653636099e76e767
author Thomas Vachuska <tom@onlab.us> Wed May 10 19:32:22 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Thu May 11 09:39:42 2017 -0700
tree 3c291e4d6719e69348622c29aff4278b6a216fc3
parent 3bdfa778357ab06f7e74d2de6cd5bbd61cd39561

Cleaning up intent tests setup/teardown to avoid cascading failures
with respect to binding ID generator.

Change-Id: Ia4778f16ff5a3ecb26062e7d7b2c36493081140d

core/api/src/test/java/org/onosproject/net/intent/IntentDataTest.java

diff --git a/core/api/src/test/java/org/onosproject/net/intent/IntentDataTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentDataTest.java
index de215c6..f7bb7a3 100644
--- a/core/api/src/test/java/org/onosproject/net/intent/IntentDataTest.java
+++ b/core/api/src/test/java/org/onosproject/net/intent/IntentDataTest.java
@@ -15,14 +15,12 @@
  */
 package org.onosproject.net.intent;
 
-import org.junit.After;
+import com.google.common.testing.EqualsTester;
 import org.junit.Before;
 import org.junit.Test;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.store.Timestamp;
 
-import com.google.common.testing.EqualsTester;
-
 import static junit.framework.TestCase.assertFalse;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -33,7 +31,7 @@
 /**
  * Unit tests for intent data objects.
  */
-public class IntentDataTest {
+public class IntentDataTest extends AbstractIntentTest {
 
     private Timestamp timestamp1;
     private Timestamp timestamp2;
@@ -53,10 +51,8 @@
     IdGenerator idGenerator;
 
     @Before
-    public void setUpTest() {
-        idGenerator = new MockIdGenerator();
-        Intent.unbindIdGenerator(idGenerator);
-        Intent.bindIdGenerator(idGenerator);
+    public void setUp() {
+        super.setUp();
 
         timestamp1 = new MockTimestamp(1);
         timestamp2 = new MockTimestamp(2);
@@ -74,11 +70,6 @@
         data3Copy = new IntentData(intent3, IntentState.INSTALLED, timestamp3);
     }
 
-    @After
-    public void tearDownTest() {
-        Intent.unbindIdGenerator(idGenerator);
-    }
-
     /**
      * Checks that intent data objects are properly constructed.
      */