X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-clustering-commons%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fcommon%2Factor%2FMessageTrackerTest.java;h=f1c3eae731da0543bd030f91856a3e64e2e6630a;hb=HEAD;hp=896fd3c93930731d2cf1348d5a1dfc770b34d702;hpb=4e696d9795fe7eef40369c05c340d137394126f3;p=controller.git diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java index 896fd3c939..f1c3eae731 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/common/actor/MessageTrackerTest.java @@ -10,10 +10,11 @@ package org.opendaylight.controller.cluster.common.actor; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import com.google.common.testing.FakeTicker; import java.util.List; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; @@ -26,12 +27,12 @@ public class MessageTrackerTest { private static final Logger LOG = LoggerFactory.getLogger(MessageTrackerTest.class); - private TestTicker ticker; + private FakeTicker ticker; private MessageTracker messageTracker; @Before public void setup() { - ticker = new TestTicker(); + ticker = new FakeTicker(); messageTracker = new MessageTracker(Foo.class, 10, ticker); } @@ -40,7 +41,7 @@ public class MessageTrackerTest { MessageTracker.Context context1 = messageTracker.received(new Foo()); context1.close(); - ticker.increment(MILLISECONDS.toNanos(20)); + ticker.advance(20, MILLISECONDS); MessageTracker.Context context2 = messageTracker.received(new Foo()); context2.close(); } @@ -52,12 +53,11 @@ public class MessageTrackerTest { MessageTracker.Context context1 = messageTracker.received(new Foo()); context1.close(); - ticker.increment(MILLISECONDS.toNanos(20)); + ticker.advance(20, MILLISECONDS); MessageTracker.Context context2 = messageTracker.received(new Foo()); - Assert.assertEquals(true, context2.error().isPresent()); - Assert.assertEquals(0, context2.error().get().getMessageProcessingTimesSinceLastExpectedMessage().size()); - + assertEquals(true, context2.error().isPresent()); + assertEquals(0, context2.error().orElseThrow().getMessageProcessingTimesSinceLastExpectedMessage().size()); } @Test @@ -71,32 +71,31 @@ public class MessageTrackerTest { messageTracker.received(10L).close(); MessageTracker.Context context = messageTracker.received(100); - ticker.increment(MILLISECONDS.toNanos(20)); + ticker.advance(20, MILLISECONDS); context.close(); MessageTracker.Context context2 = messageTracker.received(new Foo()); - Assert.assertEquals(true, context2.error().isPresent()); + assertEquals(true, context2.error().isPresent()); - MessageTracker.Error error = context2.error().get(); + MessageTracker.Error error = context2.error().orElseThrow(); List messageProcessingTimes = error.getMessageProcessingTimesSinceLastExpectedMessage(); - Assert.assertEquals(3, messageProcessingTimes.size()); + assertEquals(3, messageProcessingTimes.size()); - Assert.assertEquals(String.class, messageProcessingTimes.get(0).getMessageClass()); - Assert.assertEquals(Long.class, messageProcessingTimes.get(1).getMessageClass()); - Assert.assertEquals(Integer.class, messageProcessingTimes.get(2).getMessageClass()); - Assert.assertTrue(messageProcessingTimes.get(2).getElapsedTimeInNanos() > MILLISECONDS.toNanos(10)); - Assert.assertEquals(Foo.class, error.getLastExpectedMessage().getClass()); - Assert.assertEquals(Foo.class, error.getCurrentExpectedMessage().getClass()); + assertEquals(String.class, messageProcessingTimes.get(0).getMessageClass()); + assertEquals(Long.class, messageProcessingTimes.get(1).getMessageClass()); + assertEquals(Integer.class, messageProcessingTimes.get(2).getMessageClass()); + assertTrue(messageProcessingTimes.get(2).getElapsedTimeInNanos() > MILLISECONDS.toNanos(10)); + assertEquals(Foo.class, error.getLastExpectedMessage().getClass()); + assertEquals(Foo.class, error.getCurrentExpectedMessage().getClass()); LOG.error("An error occurred : {}" , error); } - @Test public void testMetExpectationOnTracking() { messageTracker.begin(); @@ -104,11 +103,10 @@ public class MessageTrackerTest { MessageTracker.Context context1 = messageTracker.received(new Foo()); context1.close(); - ticker.increment(MILLISECONDS.toNanos(1)); + ticker.advance(1, MILLISECONDS); MessageTracker.Context context2 = messageTracker.received(new Foo()); - Assert.assertEquals(false, context2.error().isPresent()); - + assertEquals(false, context2.error().isPresent()); } @Test @@ -117,12 +115,7 @@ public class MessageTrackerTest { messageTracker.received(new Foo()); - try { - messageTracker.received(new Foo()); - fail("Expected an IllegalStateException"); - } catch (IllegalStateException e) { - // expected - } + assertThrows(IllegalStateException.class, () -> messageTracker.received(new Foo())); } @Test @@ -135,19 +128,19 @@ public class MessageTrackerTest { public void testDelayInFirstExpectedMessageArrival() { messageTracker.begin(); - ticker.increment(MILLISECONDS.toNanos(20)); + ticker.advance(20, MILLISECONDS); MessageTracker.Context context = messageTracker.received(new Foo()); - Assert.assertEquals(true, context.error().isPresent()); + assertEquals(true, context.error().isPresent()); - MessageTracker.Error error = context.error().get(); + MessageTracker.Error error = context.error().orElseThrow(); - Assert.assertEquals(null, error.getLastExpectedMessage()); - Assert.assertEquals(Foo.class, error.getCurrentExpectedMessage().getClass()); + assertEquals(null, error.getLastExpectedMessage()); + assertEquals(Foo.class, error.getCurrentExpectedMessage().getClass()); String errorString = error.toString(); - Assert.assertTrue(errorString.contains("Last Expected Message = null")); + assertTrue(errorString.contains("Last Expected Message = null")); LOG.error("An error occurred : {}", error); } @@ -156,14 +149,13 @@ public class MessageTrackerTest { public void testCallingBeginDoesNotResetWatch() { messageTracker.begin(); - ticker.increment(MILLISECONDS.toNanos(20)); + ticker.advance(20, MILLISECONDS); messageTracker.begin(); MessageTracker.Context context = messageTracker.received(new Foo()); - Assert.assertEquals(true, context.error().isPresent()); - + assertEquals(true, context.error().isPresent()); } @Test @@ -172,20 +164,18 @@ public class MessageTrackerTest { messageTracker.begin(); try (MessageTracker.Context ctx = messageTracker.received(45)) { - Assert.assertEquals(false, ctx.error().isPresent()); + assertEquals(false, ctx.error().isPresent()); } try (MessageTracker.Context ctx = messageTracker.received(45L)) { - Assert.assertEquals(false, ctx.error().isPresent()); + assertEquals(false, ctx.error().isPresent()); } List processingTimeList = messageTracker.getMessagesSinceLastExpectedMessage(); - Assert.assertEquals(2, processingTimeList.size()); + assertEquals(2, processingTimeList.size()); assertEquals(Integer.class, processingTimeList.get(0).getMessageClass()); assertEquals(Long.class, processingTimeList.get(1).getMessageClass()); - } - }