X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-akka-raft%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fraft%2FReplicatedLogImplTest.java;h=8e9c6c9271f70d8a2becdcdb89f8cb236a3cdb3b;hb=f33beecf2a10955a9219757529ba3017079816cc;hp=6449f0afc841f7b0e8149c09fa549ad004eceac2;hpb=fa96da71c5ab10973a9f93c2e8b35494b96fd7ed;p=controller.git diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java index 6449f0afc8..8e9c6c9271 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImplTest.java @@ -8,30 +8,30 @@ package org.opendaylight.controller.cluster.raft; import static org.junit.Assert.assertEquals; -import static org.mockito.Matchers.same; +import static org.mockito.ArgumentMatchers.argThat; +import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import akka.japi.Procedure; +import com.google.common.util.concurrent.MoreExecutors; import java.util.Collections; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; -import org.hamcrest.Matcher; +import java.util.function.Consumer; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; +import org.mockito.ArgumentMatcher; import org.mockito.Mock; -import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.mockito.internal.matchers.Same; import org.opendaylight.controller.cluster.DataPersistenceProvider; import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockPayload; -import org.opendaylight.controller.cluster.raft.MockRaftActorContext.MockReplicatedLogEntry; import org.opendaylight.controller.cluster.raft.behaviors.RaftActorBehavior; import org.opendaylight.controller.cluster.raft.persisted.DeleteEntries; +import org.opendaylight.controller.cluster.raft.persisted.SimpleReplicatedLogEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,8 +57,8 @@ public class ReplicatedLogImplTest { MockitoAnnotations.initMocks(this); context = new RaftActorContextImpl(null, null, "test", - new ElectionTermImpl(mockPersistence, "test", LOG), - -1, -1, Collections.emptyMap(), configParams, mockPersistence, LOG); + new ElectionTermImpl(mockPersistence, "test", LOG), -1, -1, Collections.emptyMap(), + configParams, mockPersistence, applyState -> { }, LOG, MoreExecutors.directExecutor()); } private void verifyPersist(Object message) throws Exception { @@ -66,12 +66,12 @@ public class ReplicatedLogImplTest { } @SuppressWarnings({ "unchecked", "rawtypes" }) - private void verifyPersist(Object message, Matcher matcher, boolean async) throws Exception { + private void verifyPersist(Object message, ArgumentMatcher matcher, boolean async) throws Exception { ArgumentCaptor procedure = ArgumentCaptor.forClass(Procedure.class); if (async) { - verify(mockPersistence).persistAsync(Matchers.argThat(matcher), procedure.capture()); + verify(mockPersistence).persistAsync(argThat(matcher), procedure.capture()); } else { - verify(mockPersistence).persist(Matchers.argThat(matcher), procedure.capture()); + verify(mockPersistence).persist(argThat(matcher), procedure.capture()); } procedure.getValue().apply(message); @@ -82,7 +82,7 @@ public class ReplicatedLogImplTest { public void testAppendAndPersistExpectingNoCapture() throws Exception { ReplicatedLog log = ReplicatedLogImpl.newInstance(context); - MockReplicatedLogEntry logEntry1 = new MockReplicatedLogEntry(1, 1, new MockPayload("1")); + ReplicatedLogEntry logEntry1 = new SimpleReplicatedLogEntry(1, 1, new MockPayload("1")); log.appendAndPersist(logEntry1, null, true); @@ -92,13 +92,13 @@ public class ReplicatedLogImplTest { reset(mockPersistence); - MockReplicatedLogEntry logEntry2 = new MockReplicatedLogEntry(1, 2, new MockPayload("2")); - Procedure mockCallback = Mockito.mock(Procedure.class); + ReplicatedLogEntry logEntry2 = new SimpleReplicatedLogEntry(2, 1, new MockPayload("2")); + Consumer mockCallback = mock(Consumer.class); log.appendAndPersist(logEntry2, mockCallback, true); verifyPersist(logEntry2); - verify(mockCallback).apply(same(logEntry2)); + verify(mockCallback).accept(same(logEntry2)); assertEquals("size", 2, log.size()); } @@ -108,8 +108,8 @@ public class ReplicatedLogImplTest { public void testAppendAndPersisWithDuplicateEntry() throws Exception { ReplicatedLog log = ReplicatedLogImpl.newInstance(context); - Procedure mockCallback = Mockito.mock(Procedure.class); - MockReplicatedLogEntry logEntry = new MockReplicatedLogEntry(1, 1, new MockPayload("1")); + Consumer mockCallback = mock(Consumer.class); + ReplicatedLogEntry logEntry = new SimpleReplicatedLogEntry(1, 1, new MockPayload("1")); log.appendAndPersist(logEntry, mockCallback, true); @@ -134,8 +134,8 @@ public class ReplicatedLogImplTest { ReplicatedLog log = ReplicatedLogImpl.newInstance(context); - final MockReplicatedLogEntry logEntry1 = new MockReplicatedLogEntry(1, 2, new MockPayload("2")); - final MockReplicatedLogEntry logEntry2 = new MockReplicatedLogEntry(1, 3, new MockPayload("3")); + final ReplicatedLogEntry logEntry1 = new SimpleReplicatedLogEntry(2, 1, new MockPayload("2")); + final ReplicatedLogEntry logEntry2 = new SimpleReplicatedLogEntry(3, 1, new MockPayload("3")); log.appendAndPersist(logEntry1, null, true); verifyPersist(logEntry1); @@ -158,14 +158,14 @@ public class ReplicatedLogImplTest { ReplicatedLog log = ReplicatedLogImpl.newInstance(context); int dataSize = 600; - MockReplicatedLogEntry logEntry = new MockReplicatedLogEntry(1, 2, new MockPayload("2", dataSize)); + ReplicatedLogEntry logEntry = new SimpleReplicatedLogEntry(2, 1, new MockPayload("2", dataSize)); log.appendAndPersist(logEntry, null, true); verifyPersist(logEntry); reset(mockPersistence); - logEntry = new MockReplicatedLogEntry(1, 3, new MockPayload("3", 5)); + logEntry = new SimpleReplicatedLogEntry(3, 1, new MockPayload("3", 5)); log.appendAndPersist(logEntry, null, true); verifyPersist(logEntry); @@ -178,9 +178,9 @@ public class ReplicatedLogImplTest { ReplicatedLog log = ReplicatedLogImpl.newInstance(context); - log.append(new MockReplicatedLogEntry(1, 0, new MockPayload("0"))); - log.append(new MockReplicatedLogEntry(1, 1, new MockPayload("1"))); - log.append(new MockReplicatedLogEntry(1, 2, new MockPayload("2"))); + log.append(new SimpleReplicatedLogEntry(0, 1, new MockPayload("0"))); + log.append(new SimpleReplicatedLogEntry(1, 1, new MockPayload("1"))); + log.append(new SimpleReplicatedLogEntry(2, 1, new MockPayload("2"))); log.removeFromAndPersist(1); @@ -196,18 +196,7 @@ public class ReplicatedLogImplTest { verifyNoMoreInteractions(mockPersistence); } - public Matcher match(final DeleteEntries actual) { - return new BaseMatcher() { - @Override - public boolean matches(Object obj) { - DeleteEntries other = (DeleteEntries) obj; - return actual.getFromIndex() == other.getFromIndex(); - } - - @Override - public void describeTo(Description description) { - description.appendText("DeleteEntries: fromIndex: " + actual.getFromIndex()); - } - }; + public ArgumentMatcher match(final DeleteEntries actual) { + return other -> actual.getFromIndex() == other.getFromIndex(); } }