DonalEvans commented on code in PR #7573:
URL: https://github.com/apache/geode/pull/7573#discussion_r847814434
##########
geode-core/src/distributedTest/java/org/apache/geode/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java:
##########
@@ -770,8 +771,11 @@ private static <K, V> Region<K, V>
createColocatedRegion(String regionName,
int localMaxMemory) {
PartitionAttributesFactory<K, V> paf = new PartitionAttributesFactory<>();
+ @SuppressWarnings("unchecked")
+ final PartitionResolver<K, V> customerIDPartitionResolver =
+ (PartitionResolver<K, V>) new
CustomerIDPartitionResolver("CustomerIDPartitionResolver");
paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(totalNoofBuckets)
- .setPartitionResolver(new
CustomerIDPartitionResolver<>("CustomerIDPartitionResolver"));
+ .setPartitionResolver(customerIDPartitionResolver);
Review Comment:
I think that this can be left as is if the method is changed to return
`Region<Object, Object>` rather than `Region<K, V>`, since we know that all the
regions we're dealing with in this test are typed that way, as is the
`CustomerIDPartitionResolver`. It's not clear to me why this method is using
generics in the first place.
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java:
##########
@@ -161,18 +160,16 @@ public void
testParallelSenderQueueNoEventsExceedingHighAlertThreshold() {
vm2.invoke(serializableRunnableIF);
vm3.invoke(serializableRunnableIF);
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
- ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
- ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
- ArrayList<Integer> v7List =
- (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
+ List<Integer> v5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
+ 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(0).as(
+ "GatewaySenders Stats should contain number of
EventsExceedingAlertThreshold = 0")
+ .isEqualTo((v4List.get(12) + v5List.get(12) + v6List.get(12) +
v7List.get(12)));
+ });
Review Comment:
Could the expected and actual be swapped here please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java:
##########
@@ -832,27 +832,25 @@ public void
testPartitionedRegionParallelPropagation_AfterDispatch_Redundancy_3(
vm2.invoke(() -> WANTestBase.validateRegionSize(testName, NUM_PUTS));
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> v7List =
- (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln",
0));
-
- // queue size:
- assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) +
v7List.get(0)).isEqualTo(0);
- // events received:
- assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) +
v7List.get(1)).isEqualTo(400);
- // events queued:
- assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) +
v7List.get(2)).isEqualTo(400);
- // 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();
- // batches redistributed:
- assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) +
v7List.get(5)).isEqualTo(0);
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+
+ // queue size:
+ assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) +
v7List.get(0)).isEqualTo(0);
+ // events received:
+ assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) +
v7List.get(1)).isEqualTo(400);
+ // events queued:
+ assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) +
v7List.get(2)).isEqualTo(400);
+ // 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();
Review Comment:
Could this be `isGreaterThanOrEqualTo(10);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java:
##########
@@ -718,21 +716,22 @@ public void
testPRParallelPropagationWithBatchRedistWithoutGroupTransactionEvent
createReceiverInVMs(vm2);
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
-
- // queue size:
- assertThat((int) v4List.get(0)).isEqualTo(0);
- // events received:
- assertThat((int) v4List.get(1)).isEqualTo(entries);
- // events queued:
- assertThat((int) v4List.get(2)).isEqualTo(entries);
- // events distributed:
- assertThat((int) v4List.get(3)).isEqualTo(entries);
- // batches distributed:
- assertThat((int) v4List.get(4)).isEqualTo(3);
- // batches redistributed:
- assertThat((v4List.get(5)) > 0).as("Batch was not redistributed").isTrue();
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+
+ // queue size:
+ assertThat((int) v4List.get(0)).isEqualTo(0);
+ // events received:
+ assertThat((int) v4List.get(1)).isEqualTo(entries);
+ // events queued:
+ assertThat((int) v4List.get(2)).isEqualTo(entries);
+ // events distributed:
+ assertThat((int) v4List.get(3)).isEqualTo(entries);
+ // batches distributed:
+ assertThat((int) v4List.get(4)).isEqualTo(3);
+ // batches redistributed:
+ assertThat((v4List.get(5)) > 0).as("Batch was not
redistributed").isTrue();
Review Comment:
Could this be `isGreaterThan(0);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderAlertThresholdDUnitTest.java:
##########
@@ -86,17 +86,16 @@ public void testParallelSenderQueueEventsAlertThreshold() {
vm2.invoke(serializableRunnableIF);
vm3.invoke(serializableRunnableIF);
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
- ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
- ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
- ArrayList<Integer> v7List =
- (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
+ List<Integer> v5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln",
-1));
+ 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)) > 0).as(
+ "GatewaySenders Stats should contain number of
EventsExceedingAlertThreshold > 0")
+ .isTrue();
Review Comment:
Could this be changed to:
```
assertThat((v4List.get(12) + v5List.get(12) + v6List.get(12) +
v7List.get(12))).as(
"GatewaySenders Stats should contain number of
EventsExceedingAlertThreshold > 0")
.isGreaterThan(0);
```
to make it more clear what's actually being asserted?
Alternately, if we want to be even more explicit at the cost of being more
verbose:
```
assertThat(12)
.as("GatewaySenders Stats should contain number of
EventsExceedingAlertThreshold > 0")
.satisfiesAnyOf(
statIndex ->
assertThat(v4List.get(statIndex)).isGreaterThan(0),
statIndex ->
assertThat(v5List.get(statIndex)).isGreaterThan(0),
statIndex ->
assertThat(v6List.get(statIndex)).isGreaterThan(0),
statIndex -> assertThat(v7List.get(statIndex)).isGreaterThan(0)
);
```
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java:
##########
@@ -217,38 +212,34 @@ public void doTestParallelPropagationConflation(int
redundancy) {
}
private void validateSecondaryEventQueueSize(int expectedNum, int
redundancy) {
- ArrayList<Integer> vm4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
expectedNum));
- ArrayList<Integer> vm5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
expectedNum));
- ArrayList<Integer> vm6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
expectedNum));
- ArrayList<Integer> vm7List =
- (ArrayList<Integer>) 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();
+ await().untilAsserted(() -> {
+ List<Integer> vm4List = vm4.invoke(() ->
WANTestBase.getSenderStats("ln", expectedNum));
+ 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();
Review Comment:
Could this be changed to `isEqualTo(expectedNum * redundancy);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java:
##########
@@ -297,27 +301,25 @@ public void
testPartitionedRegionParallelPropagation_AfterDispatch_NoRedundancy(
vm2.invoke(() -> WANTestBase.validateRegionSize(testName, NUM_PUTS));
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> v7List =
- (ArrayList<Integer>) vm7.invoke(() -> WANTestBase.getSenderStats("ln",
0));
-
- // queue size:
- assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) +
v7List.get(0)).isEqualTo(0);
- // eventsReceived:
- assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) +
v7List.get(1)).isEqualTo(NUM_PUTS);
- // events queued:
- assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) +
v7List.get(2)).isEqualTo(NUM_PUTS);
- // 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();
- // batches redistributed:
- assertThat(v4List.get(5) + v5List.get(5) + v6List.get(5) +
v7List.get(5)).isEqualTo(0);
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v6List = vm6.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v7List = vm7.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+
+ // queue size:
+ assertThat(v4List.get(0) + v5List.get(0) + v6List.get(0) +
v7List.get(0)).isEqualTo(0);
+ // eventsReceived:
+ assertThat(v4List.get(1) + v5List.get(1) + v6List.get(1) +
v7List.get(1)).isEqualTo(NUM_PUTS);
+ // events queued:
+ assertThat(v4List.get(2) + v5List.get(2) + v6List.get(2) +
v7List.get(2)).isEqualTo(NUM_PUTS);
+ // 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();
Review Comment:
Could this be `isGreaterThanOrEqualTo(10);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java:
##########
@@ -217,38 +212,34 @@ public void doTestParallelPropagationConflation(int
redundancy) {
}
private void validateSecondaryEventQueueSize(int expectedNum, int
redundancy) {
- ArrayList<Integer> vm4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
expectedNum));
- ArrayList<Integer> vm5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
expectedNum));
- ArrayList<Integer> vm6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
expectedNum));
- ArrayList<Integer> vm7List =
- (ArrayList<Integer>) 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();
+ await().untilAsserted(() -> {
+ List<Integer> vm4List = vm4.invoke(() ->
WANTestBase.getSenderStats("ln", expectedNum));
+ 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();
+ });
}
private void validateEventsProcessedByPQRM(int expectedNum, int redundancy) {
- ArrayList<Integer> vm4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> vm5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> vm6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
0));
- ArrayList<Integer> vm7List =
- (ArrayList<Integer>) 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();
+ await().untilAsserted(() -> {
+ List<Integer> vm4List = vm4.invoke(() ->
WANTestBase.getSenderStats("ln", 0));
+ 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();
Review Comment:
Could this be changed to `isEqualTo(expectedNum * redundancy);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java:
##########
@@ -120,26 +120,26 @@ public void testParallelPropagationBatchConflation() {
vm6.invoke(() -> enableConflation("ln"));
vm7.invoke(() -> enableConflation("ln"));
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
100));
- ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
100));
- ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
100));
- ArrayList<Integer> v7List =
- (ArrayList<Integer>) 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();
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
100));
+ 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();
+ });
resumeSenders();
- v4List = (ArrayList<Integer>) vm4.invoke(() ->
WANTestBase.getSenderStats("ln", 0));
- v5List = (ArrayList<Integer>) vm5.invoke(() ->
WANTestBase.getSenderStats("ln", 0));
- v6List = (ArrayList<Integer>) vm6.invoke(() ->
WANTestBase.getSenderStats("ln", 0));
- v7List = (ArrayList<Integer>) vm7.invoke(() ->
WANTestBase.getSenderStats("ln", 0));
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ List<Integer> v5List = vm5.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+ 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)) > 0).as(
+ "No events conflated in batch").isTrue();
Review Comment:
Could this be `isGreaterThan(0);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java:
##########
@@ -120,26 +120,26 @@ public void testParallelPropagationBatchConflation() {
vm6.invoke(() -> enableConflation("ln"));
vm7.invoke(() -> enableConflation("ln"));
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
100));
- ArrayList<Integer> v5List =
- (ArrayList<Integer>) vm5.invoke(() -> WANTestBase.getSenderStats("ln",
100));
- ArrayList<Integer> v6List =
- (ArrayList<Integer>) vm6.invoke(() -> WANTestBase.getSenderStats("ln",
100));
- ArrayList<Integer> v7List =
- (ArrayList<Integer>) 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();
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
100));
+ 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();
Review Comment:
Could this be changed to `isEqualTo(100);` please?
##########
geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java:
##########
@@ -793,23 +792,24 @@ public void
testPRParallelPropagationWithBatchRedistWithGroupTransactionEventsSe
createReceiverInVMs(vm2);
- ArrayList<Integer> v4List =
- (ArrayList<Integer>) vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
-
- // queue size:
- assertThat((int) v4List.get(0)).isEqualTo(0);
- // events received:
- assertThat((int) v4List.get(1)).isEqualTo(entries);
- // events queued:
- assertThat((int) v4List.get(2)).isEqualTo(entries);
- // events distributed:
- assertThat((int) v4List.get(3)).isEqualTo(entries);
- // batches distributed:
- assertThat((int) v4List.get(4)).isEqualTo(2);
- // batches redistributed:
- assertThat((v4List.get(5)) > 0).as("Batch was not redistributed").isTrue();
- // events not queued conflated:
- assertThat((int) v4List.get(7)).isEqualTo(0);
+ await().untilAsserted(() -> {
+ List<Integer> v4List = vm4.invoke(() -> WANTestBase.getSenderStats("ln",
0));
+
+ // queue size:
+ assertThat((int) v4List.get(0)).isEqualTo(0);
+ // events received:
+ assertThat((int) v4List.get(1)).isEqualTo(entries);
+ // events queued:
+ assertThat((int) v4List.get(2)).isEqualTo(entries);
+ // events distributed:
+ assertThat((int) v4List.get(3)).isEqualTo(entries);
+ // batches distributed:
+ assertThat((int) v4List.get(4)).isEqualTo(2);
+ // batches redistributed:
+ assertThat((v4List.get(5)) > 0).as("Batch was not
redistributed").isTrue();
Review Comment:
Could this be `isGreaterThan(0);` please?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
