X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FAbstractRaftActorIntegrationTest.java;h=0b072e67f56039b42cc7f860e4d9f6eaa82e37ff;hp=ab44654b6fcefcee29164a7b772f91b971191286;hb=93e6f3bfc003d4ce2d968761dff963615a0b799d;hpb=4816cd33c7b70012b11dd4efc6dbb01218f8cef0 diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java index ab44654b6f..0b072e67f5 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java @@ -36,7 +36,7 @@ import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.cluster.raft.utils.MessageCollectorActor; import org.opendaylight.yangtools.concepts.Identifier; -import org.opendaylight.yangtools.util.StringIdentifier; +import org.opendaylight.yangtools.util.AbstractStringIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.concurrent.duration.FiniteDuration; @@ -48,6 +48,14 @@ import scala.concurrent.duration.FiniteDuration; */ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest { + private static final class MockIdentifier extends AbstractStringIdentifier { + private static final long serialVersionUID = 1L; + + protected MockIdentifier(String string) { + super(string); + } + } + public static class SetPeerAddress { private final String peerId; private final String peerAddress; @@ -92,7 +100,7 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest public void handleCommand(Object message) { if(message instanceof MockPayload) { MockPayload payload = (MockPayload)message; - super.persistData(collectorActor, new StringIdentifier(payload.toString()), payload); + super.persistData(collectorActor, new MockIdentifier(payload.toString()), payload); return; } @@ -297,7 +305,7 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest String expId, long expTerm, long expIndex, MockPayload payload) { assertEquals("ApplyState getClientActor", expClientActor, applyState.getClientActor()); - final Identifier id = expId == null ? null : new StringIdentifier(expId); + final Identifier id = expId == null ? null : new MockIdentifier(expId); assertEquals("ApplyState getIdentifier", id, applyState.getIdentifier()); ReplicatedLogEntry replicatedLogEntry = applyState.getReplicatedLogEntry(); verifyReplicatedLogEntry(replicatedLogEntry, expTerm, expIndex, payload);