commit fa891c9a0fea23d286887f2be64fab42b63b0d6e
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:21:40 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:28:45 2014 -0700
tree 2312c9dcf39e56cca2d0e09f846966bc19b34483
parent 89791c6079e6f54e73c638a094b7ebaa6ad1caea

Revert "Refactoring to move code to right locations. Attempt at breaking dependency cycles."

This reverts commit 58819b4dcc697f63872bee9f3ddd41a0c4d8fca5.

core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java

diff --git a/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java b/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
index 53fafd3..2e92f5b 100644
--- a/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
+++ b/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
@@ -2,16 +2,13 @@
 
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.MastershipRole;
-import org.onlab.onos.net.device.DeviceMastershipListener;
-import org.onlab.onos.net.device.DeviceMastershipService;
-import org.onlab.onos.net.device.DeviceMastershipTermService;
 
 import java.util.Set;
 
 /**
  * Test adapter for mastership service.
  */
-public class MastershipServiceAdapter implements DeviceMastershipService {
+public class MastershipServiceAdapter implements MastershipService {
     @Override
     public MastershipRole getLocalRole(DeviceId deviceId) {
         return null;
@@ -37,15 +34,15 @@
     }
 
     @Override
-    public void addListener(DeviceMastershipListener listener) {
+    public void addListener(MastershipListener listener) {
     }
 
     @Override
-    public void removeListener(DeviceMastershipListener listener) {
+    public void removeListener(MastershipListener listener) {
     }
 
     @Override
-    public DeviceMastershipTermService requestTermService() {
+    public MastershipTermService requestTermService() {
         return null;
     }
 }

core/api/src/test/java/org/onlab/onos/cluster/MastershipTermTest.java

diff --git a/core/api/src/test/java/org/onlab/onos/cluster/MastershipTermTest.java b/core/api/src/test/java/org/onlab/onos/cluster/MastershipTermTest.java
index 87faf52..139c695 100644
--- a/core/api/src/test/java/org/onlab/onos/cluster/MastershipTermTest.java
+++ b/core/api/src/test/java/org/onlab/onos/cluster/MastershipTermTest.java
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
-import org.onlab.onos.net.device.DeviceMastershipTerm;
 
 import com.google.common.testing.EqualsTester;
 
@@ -12,10 +11,10 @@
     private static final NodeId N1 = new NodeId("foo");
     private static final NodeId N2 = new NodeId("bar");
 
-    private static final DeviceMastershipTerm TERM1 = DeviceMastershipTerm.of(N1, 0);
-    private static final DeviceMastershipTerm TERM2 = DeviceMastershipTerm.of(N2, 1);
-    private static final DeviceMastershipTerm TERM3 = DeviceMastershipTerm.of(N2, 1);
-    private static final DeviceMastershipTerm TERM4 = DeviceMastershipTerm.of(N1, 1);
+    private static final MastershipTerm TERM1 = MastershipTerm.of(N1, 0);
+    private static final MastershipTerm TERM2 = MastershipTerm.of(N2, 1);
+    private static final MastershipTerm TERM3 = MastershipTerm.of(N2, 1);
+    private static final MastershipTerm TERM4 = MastershipTerm.of(N1, 1);
 
     @Test
     public void basics() {
@@ -25,7 +24,7 @@
 
     @Test
     public void testEquality() {
-        new EqualsTester().addEqualityGroup(DeviceMastershipTerm.of(N1, 0), TERM1)
+        new EqualsTester().addEqualityGroup(MastershipTerm.of(N1, 0), TERM1)
         .addEqualityGroup(TERM2, TERM3)
         .addEqualityGroup(TERM4);
     }