From 31dfd74ec248bd977fde1aaa222da650cbb06a95 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 22 Aug 2018 11:43:53 +0200 Subject: [PATCH] Migrate to expectNoMessage() expectNoMsg() has been deprecated, move to its replacement. Change-Id: I51fc5dc28fd8131b76ca00d254de06403e06de69 Signed-off-by: Robert Varga --- .../cluster/access/client/ActorBehaviorTest.java | 2 +- .../client/ReconnectingClientConnectionTest.java | 2 +- .../access/client/TransmittingTransmitQueueTest.java | 4 ++-- .../datastore/DataTreeChangeListenerActorTest.java | 2 +- .../datastore/DataTreeChangeListenerProxyTest.java | 6 +++--- .../datastore/RemoteTransactionContextTest.java | 4 ++-- .../CandidateListChangeListenerTest.java | 2 +- .../ShardManagerGetSnapshotReplyActorTest.java | 2 +- .../datastore/shardmanager/ShardManagerTest.java | 10 +++++----- .../cluster/datastore/utils/ActorContextTest.java | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java index 793b0b48fb..d299381a13 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ActorBehaviorTest.java @@ -140,7 +140,7 @@ public class ActorBehaviorTest { probe.expectMsgClass(MockedSnapshotStore.DeleteByCriteriaRequest.class); probe.reply(new RuntimeException("delete failed")); //actor shouldn't terminate - probe.expectNoMsg(); + probe.expectNoMessage(); } @SuppressWarnings("unchecked") diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnectionTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnectionTest.java index 8ce7530bb0..564de902bf 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnectionTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ReconnectingClientConnectionTest.java @@ -62,7 +62,7 @@ public class ReconnectingClientConnectionTest final Consumer> callback = mock(Consumer.class); final Request request = createRequest(replyToProbe.ref()); connection.sendRequest(request, callback); - backendProbe.expectNoMsg(); + backendProbe.expectNoMessage(); final LocalHistoryIdentifier historyId = new LocalHistoryIdentifier(CLIENT_ID, 0L); final RequestSuccess message = new TransactionAbortSuccess(new TransactionIdentifier(historyId, 0L), 0L); final ResponseEnvelope envelope = new SuccessEnvelope(message, 0L, 0L, 0L); diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/TransmittingTransmitQueueTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/TransmittingTransmitQueueTest.java index 8db4803c43..f1bceeea4c 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/TransmittingTransmitQueueTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/TransmittingTransmitQueueTest.java @@ -123,7 +123,7 @@ public class TransmittingTransmitQueueTest extends AbstractTransmitQueueTest entries = queue.drain(); assertEquals(sentMessages, entries.size()); assertThat(entries, everyItem(entryWithRequest(request))); @@ -288,7 +288,7 @@ public class TransmittingTransmitQueueTest extends AbstractTransmitQueueTest request2 = new TransactionPurgeRequest(TRANSACTION_IDENTIFIER, 1L, probe.ref()); queue.enqueueOrForward(new ConnectionEntry(request2, mockConsumer, now), now); verifyNoMoreInteractions(mockMessageSlicer); - probe.expectNoMsg(); + probe.expectNoMessage(); RequestEnvelope requestEnvelope = (RequestEnvelope) sliceOptions.getValue().getMessage(); queue.complete(new FailureEnvelope(request.toRequestFailure(mock(RequestException.class)), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java index 726b29007a..627e434e5b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerActorTest.java @@ -62,7 +62,7 @@ public class DataTreeChangeListenerActorTest extends AbstractActorTest { subject.tell(new DataTreeChanged(mockCandidates), getRef()); within(duration("1 seconds"), () -> { - expectNoMsg(); + expectNoMessage(); Mockito.verify(mockListener, Mockito.never()) .onDataTreeChanged(Matchers.anyCollectionOf(DataTreeCandidate.class)); return null; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java index 399b3e2d36..aac23e725b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DataTreeChangeListenerProxyTest.java @@ -94,7 +94,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest { proxy.close(); - expectNoMsg(); + expectNoMessage(); } }; } @@ -150,7 +150,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest { reply(new LocalShardNotFound("shard-1")); - expectNoMsg(duration("1 seconds")); + expectNoMessage(duration("1 seconds")); proxy.close(); } @@ -177,7 +177,7 @@ public class DataTreeChangeListenerProxyTest extends AbstractActorTest { reply(new NotInitializedException("not initialized")); within(duration("1 seconds"), () -> { - expectNoMsg(); + expectNoMessage(); return null; }); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextTest.java index 3f9b81343d..cd6e066b43 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/RemoteTransactionContextTest.java @@ -122,7 +122,7 @@ public class RemoteTransactionContextTest extends AbstractActorTest { } }); - kit.expectNoMsg(); + kit.expectNoMessage(); } /** @@ -158,7 +158,7 @@ public class RemoteTransactionContextTest extends AbstractActorTest { } }); - kit.expectNoMsg(); + kit.expectNoMessage(); } private void sendReply(final Object message) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/CandidateListChangeListenerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/CandidateListChangeListenerTest.java index bc2f6110d8..e3ae265627 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/CandidateListChangeListenerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/entityownership/CandidateListChangeListenerTest.java @@ -72,7 +72,7 @@ public class CandidateListChangeListenerTest extends AbstractActorTest { ImmutableSet.copyOf(candidateAdded.getAllCandidates())); writeNode(ENTITY_OWNERS_PATH, entityOwnersWithCandidate(ENTITY_TYPE, ENTITY_ID1, memberName1)); - kit.expectNoMsg(FiniteDuration.create(500, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(FiniteDuration.create(500, TimeUnit.MILLISECONDS)); String memberName2 = "member-2"; writeNode(ENTITY_OWNERS_PATH, entityOwnersWithCandidate(ENTITY_TYPE, ENTITY_ID1, memberName2)); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java index 0f70170df2..752c8e169e 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java @@ -62,7 +62,7 @@ public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest { Snapshot.create(shard2SnapshotState, Collections.emptyList(), 2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender()); - kit.expectNoMsg(FiniteDuration.create(500, TimeUnit.MILLISECONDS)); + kit.expectNoMessage(FiniteDuration.create(500, TimeUnit.MILLISECONDS)); ByteState shard3SnapshotState = ByteState.of(new byte[]{7,8,9}); replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard3", MEMBER_1, "config").toString(), diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java index 048c0c84b5..bfb4129790 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerTest.java @@ -526,18 +526,18 @@ public class ShardManagerTest extends AbstractShardManagerTest { // RoleChangeNotification. shardManager.tell(new FindPrimary(Shard.DEFAULT_NAME, true), getRef()); - expectNoMsg(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); + expectNoMessage(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); shardManager.tell(new ActorInitialized(), mockShardActor); - expectNoMsg(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); + expectNoMessage(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); String memberId = "member-1-shard-default-" + shardMrgIDSuffix; shardManager.tell( new RoleChangeNotification(memberId, RaftState.Candidate.name(), RaftState.Leader.name()), mockShardActor); - expectNoMsg(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); + expectNoMessage(FiniteDuration.create(150, TimeUnit.MILLISECONDS)); DataTree mockDataTree = mock(DataTree.class); shardManager.tell(new ShardLeaderStateChanged(memberId, memberId, mockDataTree, @@ -549,7 +549,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { primaryFound.getPrimaryPath().contains("member-1-shard-default")); assertSame("getLocalShardDataTree", mockDataTree, primaryFound.getLocalShardDataTree()); - expectNoMsg(FiniteDuration.create(200, TimeUnit.MILLISECONDS)); + expectNoMessage(FiniteDuration.create(200, TimeUnit.MILLISECONDS)); } }; @@ -571,7 +571,7 @@ public class ShardManagerTest extends AbstractShardManagerTest { shardManager.tell(new ActorInitialized(), mockShardActor); - expectNoMsg(FiniteDuration.create(200, TimeUnit.MILLISECONDS)); + expectNoMessage(FiniteDuration.create(200, TimeUnit.MILLISECONDS)); } }; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java index 22cc77f88b..a1ff319c36 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/utils/ActorContextTest.java @@ -156,7 +156,7 @@ public class ActorContextTest extends AbstractActorTest { assertEquals(shardActorRef, out.get()); - expectNoMsg(); + expectNoMessage(); return null; }); } -- 2.36.6