This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4e5bd273c640eb79c4947b22d56a68784b039c52 Merge: 6fa5300 60cf948 Author: Andrés de la Peña <[email protected]> AuthorDate: Tue Apr 20 18:53:46 2021 +0100 Merge branch 'cassandra-3.11' into trunk .../org/apache/cassandra/gms/ShadowRoundTest.java | 6 +++--- .../cassandra/net/MockMessagingServiceTest.java | 6 +++--- .../org/apache/cassandra/net/MockMessagingSpy.java | 20 +++++++++++++++----- 3 files changed, 21 insertions(+), 11 deletions(-) diff --cc test/unit/org/apache/cassandra/gms/ShadowRoundTest.java index 2bcbc50,bc18813..2198821 --- a/test/unit/org/apache/cassandra/gms/ShadowRoundTest.java +++ b/test/unit/org/apache/cassandra/gms/ShadowRoundTest.java @@@ -111,10 -107,10 +111,10 @@@ public class ShadowRoundTes } // we expect one SYN for each seed during shadow round + additional SYNs after gossiper has been enabled - assertTrue(spySyn.messagesIntercepted > noOfSeeds); + assertTrue(spySyn.messagesIntercepted() > noOfSeeds); - // we don't expect to emit any GOSSIP_DIGEST_ACK2 or MIGRATION_REQUEST messages + // we don't expect to emit any GOSSIP_DIGEST_ACK2 or SCHEMA_PULL messages - assertEquals(0, spyAck2.messagesIntercepted); - assertEquals(0, spyMigrationReq.messagesIntercepted); + assertEquals(0, spyAck2.messagesIntercepted()); + assertEquals(0, spyMigrationReq.messagesIntercepted()); } } diff --cc test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java index e4787f7,ab97aaa..8023162 --- a/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java +++ b/test/unit/org/apache/cassandra/net/MockMessagingServiceTest.java @@@ -24,7 -25,9 +24,8 @@@ import org.junit.BeforeClass import org.junit.Test; import org.apache.cassandra.SchemaLoader; + import org.apache.cassandra.Util; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.gms.EchoMessage; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; @@@ -33,8 -35,7 +34,7 @@@ import static org.apache.cassandra.net. import static org.apache.cassandra.net.MockMessagingService.to; import static org.apache.cassandra.net.MockMessagingService.verb; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertSame; - import static org.junit.Assert.assertTrue; public class MockMessagingServiceTest { @@@ -73,11 -86,11 +73,11 @@@ }); // we must have intercepted the outgoing message at this point - MessageOut<?> msg = spy.captureMessageOut().get(); + Message<?> msg = spy.captureMessageOut().get(); - assertEquals(1, spy.messagesIntercepted); + assertEquals(1, spy.messagesIntercepted()); - assertTrue(msg == echoMessageOut); + assertSame(echoMessage.payload, msg.payload); // and return a mocked response - assertEquals(1, spy.mockedMessageResponses); + Util.spinAssertEquals(1, spy::mockedMessageResponses, 60); } } diff --cc test/unit/org/apache/cassandra/net/MockMessagingSpy.java index c61c301,2219c5a..2197787 --- a/test/unit/org/apache/cassandra/net/MockMessagingSpy.java +++ b/test/unit/org/apache/cassandra/net/MockMessagingSpy.java @@@ -41,11 -41,11 +42,11 @@@ public class MockMessagingSp { private static final Logger logger = LoggerFactory.getLogger(MockMessagingSpy.class); - public int messagesIntercepted = 0; - public int mockedMessageResponses = 0; + private final AtomicInteger messagesIntercepted = new AtomicInteger(); + private final AtomicInteger mockedMessageResponses = new AtomicInteger(); - private final BlockingQueue<MessageOut<?>> interceptedMessages = new LinkedBlockingQueue<>(); - private final BlockingQueue<MessageIn<?>> deliveredResponses = new LinkedBlockingQueue<>(); + private final BlockingQueue<Message<?>> interceptedMessages = new LinkedBlockingQueue<>(); + private final BlockingQueue<Message<?>> deliveredResponses = new LinkedBlockingQueue<>(); private static final Executor executor = Executors.newSingleThreadExecutor(); @@@ -131,16 -131,26 +132,26 @@@ return ret; } + public int messagesIntercepted() + { + return messagesIntercepted.get(); + } + + public int mockedMessageResponses() + { + return mockedMessageResponses.get(); + } + - void matchingMessage(MessageOut<?> message) + void matchingMessage(Message<?> message) { - messagesIntercepted++; + messagesIntercepted.incrementAndGet(); logger.trace("Received matching message: {}", message); interceptedMessages.add(message); } - void matchingResponse(MessageIn<?> response) + void matchingResponse(Message<?> response) { - mockedMessageResponses++; + mockedMessageResponses.incrementAndGet(); logger.trace("Responding to intercepted message: {}", response); deliveredResponses.add(response); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
