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 09b8b46ef2fa1d463be885c6fa39dbfe1f0e3e83 Author: Jacob Barrett <[email protected]> AuthorDate: Tue Apr 12 09:46:10 2022 -0700 GEODE-8228: Use assertThat without embedded comparisons. --- ...nedRegionSingleHopWithServerGroupDUnitTest.java | 14 ++--- ...llelGatewaySenderOperation2DistributedTest.java | 7 +-- ...GatewaySenderAlertThresholdDistributedTest.java | 43 ++++++++------- .../ParallelWANConflationDistributedTest.java | 27 ++++----- .../parallel/ParallelWANStatsDistributedTest.java | 64 +++++++++++----------- .../serial/SerialWANConflationDistributedTest.java | 4 +- 6 files changed, 75 insertions(+), 84 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java index 83142d51e3..55f3718365 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java @@ -44,7 +44,6 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.PartitionAttributesFactory; -import org.apache.geode.cache.PartitionResolver; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.client.Pool; @@ -764,18 +763,15 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca } - private static <K, V> Region<K, V> createColocatedRegion(String regionName, + private static Region<Object, Object> createColocatedRegion(String regionName, String colocatedRegionName, int redundantCopies, int totalNoofBuckets, int localMaxMemory) { - PartitionAttributesFactory<K, V> paf = new PartitionAttributesFactory<>(); - @SuppressWarnings("unchecked") - final PartitionResolver<K, V> customerIDPartitionResolver = - (PartitionResolver<K, V>) new CustomerIDPartitionResolver("CustomerIDPartitionResolver"); + PartitionAttributesFactory<Object, Object> paf = new PartitionAttributesFactory<>(); paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(totalNoofBuckets) - .setPartitionResolver(customerIDPartitionResolver); + .setPartitionResolver(new CustomerIDPartitionResolver("CustomerIDPartitionResolver")); if (colocatedRegionName != null) { paf.setColocatedWith(colocatedRegionName); @@ -785,10 +781,10 @@ public class PartitionedRegionSingleHopWithServerGroupDUnitTest extends JUnit4Ca paf.setLocalMaxMemory(localMaxMemory); } - RegionFactory<K, V> regionFactory = cache.createRegionFactory(); + RegionFactory<Object, Object> regionFactory = cache.createRegionFactory(); regionFactory.setPartitionAttributes(paf.create()); regionFactory.setConcurrencyChecksEnabled(true); - Region<K, V> region = regionFactory.create(regionName); + Region<Object, Object> region = regionFactory.create(regionName); assertThat(region).isNotNull(); logger.info("Partitioned Region " + regionName + " created Successfully :" + region); return region; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java index 19d9c29287..0d555f0f1a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation2DistributedTest.java @@ -108,8 +108,7 @@ public class ConcurrentParallelGatewaySenderOperation2DistributedTest extends WA vm3.invoke(() -> await() .untilAsserted( - () -> assertThat(WANTestBase.getQueueContentSize("ln2", true) == 0).as( - WANTestBase.getQueueContentSize("ln2", true) + " was the size").isTrue())); + () -> assertThat(WANTestBase.getQueueContentSize("ln2", true)).isZero())); } @@ -568,7 +567,7 @@ public class ConcurrentParallelGatewaySenderOperation2DistributedTest extends WA try { vm5.invoke(() -> localDestroyRegion(customerRegionName)); } catch (Exception ex) { - assertThat(ex.getCause() instanceof UnsupportedOperationException).isTrue(); + assertThat(ex).hasCauseInstanceOf(UnsupportedOperationException.class); } try { @@ -610,7 +609,7 @@ public class ConcurrentParallelGatewaySenderOperation2DistributedTest extends WA try { vm5.invoke(() -> WANTestBase.destroyRegion(customerRegionName)); } catch (Exception ex) { - assertThat(ex.getCause() instanceof IllegalStateException).isTrue(); + assertThat(ex).hasCauseInstanceOf(IllegalStateException.class); return; } fail("Expected UnsupportedOperationException"); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java index e5eb628158..80f5f12792 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDistributedTest.java @@ -92,9 +92,9 @@ public class ParallelGatewaySenderAlertThresholdDistributedTest extends WANTestB List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", -1)); List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", -1)); - assertThat((v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12)) > 0).as( - "GatewaySenders Stats should contain number of EventsExceedingAlertThreshold > 0") - .isTrue(); + assertThat(v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12)).as( + "GatewaySenders Stats EventsExceedingAlertThreshold") + .isGreaterThan(0); }); int v4alert = vm4.invoke( @@ -106,8 +106,9 @@ public class ParallelGatewaySenderAlertThresholdDistributedTest extends WANTestB int v7alert = vm7.invoke( ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); - assertThat((v4alert + v5alert + v6alert + v7alert) > 0).as( - "GatewaySenders MBean should contain number of EventsExceedingAlertThreshold > 0").isTrue(); + assertThat(v4alert + v5alert + v6alert + v7alert).as( + "GatewaySenders MBean EventsExceedingAlertThreshold") + .isGreaterThan(0); } @@ -166,24 +167,24 @@ public class ParallelGatewaySenderAlertThresholdDistributedTest extends WANTestB List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", -1)); List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", -1)); - assertThat(0).as( - "GatewaySenders Stats should contain number of EventsExceedingAlertThreshold = 0") - .isEqualTo((v4List.get(12) + v5List.get(12) + v6List.get(12) + v7List.get(12))); + assertThat(v4List.get(12)).isZero(); + assertThat(v5List.get(12)).isZero(); + assertThat(v6List.get(12)).isZero(); + assertThat(v7List.get(12)).isZero(); }); - int v4alert = vm4.invoke( - ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); - int v5alert = vm5.invoke( - ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); - int v6alert = vm6.invoke( - ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); - int v7alert = vm7.invoke( - ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold); - - assertThat(0).as( - "GatewaySenders MBean should contain number of EventsExceedingAlertThreshold = 0") - .isEqualTo((v4alert + v5alert + v6alert + v7alert)); - + assertThat(vm4.invoke( + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold)) + .isZero(); + assertThat(vm5.invoke( + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold)) + .isZero(); + assertThat(vm6.invoke( + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold)) + .isZero(); + assertThat(vm7.invoke( + ParallelGatewaySenderAlertThresholdDistributedTest::checkSenderMBeanAlertThreshold)) + .isZero(); } } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java index 406ffe512a..f56c12847e 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDistributedTest.java @@ -125,8 +125,8 @@ public class ParallelWANConflationDistributedTest extends WANTestBase { List<Integer> v5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln", 100)); List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", 100)); List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", 100)); - assertThat((v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)) == 100).as( - "Event in secondary queue should be 100").isTrue(); + assertThat(v4List.get(10) + v5List.get(10) + v6List.get(10) + v7List.get(10)).as( + "Event in secondary queue").isEqualTo(100); }); resumeSenders(); @@ -137,8 +137,8 @@ public class ParallelWANConflationDistributedTest extends WANTestBase { List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0)); List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertThat((v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0).as( - "No events conflated in batch").isTrue(); + assertThat(v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)).as( + "No events conflated in batch").isGreaterThan(0); }); verifySecondaryEventQueuesDrained(); @@ -217,12 +217,9 @@ public class ParallelWANConflationDistributedTest extends WANTestBase { List<Integer> vm5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum)); List<Integer> vm6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum)); List<Integer> vm7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", expectedNum)); - assertThat( - (vm4List.get(10) + vm5List.get(10) + vm6List.get(10) + vm7List.get(10)) == expectedNum - * 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(); + assertThat(vm4List.get(10) + vm5List.get(10) + vm6List.get(10) + vm7List.get(10)) + .as("Event in secondary queue") + .isEqualTo(expectedNum * redundancy); }); } @@ -232,13 +229,9 @@ public class ParallelWANConflationDistributedTest extends WANTestBase { List<Integer> vm5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln", 0)); List<Integer> vm6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0)); List<Integer> vm7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertThat( - (vm4List.get(11) + vm5List.get(11) + vm6List.get(11) + vm7List.get(11)) == expectedNum - * 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(); + assertThat(vm4List.get(11) + vm5List.get(11) + vm6List.get(11) + vm7List.get(11)) + .as("Event processed by queue removal message") + .isEqualTo(expectedNum * redundancy); }); } diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java index 59339561fb..7320c0b15a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDistributedTest.java @@ -316,7 +316,8 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { // events distributed: assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(NUM_PUTS); // batches distributed: - assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10).isTrue(); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)) + .isGreaterThanOrEqualTo(10); // batches redistributed: assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); }); @@ -730,7 +731,7 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { // batches distributed: assertThat((int) v4List.get(4)).isEqualTo(3); // batches redistributed: - assertThat((v4List.get(5)) > 0).as("Batch was not redistributed").isTrue(); + assertThat(v4List.get(5)).as("Batch was not redistributed").isGreaterThan(0); }); } @@ -806,7 +807,7 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { // batches distributed: assertThat((int) v4List.get(4)).isEqualTo(2); // batches redistributed: - assertThat((v4List.get(5)) > 0).as("Batch was not redistributed").isTrue(); + assertThat(v4List.get(5)).as("Batch was not redistributed").isGreaterThan(0); // events not queued conflated: assertThat((int) v4List.get(7)).isEqualTo(0); }); @@ -847,7 +848,8 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { // events distributed assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(NUM_PUTS); // batches distributed: - assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 10).isTrue(); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)) + .isGreaterThanOrEqualTo(10); // batches redistributed: assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); }); @@ -892,7 +894,7 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { 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(4)).isGreaterThanOrEqualTo(10); // batches distributed assertThat(v4Sender1List.get(5).intValue()).isEqualTo(0); // batches redistributed }); @@ -902,7 +904,7 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { 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(4)).isGreaterThanOrEqualTo(10); // batches distributed assertThat(v4Sender2List.get(5).intValue()).isEqualTo(0); // batches redistributed }); @@ -935,8 +937,8 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { AsyncInvocation<Void> inv1 = vm5.invokeAsync(() -> WANTestBase.doPuts(testName, 1000)); vm2.invoke(() -> await() - .untilAsserted(() -> assertThat(getRegionSize(testName) > 10).as( - "Waiting for first batch to be received").isTrue())); + .untilAsserted(() -> assertThat(getRegionSize(testName)).as( + "Waiting for first batch to be received").isGreaterThan(10))); AsyncInvocation<Void> inv2 = vm4.invokeAsync(() -> WANTestBase.killSender()); inv1.await(); inv2.await(); @@ -948,21 +950,18 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0)); List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertThat(v5List.get(0) + v6List.get(0) + v7List.get(0)).isEqualTo(0); // queue size + // queue size + assertThat(v5List.get(0)).isZero(); + assertThat(v6List.get(0)).isZero(); + assertThat(v7List.get(0)).isZero(); 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 - assertThat(3000 <= receivedEvents && 3003 >= receivedEvents).as("Received " + receivedEvents) - .isTrue(); // eventsReceived + assertThat(receivedEvents).isBetween(3000, 3003); int queuedEvents = v5List.get(2) + v6List.get(2) + v7List.get(2); - 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 + assertThat(queuedEvents).isBetween(3000, 3003); // quite possible that vm4 has distributed some of the batches. - assertThat(v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // batches - // redistributed + // batches redistributed + assertThat(v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); }); vm2.invoke(() -> WANTestBase.checkGatewayReceiverStatsHA(NUM_PUTS, 1000, 1000)); @@ -1005,8 +1004,8 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { vm5.invokeAsync(() -> WANTestBase.doTxPutsWithRetryIfError(testName, 2, 1000, 0)); vm2.invoke(() -> await() - .untilAsserted(() -> assertThat(getRegionSize(testName) > 40).as( - "Waiting for some batches to be received").isTrue())); + .untilAsserted(() -> assertThat(getRegionSize(testName)).as( + "Waiting for some batches to be received").isGreaterThan(40))); AsyncInvocation<Void> inv3 = vm4.invokeAsync(() -> WANTestBase.killSender()); inv1.await(); inv3.await(); @@ -1022,13 +1021,13 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { 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 - assertThat(6000 <= receivedEvents && 6006 >= receivedEvents).as("Received " + receivedEvents) - .isTrue(); // eventsReceived + assertThat(receivedEvents).isBetween(6000, 6006); int queuedEvents = v5List.get(2) + v6List.get(2) + v7List.get(2); - assertThat(6000 <= queuedEvents && 6006 >= queuedEvents).as("Queued " + queuedEvents) - .isTrue(); // eventsQueued - assertThat(v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // batches - // redistributed + assertThat(queuedEvents).isBetween(6000, 6006); + // batches redistributed + assertThat(v5List.get(5)).isZero(); + assertThat(v6List.get(5)).isZero(); + assertThat(v7List.get(5)).isZero(); }); // batchesReceived is equal to numberOfEntries/(batchSize+1) @@ -1074,9 +1073,11 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", -1)); // batches distributed: it's quite possible that vm4 has distributed some of the batches. - assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 1).isTrue(); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)) + .isGreaterThanOrEqualTo(1); // batches redistributed: - assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5) >= 1).isTrue(); + assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)) + .isGreaterThanOrEqualTo(1); }); } @@ -1126,7 +1127,8 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { // events distributed: assertThat(v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)).isEqualTo(800); // batches distributed: - assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 80).isTrue(); + assertThat(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)) + .isGreaterThanOrEqualTo(80); // batches redistributed: assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)).isEqualTo(0); // events filtered: @@ -1216,7 +1218,7 @@ public class ParallelWANStatsDistributedTest extends WANTestBase { 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(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)).isGreaterThan(10); 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); diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java index cfe6a03ccc..65175e3a22 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/serial/SerialWANConflationDistributedTest.java @@ -208,8 +208,8 @@ public class SerialWANConflationDistributedTest extends WANTestBase { List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln", 0)); List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln", 0)); - assertThat((v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0).as( - "No events conflated in batch").isTrue(); + assertThat(v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)).as( + "No events conflated in batch").isGreaterThan(0); }); }
