commit d40483d52cf793c0f0fe047dd0a4ebfe01857d6e
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:20:30 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:28:45 2014 -0700
tree 7c201fc35f8059c79a1f4906475a21e7c37674dd
parent 74be6c43dfa3c0a062cceb2dcd3f04e4f57b4eb5

Revert "Refactored code in an attempt to break dependency cycles"

This reverts commit 195af6e6b27c23c7beb98f4cd425e7d7ffff1ecd.

core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java

diff --git a/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
index 6d5b31d..ab9e012 100644
--- a/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
+++ b/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
@@ -21,9 +21,9 @@
 import org.onlab.onos.net.DeviceId;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.LinkKey;
+import org.onlab.onos.net.MastershipRole;
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.SparseAnnotations;
-import org.onlab.onos.net.device.DeviceMastershipRole;
 import org.onlab.onos.net.device.DeviceMastershipTerm;
 import org.onlab.onos.net.provider.ProviderId;
 import org.onlab.packet.IpAddress;
@@ -115,7 +115,7 @@
         testSerialized(PIDA);
         testSerialized(new NodeId("bar"));
         testSerialized(DeviceMastershipTerm.of(new NodeId("foo"), 2));
-        for (DeviceMastershipRole role : DeviceMastershipRole.values()) {
+        for (MastershipRole role : MastershipRole.values()) {
             testSerialized(role);
         }
     }