This is an automated email from the ASF dual-hosted git repository. jbarrett pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
commit acc60cd3cfea498aa42447e6b4ae57156a0e832e Author: Jacob Barrett <jbarr...@pivotal.io> AuthorDate: Thu Apr 7 21:46:07 2022 -0700 GEODE-8228: Refactored to AssertJ. --- .../dunit/internal/JUnit4DistributedTestCase.java | 8 +- .../commands/WanCopyRegionCommandDUnitTest.java | 5 +- .../geode/internal/cache/wan/WANTestBase.java | 376 ++++++++++----------- ...ParallelGatewaySenderOperation_2_DUnitTest.java | 17 +- ...rallelGatewaySenderAlertThresholdDUnitTest.java | 26 +- .../parallel/ParallelWANConflationDUnitTest.java | 36 +- .../wan/parallel/ParallelWANStatsDUnitTest.java | 252 +++++++------- .../serial/SerialGatewaySenderQueueDUnitTest.java | 29 +- .../wan/serial/SerialWANConflationDUnitTest.java | 18 +- .../cache/wan/serial/SerialWANStatsDUnitTest.java | 9 +- 10 files changed, 385 insertions(+), 391 deletions(-) diff --git a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java index 6cfcccabf6..627fa7d66c 100644 --- a/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java +++ b/geode-dunit/src/main/java/org/apache/geode/test/dunit/internal/JUnit4DistributedTestCase.java @@ -23,7 +23,7 @@ import static org.apache.geode.test.dunit.DistributedTestUtils.getAllDistributed import static org.apache.geode.test.dunit.DistributedTestUtils.unregisterInstantiatorsInThisVM; import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM; import static org.apache.geode.test.dunit.Invoke.invokeInLocator; -import static org.junit.Assert.assertNotNull; +import static org.assertj.core.api.Assertions.assertThat; import java.io.File; import java.io.Serializable; @@ -349,7 +349,7 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur * name of the method. */ public final String getUniqueName() { - assertNotNull(getName()); + assertThat(getName()).isNotNull(); return getTestClass().getSimpleName() + "_" + getName(); } @@ -428,8 +428,8 @@ public abstract class JUnit4DistributedTestCase implements DistributedTestFixtur } private static void setUpVM(final String methodName, final String defaultDiskStoreName) { - assertNotNull("methodName must not be null", methodName); - assertNotNull("defaultDiskStoreName must not be null", defaultDiskStoreName); + assertThat(methodName).as("methodName must not be null").isNotNull(); + assertThat(defaultDiskStoreName).as("defaultDiskStoreName must not be null").isNotNull(); setTestMethodName(methodName); GemFireCacheImpl.setDefaultDiskStoreName(defaultDiskStoreName); setUpCreationStackGenerator(); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java index 7afcf88096..7ee8eece56 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/cache/wan/internal/cli/commands/WanCopyRegionCommandDUnitTest.java @@ -34,7 +34,6 @@ import static org.apache.geode.management.internal.cli.functions.WanCopyRegionFu import static org.apache.geode.test.awaitility.GeodeAwaitility.await; import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertNotNull; import java.text.NumberFormat; import java.text.ParseException; @@ -1359,13 +1358,13 @@ public class WanCopyRegionCommandDUnitTest extends WANTestBase { public static void removeEntry(String regionName, long key) { Region<?, ?> region = cache.getRegion(SEPARATOR + regionName); - assertNotNull(region); + assertThat(region).isNotNull(); region.remove(key); } public void sendRandomOpsFromClient(String regionName, Set<Long> keySet, int iterations) { Region<Long, Integer> region = cache.getRegion(SEPARATOR + regionName); - assertNotNull(region); + assertThat(region).isNotNull(); int min = 0; int max = 1000; for (int i = 0; i < iterations; i++) { diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java index 850287581b..1a99038815 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/WANTestBase.java @@ -42,13 +42,7 @@ import static org.apache.geode.test.dunit.Host.getHost; import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; import static org.apache.geode.test.util.ResourceUtils.createTempFileFromResource; import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import java.io.File; import java.io.IOException; @@ -1035,7 +1029,7 @@ public class WANTestBase extends DistributedTestCase { } catch (IOException e) { org.apache.geode.test.dunit.Assert.fail("Failed to start the Server", e); } - assertTrue(server1.isRunning()); + assertThat(server1.isRunning()).isTrue(); return server1.getPort(); } @@ -1177,7 +1171,7 @@ public class WANTestBase extends DistributedTestCase { // double check after moved all primary buckets primaryBucketIds = prQ.getDataStore().getAllLocalPrimaryBucketIds(); - assertTrue(primaryBucketIds.isEmpty()); + assertThat(primaryBucketIds.isEmpty()).isTrue(); } } @@ -1187,7 +1181,7 @@ public class WANTestBase extends DistributedTestCase { BecomePrimaryBucketResponse response = BecomePrimaryBucketMessage .send((InternalDistributedMember) destination, region, bucketId, true); - assertTrue(response.waitForResponse()); + assertThat(response.waitForResponse()).isTrue(); } public static int getSecondaryQueueSizeInStats(String senderId) { @@ -1200,9 +1194,10 @@ public class WANTestBase extends DistributedTestCase { AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId); GatewaySenderStats statistics = sender.getStatistics(); await() - .untilAsserted(() -> assertEquals("Expected queue size: " + expectedQueueSize - + " but actual size: " + statistics.getEventQueueSize(), expectedQueueSize, - statistics.getEventQueueSize())); + .untilAsserted(() -> assertThat(statistics.getEventQueueSize()).as( + "Expected queue size: " + expectedQueueSize + + " but actual size: " + statistics.getEventQueueSize()) + .isEqualTo(expectedQueueSize)); } public static void checkConnectionStats(String senderId) { @@ -1210,7 +1205,7 @@ public class WANTestBase extends DistributedTestCase { (AbstractGatewaySender) CacheFactory.getAnyInstance().getGatewaySender(senderId); Collection statsCollection = sender.getProxy().getEndpointManager().getAllStats().values(); - assertTrue(statsCollection.iterator().next() instanceof ConnectionStats); + assertThat(statsCollection.iterator().next() instanceof ConnectionStats).isTrue(); } public static List<Integer> getSenderStats(String senderId, final int expectedQueueSize) { @@ -1226,9 +1221,10 @@ public class WANTestBase extends DistributedTestCase { parallelGatewaySenderQueue.getRegions().toArray(new PartitionedRegion[1])[0]; } await() - .untilAsserted(() -> assertEquals("Expected queue entries: " + expectedQueueSize - + " but actual entries: " + regionQueue.size(), expectedQueueSize, - regionQueue.size())); + .untilAsserted(() -> assertThat(regionQueue.size()).as( + "Expected queue entries: " + expectedQueueSize + + " but actual entries: " + regionQueue.size()) + .isEqualTo(expectedQueueSize)); } ArrayList<Integer> stats = new ArrayList<>(); stats.add(statistics.getEventQueueSize()); @@ -1275,21 +1271,12 @@ public class WANTestBase extends DistributedTestCase { public static void checkQueueStats(String senderId, final int queueSize, final int eventsReceived, final int eventsQueued, final int eventsDistributed) { GatewaySenderStats statistics = getGatewaySenderStats(senderId); - assertEquals(queueSize, statistics.getEventQueueSize()); - assertEquals(eventsReceived, statistics.getEventsReceived()); - assertEquals(eventsQueued, statistics.getEventsQueued()); + assertThat(statistics.getEventQueueSize()).isEqualTo(queueSize); + assertThat(statistics.getEventsReceived()).isEqualTo(eventsReceived); + assertThat(statistics.getEventsQueued()).isEqualTo(eventsQueued); assert (statistics.getEventsDistributed() >= eventsDistributed); } - public static void validateGatewaySenderQueueHasContent(String senderId, VM... targetVms) { - await() - .until(() -> Arrays.stream(targetVms).map(vm -> vm.invoke(() -> { - AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId); - logger.info(displaySerialQueueContent(sender)); - return sender.getEventQueueSize(); - })).mapToInt(i -> i).sum(), greaterThan(0)); - } - public static void checkGatewayReceiverStats(int processBatches, int eventsReceived, int creates) { checkGatewayReceiverStats(processBatches, eventsReceived, creates, false); @@ -1301,22 +1288,22 @@ public class WANTestBase extends DistributedTestCase { GatewayReceiver receiver = gatewayReceivers.iterator().next(); CacheServerStats stats = ((CacheServerImpl) receiver.getServer()).getAcceptor().getStats(); - assertTrue(stats instanceof GatewayReceiverStats); + assertThat(stats instanceof GatewayReceiverStats).isTrue(); GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats) stats; if (isExact) { - assertTrue(gatewayReceiverStats.getProcessBatchRequests() == processBatches); + assertThat(gatewayReceiverStats.getProcessBatchRequests() == processBatches).isTrue(); } else { - assertTrue(gatewayReceiverStats.getProcessBatchRequests() >= processBatches); + assertThat(gatewayReceiverStats.getProcessBatchRequests() >= processBatches).isTrue(); } - assertEquals(eventsReceived, gatewayReceiverStats.getEventsReceived()); - assertEquals(creates, gatewayReceiverStats.getCreateRequest()); + assertThat(gatewayReceiverStats.getEventsReceived()).isEqualTo(eventsReceived); + assertThat(gatewayReceiverStats.getCreateRequest()).isEqualTo(creates); } public static List<Long> getReceiverStats() { Set<GatewayReceiver> gatewayReceivers = cache.getGatewayReceivers(); GatewayReceiver receiver = gatewayReceivers.iterator().next(); CacheServerStats stats = ((CacheServerImpl) receiver.getServer()).getAcceptor().getStats(); - assertTrue(stats instanceof GatewayReceiverStats); + assertThat(stats instanceof GatewayReceiverStats).isTrue(); GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats) stats; List<Long> statsList = new ArrayList<>(); statsList.add(gatewayReceiverStats.getEventsReceived()); @@ -1334,10 +1321,10 @@ public class WANTestBase extends DistributedTestCase { GatewayReceiver receiver = gatewayReceivers.iterator().next(); CacheServerStats stats = ((CacheServerImpl) receiver.getServer()).getAcceptor().getStats(); - assertTrue(stats instanceof GatewayReceiverStats); + assertThat(stats instanceof GatewayReceiverStats).isTrue(); GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats) stats; - assertTrue(gatewayReceiverStats.getProcessBatchRequests() >= processBatches); - assertTrue(gatewayReceiverStats.getEventsReceived() >= eventsReceived); + assertThat(gatewayReceiverStats.getProcessBatchRequests() >= processBatches).isTrue(); + assertThat(gatewayReceiverStats.getEventsReceived() >= eventsReceived).isTrue(); } public static void checkExceptionStats(int exceptionsOccurred) { @@ -1345,12 +1332,12 @@ public class WANTestBase extends DistributedTestCase { GatewayReceiver receiver = gatewayReceivers.iterator().next(); CacheServerStats stats = ((CacheServerImpl) receiver.getServer()).getAcceptor().getStats(); - assertTrue(stats instanceof GatewayReceiverStats); + assertThat(stats instanceof GatewayReceiverStats).isTrue(); GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats) stats; if (exceptionsOccurred == 0) { - assertEquals(exceptionsOccurred, gatewayReceiverStats.getExceptionsOccurred()); + assertThat(gatewayReceiverStats.getExceptionsOccurred()).isEqualTo(exceptionsOccurred); } else { - assertTrue(gatewayReceiverStats.getExceptionsOccurred() >= exceptionsOccurred); + assertThat(gatewayReceiverStats.getExceptionsOccurred() >= exceptionsOccurred).isTrue(); } } @@ -1360,29 +1347,28 @@ public class WANTestBase extends DistributedTestCase { GatewayReceiver receiver = gatewayReceivers.iterator().next(); CacheServerStats stats = ((CacheServerImpl) receiver.getServer()).getAcceptor().getStats(); - assertTrue(stats instanceof GatewayReceiverStats); + assertThat(stats instanceof GatewayReceiverStats).isTrue(); GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats) stats; - assertTrue(gatewayReceiverStats.getProcessBatchRequests() >= processBatches); - assertTrue(gatewayReceiverStats.getEventsReceived() >= eventsReceived); - assertTrue(gatewayReceiverStats.getCreateRequest() >= creates); + assertThat(gatewayReceiverStats.getProcessBatchRequests() >= processBatches).isTrue(); + assertThat(gatewayReceiverStats.getEventsReceived() >= eventsReceived).isTrue(); + assertThat(gatewayReceiverStats.getCreateRequest() >= creates).isTrue(); } public static void checkEventFilteredStats(String senderId, final int eventsFiltered) { GatewaySenderStats statistics = getGatewaySenderStats(senderId); - assertEquals(eventsFiltered, statistics.getEventsFiltered()); + assertThat(statistics.getEventsFiltered()).isEqualTo(eventsFiltered); } public static void checkConflatedStats(String senderId, final int eventsConflated) { GatewaySenderStats statistics = getGatewaySenderStats(senderId); - assertEquals(eventsConflated, statistics.getEventsNotQueuedConflated()); + assertThat(statistics.getEventsNotQueuedConflated()).isEqualTo(eventsConflated); } public static void checkStats_Failover(String senderId, final int eventsReceived) { GatewaySenderStats statistics = getGatewaySenderStats(senderId); - assertEquals(eventsReceived, statistics.getEventsReceived()); - assertEquals(eventsReceived, - (statistics.getEventsQueued() + statistics.getUnprocessedTokensAddedByPrimary() - + statistics.getUnprocessedEventsRemovedByPrimary())); + assertThat(statistics.getEventsReceived()).isEqualTo(eventsReceived); + assertThat((statistics.getEventsQueued() + statistics.getUnprocessedTokensAddedByPrimary() + + statistics.getUnprocessedEventsRemovedByPrimary())).isEqualTo(eventsReceived); } public static void checkBatchStats(String senderId, final int batches) { @@ -1396,7 +1382,7 @@ public class WANTestBase extends DistributedTestCase { } else { assert (statistics.getBatchesDistributed() >= batches); } - assertEquals(0, statistics.getBatchesRedistributed()); + assertThat(statistics.getBatchesRedistributed()).isEqualTo(0); } public static void checkBatchStats(String senderId, final int batches, @@ -1407,22 +1393,22 @@ public class WANTestBase extends DistributedTestCase { } else { assert (statistics.getBatchesDistributed() >= batches); } - assertEquals(batchesRedistributed, (statistics.getBatchesRedistributed() > 0)); + assertThat((statistics.getBatchesRedistributed() > 0)).isEqualTo(batchesRedistributed); } public static void checkBatchStats(String senderId, final boolean batchesDistributed, final boolean batchesRedistributed) { GatewaySenderStats statistics = getGatewaySenderStats(senderId); - assertEquals(batchesDistributed, (statistics.getBatchesDistributed() > 0)); - assertEquals(batchesRedistributed, (statistics.getBatchesRedistributed() > 0)); + assertThat((statistics.getBatchesDistributed() > 0)).isEqualTo(batchesDistributed); + assertThat((statistics.getBatchesRedistributed() > 0)).isEqualTo(batchesRedistributed); } public static void checkUnProcessedStats(String senderId, int events) { GatewaySenderStats statistics = getGatewaySenderStats(senderId); - assertEquals(events, (statistics.getUnprocessedEventsAddedBySecondary() - + statistics.getUnprocessedTokensRemovedBySecondary())); - assertEquals(events, (statistics.getUnprocessedEventsRemovedByPrimary() - + statistics.getUnprocessedTokensAddedByPrimary())); + assertThat((statistics.getUnprocessedEventsAddedBySecondary() + + statistics.getUnprocessedTokensRemovedBySecondary())).isEqualTo(events); + assertThat((statistics.getUnprocessedEventsRemovedByPrimary() + + statistics.getUnprocessedTokensAddedByPrimary())).isEqualTo(events); } public static GatewaySenderStats getGatewaySenderStats(String senderId) { @@ -1437,8 +1423,8 @@ public class WANTestBase extends DistributedTestCase { final GatewaySender sender = getGatewaySenderById(senders, senderId); await() .untilAsserted( - () -> assertEquals("Expected sender isRunning state to " + "be true but is false", - true, (sender != null && sender.isRunning()))); + () -> assertThat((sender != null && sender.isRunning())).as( + "Expected sender isRunning state to " + "be true but is false").isEqualTo(true)); } finally { exln.remove(); } @@ -1450,8 +1436,8 @@ public class WANTestBase extends DistributedTestCase { final GatewaySender sender = getGatewaySenderById(senders, senderId); await() .untilAsserted( - () -> assertEquals("Expected sender isRunning state to " + "be false but is true", - true, (sender != null && !sender.isRunning()))); + () -> assertThat((sender != null && !sender.isRunning())).as( + "Expected sender isRunning state to " + "be false but is true").isEqualTo(true)); } } @@ -1460,8 +1446,8 @@ public class WANTestBase extends DistributedTestCase { final GatewaySender sender = getGatewaySenderById(senders, senderId); await() .untilAsserted( - () -> assertEquals("Expected sender primary state to " + "be true but is false", - true, (sender != null && ((AbstractGatewaySender) sender).isPrimary()))); + () -> assertThat((sender != null && ((AbstractGatewaySender) sender).isPrimary())).as( + "Expected sender primary state to " + "be true but is false").isEqualTo(true)); } private static GatewaySender getGatewaySenderById(Set<GatewaySender> senders, String senderId) { @@ -1492,9 +1478,9 @@ public class WANTestBase extends DistributedTestCase { secondaryUpdatesMap.put("Create", listener1.createList); secondaryUpdatesMap.put("Update", listener1.updateList); secondaryUpdatesMap.put("Destroy", listener1.destroyList); - assertEquals( - "Expected secondary map to be " + primaryUpdatesMap + " but it is " + secondaryUpdatesMap, - true, secondaryUpdatesMap.equals(primaryUpdatesMap)); + assertThat(secondaryUpdatesMap.equals(primaryUpdatesMap)).as( + "Expected secondary map to be " + primaryUpdatesMap + " but it is " + secondaryUpdatesMap) + .isEqualTo(true); }); } @@ -1699,7 +1685,7 @@ public class WANTestBase extends DistributedTestCase { queues = ((ConcurrentSerialGatewaySenderEventProcessor) eventProcessor).getQueues(); for (RegionQueue queue : queues) { if (queue instanceof SerialGatewaySenderQueue) { - assertFalse(((SerialGatewaySenderQueue) queue).isRemovalThreadAlive()); + assertThat(((SerialGatewaySenderQueue) queue).isRemovalThreadAlive()).isFalse(); } } } @@ -2237,7 +2223,7 @@ public class WANTestBase extends DistributedTestCase { InternalDistributedSystem ds = test.getSystem(props); cache = CacheFactory.create(ds); - assertNotNull(cache); + assertThat(cache).isNotNull(); CacheServerTestUtil.disableShufflingOfEndpoints(); Pool p; try { @@ -2500,8 +2486,8 @@ public class WANTestBase extends DistributedTestCase { Customer customer = new Customer("name" + i, "Address" + i + valueSuffix); try { customerRegion.put(custid, customer); - assertTrue(customerRegion.containsKey(custid)); - assertEquals(customer, customerRegion.get(custid)); + assertThat(customerRegion.containsKey(custid)).isTrue(); + assertThat(customerRegion.get(custid)).isEqualTo(customer); custKeyValues.put(custid, customer); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2523,8 +2509,8 @@ public class WANTestBase extends DistributedTestCase { try { orderRegion.put(orderId, order); orderKeyValues.put(orderId, order); - assertTrue(orderRegion.containsKey(orderId)); - assertEquals(order, orderRegion.get(orderId)); + assertThat(orderRegion.containsKey(orderId)).isTrue(); + assertThat(orderRegion.get(orderId)).isEqualTo(order); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2544,8 +2530,8 @@ public class WANTestBase extends DistributedTestCase { try { orderRegion.put(custid, order); orderKeyValues.put(custid, order); - assertTrue(orderRegion.containsKey(custid)); - assertEquals(order, orderRegion.get(custid)); + assertThat(orderRegion.containsKey(custid)).isTrue(); + assertThat(orderRegion.get(custid)).isEqualTo(order); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2567,8 +2553,8 @@ public class WANTestBase extends DistributedTestCase { try { orderRegion.put(orderId, order); orderKeyValues.put(orderId, order); - assertTrue(orderRegion.containsKey(orderId)); - assertEquals(order, orderRegion.get(orderId)); + assertThat(orderRegion.containsKey(orderId)).isTrue(); + assertThat(orderRegion.get(orderId)).isEqualTo(order); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2587,8 +2573,8 @@ public class WANTestBase extends DistributedTestCase { Order order = new Order("ORDER" + i + "_update"); try { orderRegion.put(custid, order); - assertTrue(orderRegion.containsKey(custid)); - assertEquals(order, orderRegion.get(custid)); + assertThat(orderRegion.containsKey(custid)).isTrue(); + assertThat(orderRegion.get(custid)).isEqualTo(order); orderKeyValues.put(custid, order); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2611,8 +2597,8 @@ public class WANTestBase extends DistributedTestCase { Shipment shipment = new Shipment("Shipment" + sid); try { shipmentRegion.put(shipmentId, shipment); - assertTrue(shipmentRegion.containsKey(shipmentId)); - assertEquals(shipment, shipmentRegion.get(shipmentId)); + assertThat(shipmentRegion.containsKey(shipmentId)).isTrue(); + assertThat(shipmentRegion.get(shipmentId)).isEqualTo(shipment); shipmentKeyValue.put(shipmentId, shipment); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2647,8 +2633,8 @@ public class WANTestBase extends DistributedTestCase { Shipment shipment = new Shipment("Shipment" + i); try { shipmentRegion.put(custid, shipment); - assertTrue(shipmentRegion.containsKey(custid)); - assertEquals(shipment, shipmentRegion.get(custid)); + assertThat(shipmentRegion.containsKey(custid)).isTrue(); + assertThat(shipmentRegion.get(custid)).isEqualTo(shipment); shipmentKeyValue.put(custid, shipment); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2671,8 +2657,8 @@ public class WANTestBase extends DistributedTestCase { Shipment shipment = new Shipment("Shipment" + sid + "_update"); try { shipmentRegion.put(shipmentId, shipment); - assertTrue(shipmentRegion.containsKey(shipmentId)); - assertEquals(shipment, shipmentRegion.get(shipmentId)); + assertThat(shipmentRegion.containsKey(shipmentId)).isTrue(); + assertThat(shipmentRegion.get(shipmentId)).isEqualTo(shipment); shipmentKeyValue.put(shipmentId, shipment); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2691,8 +2677,8 @@ public class WANTestBase extends DistributedTestCase { Shipment shipment = new Shipment("Shipment" + i + "_update"); try { shipmentRegion.put(custid, shipment); - assertTrue(shipmentRegion.containsKey(custid)); - assertEquals(shipment, shipmentRegion.get(custid)); + assertThat(shipmentRegion.containsKey(custid)).isTrue(); + assertThat(shipmentRegion.get(custid)).isEqualTo(shipment); shipmentKeyValue.put(custid, shipment); } catch (Exception e) { org.apache.geode.test.dunit.Assert.fail( @@ -2799,14 +2785,14 @@ public class WANTestBase extends DistributedTestCase { ConcurrentParallelGatewaySenderQueue prQ = (ConcurrentParallelGatewaySenderQueue) q; totalSize += prQ.size(); } - assertEquals(numQueueEntries, totalSize); + assertThat(totalSize).isEqualTo(numQueueEntries); } else { Set<RegionQueue> queues = ((AbstractGatewaySender) sender).getQueues(); int size = 0; for (RegionQueue q : queues) { size += q.size(); } - assertEquals(numQueueEntries, size); + assertThat(size).isEqualTo(numQueueEntries); } } @@ -2833,9 +2819,9 @@ public class WANTestBase extends DistributedTestCase { ConcurrentParallelGatewaySenderQueue prQ = (ConcurrentParallelGatewaySenderQueue) q; size += prQ.localSize(); } - assertEquals( - " Expected local queue entries: " + numQueueEntries + " but actual entries: " + size, - numQueueEntries, size); + assertThat(size).as( + " Expected local queue entries: " + numQueueEntries + " but actual entries: " + size) + .isEqualTo(numQueueEntries); }); } } @@ -2907,10 +2893,10 @@ public class WANTestBase extends DistributedTestCase { final Region<?, ?> r = cache.getRegion(SEPARATOR + regionName); if (regionSize != r.keySet().size()) { await() - .untilAsserted(() -> assertEquals( + .untilAsserted(() -> assertThat(r.keySet().size()).as( "Expected region entries: " + regionSize + " but actual entries: " - + r.keySet().size() + " present region keyset " + r.keySet(), - regionSize, r.keySet().size())); + + r.keySet().size() + " present region keyset " + r.keySet()) + .isEqualTo(regionSize)); } } finally { exp.remove(); @@ -2981,9 +2967,9 @@ public class WANTestBase extends DistributedTestCase { final Map eventsMap = ((MyAsyncEventListener) theListener).getEventsMap(); await() - .untilAsserted(() -> assertEquals( - "Expected map entries: " + expectedSize + " but actual entries: " + eventsMap.size(), - expectedSize, eventsMap.size())); + .untilAsserted(() -> assertThat(eventsMap.size()).as( + "Expected map entries: " + expectedSize + " but actual entries: " + eventsMap.size()) + .isEqualTo(expectedSize)); } public static void waitForAsyncQueueToGetEmpty(String asyncQueueId) { @@ -3005,7 +2991,8 @@ public class WANTestBase extends DistributedTestCase { for (RegionQueue q : queues) { size += q.size(); } - assertEquals("Expected queue size to be : " + 0 + " but actual entries: " + size, 0, size); + assertThat(size).as("Expected queue size to be : " + 0 + " but actual entries: " + size) + .isEqualTo(0); }); } else { await().untilAsserted(() -> { @@ -3014,7 +3001,8 @@ public class WANTestBase extends DistributedTestCase { for (RegionQueue q : queues) { size += q.size(); } - assertEquals("Expected queue size to be : " + 0 + " but actual entries: " + size, 0, size); + assertThat(size).as("Expected queue size to be : " + 0 + " but actual entries: " + size) + .isEqualTo(0); }); } } @@ -3037,18 +3025,19 @@ public class WANTestBase extends DistributedTestCase { public static void validateRegionSize_PDX(String regionName, final int regionSize) { final Region<?, ?> r = cache.getRegion(SEPARATOR + regionName); await().untilAsserted(() -> { - assertEquals("Expected region entries: " + regionSize + " but actual entries: " - + r.keySet().size() + " present region keyset " + r.keySet(), true, - (regionSize <= r.keySet().size())); - assertEquals("Expected region size: " + regionSize + " but actual size: " + r.size(), true, - (regionSize == r.size())); + assertThat((regionSize <= r.keySet().size())).as( + "Expected region entries: " + regionSize + " but actual entries: " + + r.keySet().size() + " present region keyset " + r.keySet()) + .isEqualTo(true); + assertThat((regionSize == r.size())).as( + "Expected region size: " + regionSize + " but actual size: " + r.size()).isEqualTo(true); }); for (int i = 0; i < regionSize; i++) { final int temp = i; await() - .untilAsserted(() -> assertEquals( - "keySet = " + r.keySet() + " values() = " + r.values() + "Region Size = " + r.size(), - new SimpleClass(temp, (byte) temp), r.get("Key_" + temp))); + .untilAsserted(() -> assertThat(r.get("Key_" + temp)).as( + "keySet = " + r.keySet() + " values() = " + r.values() + "Region Size = " + r.size()) + .isEqualTo(new SimpleClass(temp, (byte) temp))); } } @@ -3056,27 +3045,27 @@ public class WANTestBase extends DistributedTestCase { final Region<?, ?> r = cache.getRegion(SEPARATOR + regionName); await() .untilAsserted( - () -> assertEquals( + () -> assertThat((regionSize <= r.keySet().size())).as( "Expected region entries: " + regionSize + " but actual entries: " - + r.keySet().size() + " present region keyset " + r.keySet(), - true, (regionSize <= r.keySet().size()))); + + r.keySet().size() + " present region keyset " + r.keySet()) + .isEqualTo(true)); } public static void validateQueueSizeStat(String id, final int queueSize) { final AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(id); await() - .untilAsserted(() -> assertEquals(queueSize, sender.getEventQueueSize())); - assertEquals(queueSize, sender.getEventQueueSize()); + .untilAsserted(() -> assertThat(sender.getEventQueueSize()).isEqualTo(queueSize)); + assertThat(sender.getEventQueueSize()).isEqualTo(queueSize); } public static void validateSecondaryQueueSizeStat(String id, final int queueSize) { final AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(id); await() - .untilAsserted(() -> assertEquals( + .untilAsserted(() -> assertThat(sender.getStatistics().getUnprocessedEventMapSize()).as( "Expected unprocessedEventMap is drained but actual is " - + sender.getStatistics().getUnprocessedEventMapSize(), - queueSize, sender.getStatistics().getUnprocessedEventMapSize())); - assertEquals(queueSize, sender.getStatistics().getUnprocessedEventMapSize()); + + sender.getStatistics().getUnprocessedEventMapSize()) + .isEqualTo(queueSize)); + assertThat(sender.getStatistics().getUnprocessedEventMapSize()).isEqualTo(queueSize); } /** @@ -3140,7 +3129,7 @@ public class WANTestBase extends DistributedTestCase { matchFlag = false; } } - assertEquals("Expected region entries doesn't match", true, matchFlag); + assertThat(matchFlag).as("Expected region entries doesn't match").isEqualTo(true); }); } @@ -3211,7 +3200,7 @@ public class WANTestBase extends DistributedTestCase { .map(distributionLocatorId -> new InetSocketAddress( distributionLocatorId.getHostnameForClients(), distributionLocatorId.getPort())) .collect(Collectors.toSet()); - assertEquals(expectedLocators, foundLocators); + assertThat(foundLocators).isEqualTo(expectedLocators); } }); } @@ -3219,7 +3208,8 @@ public class WANTestBase extends DistributedTestCase { public static Long checkAllSiteMetaDataFor3Sites(final Map<Integer, Set<String>> dsVsPort) { await() .untilAsserted( - () -> assertEquals("System is not initialized", true, (getSystemStatic() != null))); + () -> assertThat((getSystemStatic() != null)).as("System is not initialized") + .isEqualTo(true)); List<Locator> locatorsConfigured = Locator.getLocators(); Locator locator = locatorsConfigured.get(0); LocatorMembershipListener listener = ((InternalLocator) locator).getLocatorMembershipListener(); @@ -3231,7 +3221,7 @@ public class WANTestBase extends DistributedTestCase { System.out.println("allSiteMetaData : " + allSiteMetaData); await().untilAsserted(() -> { - assertEquals(true, (dsVsPort.size() == allSiteMetaData.size())); + assertThat((dsVsPort.size() == allSiteMetaData.size())).isEqualTo(true); boolean completeFlag = true; for (Map.Entry<Integer, Set<String>> entry : dsVsPort.entrySet()) { Set<DistributionLocatorId> locators = allSiteMetaData.get(entry.getKey()); @@ -3246,9 +3236,9 @@ public class WANTestBase extends DistributedTestCase { break; } } - assertEquals( - "Expected site Metadata: " + dsVsPort + " but actual meta data: " + allSiteMetaData, true, - completeFlag); + assertThat(completeFlag).as( + "Expected site Metadata: " + dsVsPort + " but actual meta data: " + allSiteMetaData) + .isEqualTo(true); }); return System.currentTimeMillis(); } @@ -3272,8 +3262,8 @@ public class WANTestBase extends DistributedTestCase { (MyLocatorCallback) ((AbstractGatewaySender) sender).getLocatorDiscoveryCallback(); boolean discovered = callback.waitForDiscovery(locatorToWaitFor, MAX_WAIT); - assertTrue("Waited " + MAX_WAIT + " for " + locatorToWaitFor - + " to be discovered on client. List is now: " + callback.getDiscovered(), discovered); + assertThat(discovered).as("Waited " + MAX_WAIT + " for " + locatorToWaitFor + + " to be discovered on client. List is now: " + callback.getDiscovered()).isTrue(); } public static void validateQueueContents(final String senderId, final int regionSize) { @@ -3291,15 +3281,16 @@ public class WANTestBase extends DistributedTestCase { for (RegionQueue q : queues) { size += q.size(); } - assertEquals("Expected queue entries: " + regionSize + " but actual entries: " + size, - regionSize, size); + assertThat(size).as( + "Expected queue entries: " + regionSize + " but actual entries: " + size) + .isEqualTo(regionSize); }); } else if (sender.isParallel()) { final RegionQueue regionQueue; regionQueue = ((AbstractGatewaySender) sender).getQueues().toArray(new RegionQueue[1])[0]; - await().untilAsserted(() -> assertEquals( - "Expected queue entries: " + regionSize + " but actual entries: " + regionQueue.size(), - regionSize, regionQueue.size())); + await().untilAsserted(() -> assertThat(regionQueue.size()).as( + "Expected queue entries: " + regionSize + " but actual entries: " + regionQueue.size()) + .isEqualTo(regionSize)); } } finally { exp1.remove(); @@ -3317,7 +3308,7 @@ public class WANTestBase extends DistributedTestCase { } else { regionQueue = null; } - assertEquals(null, regionQueue); + assertThat(regionQueue).isEqualTo(null); } public static void validateQueueContentsForConcurrentSerialGatewaySender(final String senderId, @@ -3334,7 +3325,7 @@ public class WANTestBase extends DistributedTestCase { for (RegionQueue q : regionQueue) { size += q.size(); } - assertEquals(true, regionSize == size); + assertThat(regionSize == size).isEqualTo(true); }); } @@ -3422,9 +3413,9 @@ public class WANTestBase extends DistributedTestCase { Set<BucketRegion> buckets = ((PartitionedRegion) regionQueue.getRegion()).getDataStore() .getAllLocalPrimaryBucketRegions(); for (BucketRegion bucket : buckets) { - assertEquals( - "Expected bucket entries for bucket " + bucket.getId() + " is different than actual.", - bucketSize, bucket.keySet().size()); + assertThat(bucket.keySet().size()).as( + "Expected bucket entries for bucket " + bucket.getId() + " is different than actual.") + .isEqualTo(bucketSize); } } @@ -3438,19 +3429,23 @@ public class WANTestBase extends DistributedTestCase { final AbstractGatewaySender abstractSender = (AbstractGatewaySender) sender; RegionQueue queue = abstractSender.getEventProcessor().queue; await().untilAsserted(() -> { - assertEquals("Expected events in all primary queues are drained but actual is " - + abstractSender.getEventQueueSize() + ". Queue content is: " - + displayQueueContent(queue), 0, abstractSender.getEventQueueSize()); + assertThat(abstractSender.getEventQueueSize()).as( + "Expected events in all primary queues are drained but actual is " + + abstractSender.getEventQueueSize() + ". Queue content is: " + + displayQueueContent(queue)) + .isEqualTo(0); }); - assertEquals("Expected events in all primary queues after drain is 0", 0, - abstractSender.getEventQueueSize()); + assertThat(abstractSender.getEventQueueSize()).as( + "Expected events in all primary queues after drain is 0").isEqualTo(0); await().untilAsserted(() -> { - assertEquals("Expected events in all secondary queues are drained but actual is " - + abstractSender.getSecondaryEventQueueSize() + ". Queue content is: " - + displayQueueContent(queue), 0, abstractSender.getSecondaryEventQueueSize()); + assertThat(abstractSender.getSecondaryEventQueueSize()).as( + "Expected events in all secondary queues are drained but actual is " + + abstractSender.getSecondaryEventQueueSize() + ". Queue content is: " + + displayQueueContent(queue)) + .isEqualTo(0); }); - assertEquals("Expected events in all secondary queues after drain is 0", 0, - abstractSender.getSecondaryEventQueueSize()); + assertThat(abstractSender.getSecondaryEventQueueSize()).as( + "Expected events in all secondary queues after drain is 0").isEqualTo(0); } finally { exp.remove(); exp1.remove(); @@ -3479,7 +3474,7 @@ public class WANTestBase extends DistributedTestCase { for (ParallelGatewaySenderEventProcessor lProc : cProc.getProcessors()) { totalDispatched += lProc.getNumEventsDispatched(); } - assertTrue(totalDispatched > 0); + assertThat(totalDispatched > 0).isTrue(); return totalDispatched; } @@ -3523,8 +3518,10 @@ public class WANTestBase extends DistributedTestCase { GatewaySender sender = getGatewaySender(senderId); AbstractGatewaySender ags = (AbstractGatewaySender) sender; - await().untilAsserted(() -> assertEquals("Expected tmpDroppedEvents size: " + size - + " but actual size: " + ags.getTmpDroppedEventSize(), size, ags.getTmpDroppedEventSize())); + await().untilAsserted(() -> assertThat(ags.getTmpDroppedEventSize()).as( + "Expected tmpDroppedEvents size: " + size + + " but actual size: " + ags.getTmpDroppedEventSize()) + .isEqualTo(size)); } /** @@ -3550,8 +3547,8 @@ public class WANTestBase extends DistributedTestCase { } final int finalSize = size; - assertEquals("Expected elements in TempQueueMap: " + 0 - + " but actual size: " + finalSize, 0, finalSize); + assertThat(finalSize).as("Expected elements in TempQueueMap: " + 0 + + " but actual size: " + finalSize).isEqualTo(0); } @@ -3577,11 +3574,12 @@ public class WANTestBase extends DistributedTestCase { queueSize += q.size(); } - assertEquals("verifyQueueSize failed for sender " + senderId, size, queueSize); + assertThat(queueSize).as("verifyQueueSize failed for sender " + senderId).isEqualTo(size); } else if (sender.isParallel()) { RegionQueue regionQueue = ((AbstractGatewaySender) sender).getQueues().toArray(new RegionQueue[1])[0]; - assertEquals("verifyQueueSize failed for sender " + senderId, size, regionQueue.size()); + assertThat(regionQueue.size()).as("verifyQueueSize failed for sender " + senderId) + .isEqualTo(size); } } @@ -3594,12 +3592,12 @@ public class WANTestBase extends DistributedTestCase { for (RegionQueue q : queues) { queueSize += q.size(); } - assertTrue(queues.size() > 0); - assertTrue(queueSize > 0); + assertThat(queues.size() > 0).isTrue(); + assertThat(queueSize > 0).isTrue(); } else if (sender.isParallel()) { RegionQueue regionQueue = ((AbstractGatewaySender) sender).getQueues().toArray(new RegionQueue[1])[0]; - assertTrue(regionQueue.size() > 0); + assertThat(regionQueue.size() > 0).isTrue(); } } @@ -3611,7 +3609,7 @@ public class WANTestBase extends DistributedTestCase { await().untilAsserted(() -> { Set<RegionQueue> queues = ((AbstractGatewaySender) sender).getQueues(); for (RegionQueue q : queues) { - assertEquals(0, q.size()); + assertThat(q.size()).isEqualTo(0); } }); } @@ -3622,23 +3620,23 @@ public class WANTestBase extends DistributedTestCase { */ public static void verifySenderPausedState(String senderId) { GatewaySender sender = cache.getGatewaySender(senderId); - assertTrue(sender.isPaused()); + assertThat(sender.isPaused()).isTrue(); } public static void verifySenderResumedState(String senderId) { GatewaySender sender = cache.getGatewaySender(senderId); - assertFalse(sender.isPaused()); - assertTrue(sender.isRunning()); + assertThat(sender.isPaused()).isFalse(); + assertThat(sender.isRunning()).isTrue(); } public static void verifySenderStoppedState(String senderId) { GatewaySender sender = cache.getGatewaySender(senderId); - assertFalse(sender.isRunning()); + assertThat(sender.isRunning()).isFalse(); } public static void verifySenderRunningState(String senderId) { GatewaySender sender = cache.getGatewaySender(senderId); - assertTrue(sender.isRunning()); + assertThat(sender.isRunning()).isTrue(); } public static void verifySenderConnectedState(String senderId, boolean shouldBeConnected) { @@ -3655,9 +3653,9 @@ public class WANTestBase extends DistributedTestCase { AbstractGatewaySender sender = (AbstractGatewaySender) cache.getGatewaySender(senderId); PoolImpl pool = sender.getProxy(); if (poolShouldExist) { - assertEquals(expectedPoolLocatorsSize, pool.getLocators().size()); + assertThat(pool.getLocators().size()).isEqualTo(expectedPoolLocatorsSize); } else { - assertNull(pool); + assertThat(pool).isNull(); } } @@ -3673,7 +3671,7 @@ public class WANTestBase extends DistributedTestCase { public static void verifySenderDestroyed(String senderId, boolean isParallel) { AbstractGatewaySender sender = (AbstractGatewaySender) getGatewaySender(senderId); - assertNull(sender); + assertThat(sender).isNull(); String queueRegionNameSuffix = null; if (isParallel) { @@ -4015,9 +4013,9 @@ public class WANTestBase extends DistributedTestCase { ManagementService service = ManagementService.getManagementService(cache); AsyncEventQueueMXBean bean = service.getLocalAsyncEventQueueMXBean("pn"); if (shouldExist) { - assertNotNull(bean); + assertThat(bean).isNotNull(); } else { - assertNull(bean); + assertThat(bean).isNull(); } } }; @@ -4041,7 +4039,7 @@ public class WANTestBase extends DistributedTestCase { } catch (Exception e) { fail("Could not obtain Sender Proxy in desired time " + e); } - assertNotNull(bean); + assertThat(bean).isNotNull(); final ObjectName receiverMBeanName = service.getGatewayReceiverMBeanName(senderMember); try { MBeanUtil.printBeanDetails(receiverMBeanName); @@ -4071,7 +4069,7 @@ public class WANTestBase extends DistributedTestCase { } catch (Exception e) { fail("Could not obtain Sender Proxy in desired time " + e); } - assertNotNull(bean); + assertThat(bean).isNotNull(); final ObjectName senderMBeanName = service.getGatewaySenderMBeanName(senderMember, "pn"); try { MBeanUtil.printBeanDetails(senderMBeanName); @@ -4084,7 +4082,8 @@ public class WANTestBase extends DistributedTestCase { await().untilAsserted(() -> { Map<String, Boolean> dsMap = dsBean.viewRemoteClusterStatus(); dsMap.entrySet().stream() - .forEach(entry -> assertTrue("Should be true " + entry.getKey(), entry.getValue())); + .forEach(entry -> assertThat(entry.getValue()).as( + "Should be true " + entry.getKey()).isTrue()); }); } @@ -4105,7 +4104,7 @@ public class WANTestBase extends DistributedTestCase { public void run() { ManagementService service = ManagementService.getManagementService(cache); GatewayReceiverMXBean bean = service.getLocalGatewayReceiverMXBean(); - assertNotNull(bean); + assertThat(bean).isNotNull(); } }; vm.invoke(checkMBean); @@ -4127,12 +4126,12 @@ public class WANTestBase extends DistributedTestCase { () -> assertThat(bean.fetchGatewayReceiverObjectName(receiverMember.getId())) .isNotNull()); ObjectName actualName = bean.fetchGatewayReceiverObjectName(receiverMember.getId()); - assertEquals(expectedName, actualName); + assertThat(actualName).isEqualTo(expectedName); } catch (Exception e) { fail("Receiver Navigation Failed " + e); } - assertEquals(1, bean.listGatewayReceiverObjectNames().length); + assertThat(bean.listGatewayReceiverObjectNames().length).isEqualTo(1); } }; @@ -4152,14 +4151,14 @@ public class WANTestBase extends DistributedTestCase { ManagementService service = ManagementService.getManagementService(cache); GatewaySenderMXBean bean = service.getLocalGatewaySenderMXBean("pn"); - assertNotNull(bean); + assertThat(bean).isNotNull(); await() - .untilAsserted(() -> assertEquals(connected, bean.isConnected())); + .untilAsserted(() -> assertThat(bean.isConnected()).isEqualTo(connected)); ObjectName regionBeanName = service.getRegionMBeanName( cache.getDistributedSystem().getDistributedMember(), SEPARATOR + regionPath); RegionMXBean rBean = service.getMBeanInstance(regionBeanName, RegionMXBean.class); - assertTrue(rBean.isGatewayEnabled()); + assertThat(rBean.isGatewayEnabled()).isTrue(); } @@ -4178,14 +4177,15 @@ public class WANTestBase extends DistributedTestCase { ObjectName expectedName = service.getGatewaySenderMBeanName(senderMember, "pn"); try { ObjectName actualName = bean.fetchGatewaySenderObjectName(senderMember.getId(), "pn"); - assertEquals(expectedName, actualName); + assertThat(actualName).isEqualTo(expectedName); } catch (Exception e) { fail("Sender Navigation Failed " + e); } - assertEquals(2, bean.listGatewaySenderObjectNames().length); + assertThat(bean.listGatewaySenderObjectNames().length).isEqualTo(2); try { - assertEquals(1, bean.listGatewaySenderObjectNames(senderMember.getId()).length); + assertThat(bean.listGatewaySenderObjectNames(senderMember.getId()).length).isEqualTo( + 1); } catch (Exception e) { fail("Sender Navigation Failed " + e); } @@ -4208,7 +4208,7 @@ public class WANTestBase extends DistributedTestCase { ManagementService service = ManagementService.getManagementService(cache); GatewaySenderMXBean bean = service.getLocalGatewaySenderMXBean("pn"); bean.start(); - assertTrue(bean.isRunning()); + assertThat(bean.isRunning()).isTrue(); } }; vm.invoke(stopGatewaySender); @@ -4227,7 +4227,7 @@ public class WANTestBase extends DistributedTestCase { ManagementService service = ManagementService.getManagementService(cache); GatewaySenderMXBean bean = service.getLocalGatewaySenderMXBean("pn"); bean.stop(); - assertFalse(bean.isRunning()); + assertThat(bean.isRunning()).isFalse(); } }; vm.invoke(stopGatewaySender); @@ -4257,7 +4257,7 @@ public class WANTestBase extends DistributedTestCase { } catch (Exception e) { fail("Could not obtain Sender Proxy in desired time " + e); } - assertNotNull(bean); + assertThat(bean).isNotNull(); try { MBeanUtil.printBeanDetails(queueMBeanName); @@ -4267,7 +4267,7 @@ public class WANTestBase extends DistributedTestCase { } else { // Verify the MBean proxy doesn't exist bean = service.getMBeanProxy(queueMBeanName, AsyncEventQueueMXBean.class); - assertNull(bean); + assertThat(bean).isNull(); } } }; @@ -4295,15 +4295,15 @@ public class WANTestBase extends DistributedTestCase { await().untilAsserted(() -> { final ManagementService service = ManagementService.getManagementService(cache); final DistributedSystemMXBean dsBean = service.getDistributedSystemMXBean(); - assertEquals( - "Failed while waiting for getDistributedSystemMXBean to complete and get results", - true, dsBean != null); + assertThat(dsBean != null).as( + "Failed while waiting for getDistributedSystemMXBean to complete and get results") + .isEqualTo(true); }); ManagementService service = ManagementService.getManagementService(cache); final DistributedSystemMXBean dsBean = service.getDistributedSystemMXBean(); Map<String, Boolean> dsMap = dsBean.viewRemoteClusterStatus(); logger.info("Ds Map is: " + dsMap.size()); - assertEquals(true, dsMap.size() > 0); + assertThat(dsMap.size() > 0).isEqualTo(true); } }; vm.invoke(checkProxySender); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java index 876a1ae5b1..976f6dbb06 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java @@ -16,9 +16,8 @@ package org.apache.geode.internal.cache.wan.concurrent; import static org.apache.geode.cache.Region.SEPARATOR; import static org.apache.geode.test.awaitility.GeodeAwaitility.await; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -115,8 +114,8 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm3.invoke(() -> { await() .untilAsserted( - () -> assertTrue(WANTestBase.getQueueContentSize("ln2", true) + " was the size", - WANTestBase.getQueueContentSize("ln2", true) == 0)); + () -> assertThat(WANTestBase.getQueueContentSize("ln2", true) == 0).as( + WANTestBase.getQueueContentSize("ln2", true) + " was the size").isTrue()); }); } @@ -591,7 +590,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes try { vm5.invoke(() -> localDestroyRegion(customerRegionName)); } catch (Exception ex) { - assertTrue(ex.getCause() instanceof UnsupportedOperationException); + assertThat(ex.getCause() instanceof UnsupportedOperationException).isTrue(); } try { @@ -633,7 +632,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes try { vm5.invoke(() -> WANTestBase.destroyRegion(customerRegionName)); } catch (Exception ex) { - assertTrue(ex.getCause() instanceof IllegalStateException); + assertThat(ex.getCause() instanceof IllegalStateException).isTrue(); return; } fail("Expected UnsupportedOperationException"); @@ -651,14 +650,14 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes public static void closeRegion(String regionName) { Region r = cache.getRegion(SEPARATOR + regionName); - assertNotNull(r); + assertThat(r).isNotNull(); r.close(); } public static void validateRegionSizeWithinRange(String regionName, final int min, final int max) { final Region r = cache.getRegion(SEPARATOR + regionName); - assertNotNull(r); + assertThat(r).isNotNull(); WaitCriterion wc = new WaitCriterion() { @Override public boolean done() { diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java index aa59cb372b..2b0c332e4a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java @@ -15,9 +15,7 @@ package org.apache.geode.internal.cache.wan.parallel; import static org.apache.geode.test.awaitility.GeodeAwaitility.await; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -97,8 +95,8 @@ public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", -1)); - assertTrue("GatewaySenders Stats should contain number of EventsExceedingAlertThreshold > 0", - (v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12)) > 0); + assertThat((v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12)) > 0).as( + "GatewaySenders Stats should contain number of EventsExceedingAlertThreshold > 0").isTrue(); int v4alert = vm4.invoke( ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); @@ -109,16 +107,16 @@ public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { int v7alert = vm7.invoke( ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); - assertTrue("GatewaySenders MBean should contain number of EventsExceedingAlertThreshold > 0", - (v4alert + v5alert + v6alert + v7alert) > 0); + assertThat((v4alert + v5alert + v6alert + v7alert) > 0).as( + "GatewaySenders MBean should contain number of EventsExceedingAlertThreshold > 0").isTrue(); } private static int checkSenderMBeanAlertThreshold() { ManagementService service = ManagementService.getManagementService(cache); GatewaySenderMXBean bean = service.getLocalGatewaySenderMXBean("ln"); - assertNotNull(bean); - await().untilAsserted(() -> assertTrue(bean.isConnected())); + assertThat(bean).isNotNull(); + await().untilAsserted(() -> assertThat(bean.isConnected()).isTrue()); return bean.getEventsExceedingAlertThreshold(); } @@ -172,8 +170,9 @@ public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", -1)); - assertEquals("GatewaySenders Stats should contain number of EventsExceedingAlertThreshold = 0", - (v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12)), 0); + assertThat(0).as( + "GatewaySenders Stats should contain number of EventsExceedingAlertThreshold = 0") + .isEqualTo((v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12))); int v4alert = vm4.invoke( ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); @@ -184,8 +183,9 @@ public class ParallelGatewaySenderAlertThresholdDUnitTest extends WANTestBase { int v7alert = vm7.invoke( ParallelGatewaySenderAlertThresholdDUnitTest::checkSenderMBeanAlertThreshold); - assertEquals("GatewaySenders MBean should contain number of EventsExceedingAlertThreshold = 0", - (v4alert + v5alert + v6alert + v7alert), 0); + assertThat(0).as( + "GatewaySenders MBean should contain number of EventsExceedingAlertThreshold = 0") + .isEqualTo((v4alert + v5alert + v6alert + v7alert)); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java index a513386c13..33e09a6168 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java @@ -15,8 +15,7 @@ package org.apache.geode.internal.cache.wan.parallel; import static org.apache.geode.test.awaitility.GeodeAwaitility.await; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; import java.util.HashMap; @@ -123,8 +122,8 @@ public class ParallelWANConflationDUnitTest extends WANTestBase { (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 100)); ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 100)); - assertTrue("Event in secondary queue should be 100", - (v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)) == 100); + assertThat((v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)) == 100).as( + "Event in secondary queue should be 100").isTrue(); resumeSenders(); @@ -133,8 +132,8 @@ public class ParallelWANConflationDUnitTest extends WANTestBase { v6List = (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0)); v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertTrue("No events conflated in batch", - (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0); + assertThat((v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0).as( + "No events conflated in batch").isTrue(); verifySecondaryEventQueuesDrained("ln"); vm2.invoke(() -> validateRegionSize(getTestMethodName(), 10)); @@ -148,10 +147,10 @@ public class ParallelWANConflationDUnitTest extends WANTestBase { int vm6SecondarySize = vm6.invoke(() -> getSecondaryQueueSizeInStats("ln")); int vm7SecondarySize = vm7.invoke(() -> getSecondaryQueueSizeInStats("ln")); - assertEquals( + assertThat(vm4SecondarySize + vm5SecondarySize + vm6SecondarySize + vm7SecondarySize).as( "Event in secondary queue should be 0 after dispatched, but actual is " + vm4SecondarySize - + ":" + vm5SecondarySize + ":" + vm6SecondarySize + ":" + vm7SecondarySize, - 0, vm4SecondarySize + vm5SecondarySize + vm6SecondarySize + vm7SecondarySize); + + ":" + vm5SecondarySize + ":" + vm6SecondarySize + ":" + vm7SecondarySize) + .isEqualTo(0); }); } @@ -220,11 +219,12 @@ public class ParallelWANConflationDUnitTest extends WANTestBase { (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum)); ArrayList<Integer> vm7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum)); - assertTrue( - "Event in secondary queue should be " + (expectedNum * redundancy) + ", but is " - + (vm4List.get(10) + vm5List.get(10) + vm6List.get(10) + vm7List.get(10)), + assertThat( (vm4List.get(10) + vm5List.get(10) + vm6List.get(10) + vm7List.get(10)) == expectedNum - * redundancy); + * redundancy).as( + "Event in secondary queue should be " + (expectedNum * redundancy) + ", but is " + + (vm4List.get(10) + vm5List.get(10) + vm6List.get(10) + vm7List.get(10))) + .isTrue(); } private void validateEventsProcessedByPQRM(int expectedNum, int redundancy) { @@ -236,11 +236,13 @@ public class ParallelWANConflationDUnitTest extends WANTestBase { (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0)); ArrayList<Integer> vm7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertTrue( - "Event processed by queue removal message should be " + (expectedNum * redundancy) - + ", but is " + (vm4List.get(11) + vm5List.get(11) + vm6List.get(11) + vm7List.get(11)), + assertThat( (vm4List.get(11) + vm5List.get(11) + vm6List.get(11) + vm7List.get(11)) == expectedNum - * redundancy); + * redundancy).as( + "Event processed by queue removal message should be " + (expectedNum * redundancy) + + ", but is " + + (vm4List.get(11) + vm5List.get(11) + vm6List.get(11) + vm7List.get(11))) + .isTrue(); } @Test diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java index 9b91b58353..b6dccd2120 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java @@ -18,9 +18,6 @@ import static org.apache.geode.internal.Assert.fail; import static org.apache.geode.test.awaitility.GeodeAwaitility.await; import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertTrue; import java.util.ArrayList; import java.util.HashMap; @@ -114,16 +111,16 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS)); - assertEquals(NUM_PUTS, - v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); // queue size - assertEquals(NUM_PUTS * 2, - v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); // eventsReceived - assertEquals(NUM_PUTS * 2, - v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); // events queued - assertEquals(0, - v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); // events distributed - assertEquals(NUM_PUTS, - v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary queue size + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(NUM_PUTS); // queue + // size + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo( + NUM_PUTS * 2); // eventsReceived + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo( + NUM_PUTS * 2); // events queued + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(0); // events + // distributed + assertThat(v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)).isEqualTo( + NUM_PUTS); // secondary queue size // stop vm7 to trigger rebalance and move some primary buckets System.out.println("Current secondary queue sizes:" + v4List.get(10) + ":" + v5List.get(10) @@ -133,7 +130,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { int v4secondarySize = vm4.invoke(() -> WANTestBase.getSecondaryQueueSizeInStats("ln")); int v5secondarySize = vm5.invoke(() -> WANTestBase.getSecondaryQueueSizeInStats("ln")); int v6secondarySize = vm6.invoke(() -> WANTestBase.getSecondaryQueueSizeInStats("ln")); - assertEquals(NUM_PUTS, v4secondarySize + v5secondarySize + v6secondarySize); + assertThat(v4secondarySize + v5secondarySize + v6secondarySize).isEqualTo(NUM_PUTS); }); System.out.println("New secondary queue sizes:" + v4List.get(10) + ":" + v5List.get(10) + ":" + v6List.get(10)); @@ -148,8 +145,8 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { v5List = (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS)); v6List = (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS)); v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS)); - assertEquals(NUM_PUTS, - v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); // secondary + assertThat(v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)).isEqualTo( + NUM_PUTS); // secondary // queue // size System.out.println("After restart vm7, secondary queue sizes:" + v4List.get(10) + ":" @@ -171,9 +168,9 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // events distributed: - assertEquals(NUM_PUTS, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(NUM_PUTS); // secondary queue size: - assertEquals(0, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); + assertThat(v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)).isEqualTo(0); } // TODO: add a test without redundancy for primary switch @@ -205,15 +202,18 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS)); // queue size: - assertEquals(NUM_PUTS, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(NUM_PUTS); // events received: - assertEquals(NUM_PUTS * 2, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo( + NUM_PUTS * 2); // events queued: - assertEquals(NUM_PUTS * 2, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo( + NUM_PUTS * 2); // events distributed: - assertEquals(0, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(0); // secondary queue size: - assertEquals(NUM_PUTS, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); + assertThat(v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)).isEqualTo( + NUM_PUTS); vm4.invoke(() -> WANTestBase.resumeSender("ln")); vm5.invoke(() -> WANTestBase.resumeSender("ln")); @@ -230,9 +230,9 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // events distributed: - assertEquals(NUM_PUTS, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(NUM_PUTS); // secondary queue size: - assertEquals(0, v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)); + assertThat(v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)).isEqualTo(0); } @Test @@ -264,17 +264,17 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", NUM_PUTS)); // queue size: - assertEquals(NUM_PUTS, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(NUM_PUTS); // events received: - assertEquals(NUM_PUTS, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(NUM_PUTS); // events queued: - assertEquals(NUM_PUTS, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(NUM_PUTS); // events distributed - assertEquals(0, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(0); // batches distributed: - assertEquals(0, v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)).isEqualTo(0); // batches redistributed - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); } @Test @@ -307,17 +307,17 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // eventsReceived: - assertEquals(NUM_PUTS, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(NUM_PUTS); // events queued: - assertEquals(NUM_PUTS, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(NUM_PUTS); // events distributed: - assertEquals(NUM_PUTS, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(NUM_PUTS); // batches distributed: - assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10).isTrue(); // batches redistributed: - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS)); } @@ -379,17 +379,17 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // eventsReceived: - assertEquals(entries, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(entries); // events queued: - assertEquals(entries, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(entries); // events distributed: - assertEquals(entries, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(entries); // batches distributed: - assertEquals(2, v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)).isEqualTo(2); // batches redistributed: - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); } @Test @@ -506,7 +506,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // batches redistributed: int batchesRedistributed = v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5); if (isBatchesRedistributed) { @@ -587,21 +587,21 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // eventsReceived: - assertEquals(entries, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(entries); // events queued: - assertEquals(entries, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(entries); // events distributed: - assertEquals(entries, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(entries); // batches distributed: - assertEquals(1, v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)).isEqualTo(1); // batches redistributed: - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // events not queued conflated: - assertEquals(0, v4List.get(7) + v5List.get(7) + v6List.get(7) + v7List.get(7)); + assertThat(v4List.get(7) + v5List.get(7) + v6List.get(7) + v7List.get(7)).isEqualTo(0); // batches with incomplete transactions - assertEquals(0, (int) v4List.get(13)); + assertThat((int) v4List.get(13)).isEqualTo(0); } @@ -649,21 +649,21 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { // each on 2 batches. int batches = 4; // queue size: - assertEquals(0, (int) v4List.get(0)); + assertThat((int) v4List.get(0)).isEqualTo(0); // eventsReceived: - assertEquals(entries, (int) v4List.get(1)); + assertThat((int) v4List.get(1)).isEqualTo(entries); // events queued: - assertEquals(entries, (int) v4List.get(2)); + assertThat((int) v4List.get(2)).isEqualTo(entries); // events distributed: - assertEquals(entries, (int) v4List.get(3)); + assertThat((int) v4List.get(3)).isEqualTo(entries); // batches distributed: - assertEquals(batches, (int) v4List.get(4)); + assertThat((int) v4List.get(4)).isEqualTo(batches); // batches redistributed: - assertEquals(0, (int) v4List.get(5)); + assertThat((int) v4List.get(5)).isEqualTo(0); // events not queued conflated: - assertEquals(0, (int) v4List.get(7)); + assertThat((int) v4List.get(7)).isEqualTo(0); // batches with incomplete transactions - assertEquals(batches, (int) v4List.get(13)); + assertThat((int) v4List.get(13)).isEqualTo(batches); vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(batches, entries, entries)); } @@ -722,17 +722,17 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, (int) v4List.get(0)); + assertThat((int) v4List.get(0)).isEqualTo(0); // events received: - assertEquals(entries, (int) v4List.get(1)); + assertThat((int) v4List.get(1)).isEqualTo(entries); // events queued: - assertEquals(entries, (int) v4List.get(2)); + assertThat((int) v4List.get(2)).isEqualTo(entries); // events distributed: - assertEquals(entries, (int) v4List.get(3)); + assertThat((int) v4List.get(3)).isEqualTo(entries); // batches distributed: - assertEquals(3, (int) v4List.get(4)); + assertThat((int) v4List.get(4)).isEqualTo(3); // batches redistributed: - assertTrue("Batch was not redistributed", (v4List.get(5)) > 0); + assertThat((v4List.get(5)) > 0).as("Batch was not redistributed").isTrue(); } @Test @@ -797,19 +797,19 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, (int) v4List.get(0)); + assertThat((int) v4List.get(0)).isEqualTo(0); // events received: - assertEquals(entries, (int) v4List.get(1)); + assertThat((int) v4List.get(1)).isEqualTo(entries); // events queued: - assertEquals(entries, (int) v4List.get(2)); + assertThat((int) v4List.get(2)).isEqualTo(entries); // events distributed: - assertEquals(entries, (int) v4List.get(3)); + assertThat((int) v4List.get(3)).isEqualTo(entries); // batches distributed: - assertEquals(2, (int) v4List.get(4)); + assertThat((int) v4List.get(4)).isEqualTo(2); // batches redistributed: - assertTrue("Batch was not redistributed", (v4List.get(5)) > 0); + assertThat((v4List.get(5)) > 0).as("Batch was not redistributed").isTrue(); // events not queued conflated: - assertEquals(0, (int) v4List.get(7)); + assertThat((int) v4List.get(7)).isEqualTo(0); } @Test @@ -842,17 +842,17 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // events received: - assertEquals(400, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(400); // events queued: - assertEquals(400, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(400); // events distributed - assertEquals(NUM_PUTS, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(NUM_PUTS); // batches distributed: - assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10).isTrue(); // batches redistributed: - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS)); } @@ -893,19 +893,19 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { ArrayList<Integer> v4Sender2List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln2", 0)); - assertEquals(0, v4Sender1List.get(0).intValue()); // queue size - assertEquals(NUM_PUTS, v4Sender1List.get(1).intValue()); // eventsReceived - assertEquals(NUM_PUTS, v4Sender1List.get(2).intValue()); // events queued - assertEquals(NUM_PUTS, v4Sender1List.get(3).intValue()); // events distributed - assertTrue(v4Sender1List.get(4) >= 10); // batches distributed - assertEquals(0, v4Sender1List.get(5).intValue()); // batches redistributed + assertThat(v4Sender1List.get(0).intValue()).isEqualTo(0); // queue size + assertThat(v4Sender1List.get(1).intValue()).isEqualTo(NUM_PUTS); // eventsReceived + assertThat(v4Sender1List.get(2).intValue()).isEqualTo(NUM_PUTS); // events queued + assertThat(v4Sender1List.get(3).intValue()).isEqualTo(NUM_PUTS); // events distributed + assertThat(v4Sender1List.get(4) >= 10).isTrue(); // batches distributed + assertThat(v4Sender1List.get(5).intValue()).isEqualTo(0); // batches redistributed - assertEquals(0, v4Sender2List.get(0).intValue()); // queue size - assertEquals(NUM_PUTS, v4Sender2List.get(1).intValue()); // eventsReceived - assertEquals(NUM_PUTS, v4Sender2List.get(2).intValue()); // events queued - assertEquals(NUM_PUTS, v4Sender2List.get(3).intValue()); // events distributed - assertTrue(v4Sender2List.get(4) >= 10); // batches distributed - assertEquals(0, v4Sender2List.get(5).intValue()); // batches redistributed + assertThat(v4Sender2List.get(0).intValue()).isEqualTo(0); // queue size + assertThat(v4Sender2List.get(1).intValue()).isEqualTo(NUM_PUTS); // eventsReceived + assertThat(v4Sender2List.get(2).intValue()).isEqualTo(NUM_PUTS); // events queued + assertThat(v4Sender2List.get(3).intValue()).isEqualTo(NUM_PUTS); // events distributed + assertThat(v4Sender2List.get(4) >= 10).isTrue(); // batches distributed + assertThat(v4Sender2List.get(5).intValue()).isEqualTo(0); // batches redistributed vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS)); vm3.invoke(() -> WANTestBase.checkGatewayReceiverStats(10, NUM_PUTS, NUM_PUTS)); @@ -936,8 +936,8 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { AsyncInvocation<Void> inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts(testName, 1000)); vm2.invoke(() -> await() - .untilAsserted(() -> assertTrue("Waiting for first batch to be received", - getRegionSize(testName) > 10))); + .untilAsserted(() -> assertThat(getRegionSize(testName) > 10).as( + "Waiting for first batch to be received").isTrue())); AsyncInvocation<Void> inv2 = vm4.invokeAsync(() -> WANTestBase.killSender()); inv1.await(); inv2.await(); @@ -951,19 +951,18 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertEquals(0, v5List.get(0) + v6List.get(0) + v7List.get(0)); // queue size + assertThat(v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // queue size int receivedEvents = v5List.get(1) + v6List.get(1) + v7List.get(1); // We may see a single retried event on all members due to the kill - assertTrue("Received " + receivedEvents, - 3000 <= receivedEvents && 3003 >= receivedEvents); // eventsReceived + assertThat(3000 <= receivedEvents && 3003 >= receivedEvents).as("Received " + receivedEvents) + .isTrue(); // eventsReceived int queuedEvents = v5List.get(2) + v6List.get(2) + v7List.get(2); - assertTrue("Queued " + queuedEvents, - 3000 <= queuedEvents && 3003 >= queuedEvents); // eventsQueued + assertThat(3000 <= queuedEvents && 3003 >= queuedEvents).as("Queued " + queuedEvents).isTrue(); // eventsQueued // assertTrue(10000 <= v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed : // its quite possible that vm4 has distributed some of the events // assertTrue(v5List.get(4) + v6List.get(4) + v7List.get(4) > 1000); //batches distributed : its // quite possible that vm4 has distributed some of the batches. - assertEquals(0, v5List.get(5) + v6List.get(5) + v7List.get(5)); // batches redistributed + assertThat(v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // batches redistributed vm2.invoke(() -> WANTestBase.checkGatewayReceiverStatsHA(NUM_PUTS, 1000, 1000)); } @@ -1005,8 +1004,8 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { vm5.invokeAsync(() -> WANTestBase.doTxPutsWithRetryIfError(testName, 2, 1000, 0)); vm2.invoke(() -> await() - .untilAsserted(() -> assertTrue("Waiting for some batches to be received", - getRegionSize(testName) > 40))); + .untilAsserted(() -> assertThat(getRegionSize(testName) > 40).as( + "Waiting for some batches to be received").isTrue())); AsyncInvocation<Void> inv3 = vm4.invokeAsync(() -> WANTestBase.killSender()); inv1.await(); inv3.await(); @@ -1020,16 +1019,15 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertEquals(0, v5List.get(0) + v6List.get(0) + v7List.get(0)); // queue size + assertThat(v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // queue size int receivedEvents = v5List.get(1) + v6List.get(1) + v7List.get(1); // We may see two retried events (as transactions are made of 2 events) on all members due to // the kill - assertTrue("Received " + receivedEvents, - 6000 <= receivedEvents && 6006 >= receivedEvents); // eventsReceived + assertThat(6000 <= receivedEvents && 6006 >= receivedEvents).as("Received " + receivedEvents) + .isTrue(); // eventsReceived int queuedEvents = v5List.get(2) + v6List.get(2) + v7List.get(2); - assertTrue("Queued " + queuedEvents, - 6000 <= queuedEvents && 6006 >= queuedEvents); // eventsQueued - assertEquals(0, v5List.get(5) + v6List.get(5) + v7List.get(5)); // batches redistributed + assertThat(6000 <= queuedEvents && 6006 >= queuedEvents).as("Queued " + queuedEvents).isTrue(); // eventsQueued + assertThat(v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // batches redistributed // batchesReceived is equal to numberOfEntries/(batchSize+1) // As transactions are 2 events long, for each batch it will always be necessary to @@ -1077,9 +1075,9 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", -1)); // batches distributed: it's quite possible that vm4 has distributed some of the batches. - assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 1); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 1).isTrue(); // batches redistributed: - assertTrue(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5) >= 1); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5) >= 1).isTrue(); } @Test @@ -1123,19 +1121,19 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); // queue size: - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // events received: - assertEquals(1000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(1000); // events queued: - assertEquals(900, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(900); // events distributed: - assertEquals(800, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(800); // batches distributed: - assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 80); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 80).isTrue(); // batches redistributed: - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // events filtered: - assertEquals(200, v4List.get(6) + v5List.get(6) + v6List.get(6) + v7List.get(6)); + assertThat(v4List.get(6) + v5List.get(6) + v6List.get(6) + v7List.get(6)).isEqualTo(200); vm2.invoke(() -> WANTestBase.checkGatewayReceiverStats(80, 800, 800)); } @@ -1214,14 +1212,14 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { // 5 -> batchesRedistributed // 7 -> eventsNotQueuedConflated // 9 -> conflationIndexesMapSize - assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)); - assertEquals(200, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); - assertEquals(200, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); - assertEquals(150, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); - assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10); - assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); - assertEquals(50, v4List.get(7) + v5List.get(7) + v6List.get(7) + v7List.get(7)); - assertEquals(0, v4List.get(9) + v5List.get(9) + v6List.get(9) + v7List.get(9)); + assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); + assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)).isEqualTo(200); + assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)).isEqualTo(200); + assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(150); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10).isTrue(); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); + assertThat(v4List.get(7) + v5List.get(7) + v6List.get(7) + v7List.get(7)).isEqualTo(50); + assertThat(v4List.get(9) + v5List.get(9) + v6List.get(9) + v7List.get(9)).isEqualTo(0); } @Test @@ -1344,8 +1342,8 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { fail("Interrupted"); } - assertNotEquals(0, (int) vm4.invoke(() -> getGatewaySenderPoolDisconnects(senderId))); - assertEquals(0, ((PoolImpl) clientCache.getDefaultPool()).getStats().getDisConnects()); + assertThat((int) vm4.invoke(() -> getGatewaySenderPoolDisconnects(senderId))).isNotEqualTo(0); + assertThat(((PoolImpl) clientCache.getDefaultPool()).getStats().getDisConnects()).isEqualTo(0); } protected Map<Object, Object> putKeyValues() { @@ -1448,7 +1446,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase { List<Integer> stats = vm.invoke(() -> WANTestBase.getSenderStats(senderId, -1)); actualSize += stats.get(9); } - assertEquals(expectedSize, actualSize); + assertThat(actualSize).isEqualTo(expectedSize); } private void putSameEntry(String regionName, int numIterations) { diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java index 40c120b81d..b69d7f645f 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java @@ -18,8 +18,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import static org.apache.geode.test.awaitility.GeodeAwaitility.await; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import java.io.File; import java.util.ArrayList; @@ -185,11 +184,11 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { ArrayList<Integer> v5List = (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln", 1000)); // secondary queue size stats in serial queue should be 0 - assertEquals(0, v4List.get(10) + v5List.get(10)); + assertThat(v4List.get(10) + v5List.get(10)).isEqualTo(0); HashMap primarySenderUpdates = vm4.invoke(WANTestBase::checkQueue); HashMap secondarySenderUpdates = vm5.invoke(WANTestBase::checkQueue); - assertEquals(primarySenderUpdates, secondarySenderUpdates); + assertThat(secondarySenderUpdates).isEqualTo(primarySenderUpdates); vm4.invoke(() -> WANTestBase.resumeSender("ln")); Wait.pause(2000); @@ -212,15 +211,15 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { List destroyList = (List) primarySenderUpdates.get("Destroy"); List createList = (List) receiverUpdates.get("Create"); for (int i = 0; i < 1000; i++) { - assertEquals(destroyList.get(i), createList.get(i)); + assertThat(createList.get(i)).isEqualTo(destroyList.get(i)); } - assertEquals(primarySenderUpdates.get("Destroy"), receiverUpdates.get("Create")); + assertThat(receiverUpdates.get("Create")).isEqualTo(primarySenderUpdates.get("Destroy")); Wait.pause(5000); // We expect that after this much time secondary would have got batch removal message // removing all the keys. secondarySenderUpdates = vm5.invoke(WANTestBase::checkQueue); - assertEquals(secondarySenderUpdates.get("Destroy"), receiverUpdates.get("Create")); + assertThat(receiverUpdates.get("Create")).isEqualTo(secondarySenderUpdates.get("Destroy")); vm4.invoke(() -> WANTestBase.getSenderStats("ln", 0)); vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0)); @@ -283,7 +282,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { Wait.pause(15000); primarySenderUpdates = vm4.invoke(WANTestBase::checkQueue); secondarySenderUpdates = vm5.invoke(WANTestBase::checkQueue); - assertEquals(primarySenderUpdates, secondarySenderUpdates); + assertThat(secondarySenderUpdates).isEqualTo(primarySenderUpdates); vm4.invoke(() -> WANTestBase.resumeSender("ln")); Wait.pause(5000); @@ -339,12 +338,12 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { regionFactory.addGatewaySenderId(sender1.getId()); Region region = regionFactory.create("test_ValidateGatewaySenderAttributes"); Set<GatewaySender> senders = cache.getGatewaySenders(); - assertEquals(senders.size(), 1); + assertThat(1).isEqualTo(senders.size()); GatewaySender gatewaySender = senders.iterator().next(); Set<RegionQueue> regionQueues = ((AbstractGatewaySender) gatewaySender).getQueues(); - assertEquals(regionQueues.size(), GatewaySender.DEFAULT_DISPATCHER_THREADS); + assertThat(GatewaySender.DEFAULT_DISPATCHER_THREADS).isEqualTo(regionQueues.size()); RegionQueue regionQueue = regionQueues.iterator().next(); - assertEquals(true, regionQueue.getRegion().getAttributes().isDiskSynchronous()); + assertThat(regionQueue.getRegion().getAttributes().isDiskSynchronous()).isEqualTo(true); } finally { exTKSender.remove(); } @@ -389,13 +388,13 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { regionFactory.addGatewaySenderId(sender1.getId()); Region region = regionFactory.create("test_ValidateGatewaySenderAttributes"); Set<GatewaySender> senders = cache.getGatewaySenders(); - assertEquals(senders.size(), 1); + assertThat(1).isEqualTo(senders.size()); GatewaySender gatewaySender = senders.iterator().next(); Set<RegionQueue> regionQueues = ((AbstractGatewaySender) gatewaySender).getQueues(); - assertEquals(regionQueues.size(), GatewaySender.DEFAULT_DISPATCHER_THREADS); + assertThat(GatewaySender.DEFAULT_DISPATCHER_THREADS).isEqualTo(regionQueues.size()); RegionQueue regionQueue = regionQueues.iterator().next(); - assertEquals(false, regionQueue.getRegion().getAttributes().isDiskSynchronous()); + assertThat(regionQueue.getRegion().getAttributes().isDiskSynchronous()).isEqualTo(false); } finally { exp.remove(); } @@ -489,7 +488,7 @@ public class SerialGatewaySenderQueueDUnitTest extends WANTestBase { vm2.invoke(() -> { long startTime = System.currentTimeMillis(); while (System.currentTimeMillis() - startTime < batchIntervalTime - 1000) { - assertEquals(0, listener1.getNumEvents()); + assertThat(listener1.getNumEvents()).isEqualTo(0); } }); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java index df3a19db71..4e5358b478 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDUnitTest.java @@ -21,8 +21,6 @@ import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import static org.apache.geode.test.awaitility.GeodeAwaitility.await; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; @@ -213,8 +211,8 @@ public class SerialWANConflationDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertTrue("No events conflated in batch", - (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0); + assertThat((v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0).as( + "No events conflated in batch").isTrue(); } @Test @@ -260,8 +258,8 @@ public class SerialWANConflationDUnitTest extends WANTestBase { ArrayList<Integer> v4List = (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln", 20)); - assertEquals("After conflation during enqueue, there should be only 20 events", 20, - (int) v4List.get(0)); + assertThat((int) v4List.get(0)).as( + "After conflation during enqueue, there should be only 20 events").isEqualTo(20); vm4.invoke(() -> resumeSender("ln")); vm5.invoke(() -> resumeSender("ln")); @@ -276,10 +274,10 @@ public class SerialWANConflationDUnitTest extends WANTestBase { ArrayList<Integer> v7List = (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertEquals("No events in secondary queue stats since it's serial sender", 0, - (v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10))); - assertEquals("Total queued events should be 100", 100, - (v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2))); + assertThat((v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10))).as( + "No events in secondary queue stats since it's serial sender").isEqualTo(0); + assertThat((v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2))).as( + "Total queued events should be 100").isEqualTo(100); vm2.invoke(() -> validateRegionSize(getTestMethodName(), 10)); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java index 1a8cabe654..0bc35b7c03 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java @@ -18,8 +18,7 @@ import static org.apache.geode.test.awaitility.GeodeAwaitility.await; import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException; import static org.apache.geode.test.dunit.Wait.pause; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.assertj.core.api.Assertions.fail; import java.util.ArrayList; import java.util.HashMap; @@ -637,8 +636,8 @@ public class SerialWANStatsDUnitTest extends WANTestBase { vm7.invokeAsync(() -> WANTestBase.doTxPutsWithRetryIfError(testName + "_RR", 2, 5000, 1)); vm2.invoke(() -> await() - .untilAsserted(() -> assertEquals("Waiting for some batches to be received", true, - getRegionSize(testName + "_RR") > 40))); + .untilAsserted(() -> assertThat(getRegionSize(testName + "_RR") > 40).as( + "Waiting for some batches to be received").isEqualTo(true))); AsyncInvocation inv3 = vm4.invokeAsync(() -> WANTestBase.killSender("ln")); Boolean isKilled = Boolean.FALSE; @@ -795,7 +794,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase { inv1.join(); } catch (InterruptedException e) { e.printStackTrace(); - fail(); + fail(e.toString()); } // assuming some events might have been dispatched before the remote region was destroyed,