Merge branch 'ecchronos-4.0'

Ericsson · Aug 23, 2023 · 8b08051 · 8b08051
2 parents 36e9db2 + 52d1446
commit 8b08051
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...ntegration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/ITSchedules.java b/...ntegration/src/test/java/com/ericsson/bss/cassandra/ecchronos/standalone/ITSchedules.java
@@ -85,11 +85,12 @@
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.anyMap;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.longThat;
+import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.timeout;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -443,10 +444,10 @@ private void verifyTableRepairedSinceWithSubRangeRepair(TableReference tableRefe
         OptionalLong repairedAt = lastRepairedSince(tableReference, repairedSince, expectedRepaired);
         assertThat(repairedAt.isPresent()).isTrue();
 
-        verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(tableReference, repairedAt.getAsLong());
+        verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(eq(tableReference), longThat(l -> l >= repairedAt.getAsLong()));
 
         int expectedTokenRanges = expectedRepaired.size();
-        verify(mockTableRepairMetrics, times(expectedTokenRanges))
+        verify(mockTableRepairMetrics, atLeast(expectedTokenRanges))
                 .repairSession(eq(tableReference), anyLong(), any(TimeUnit.class), eq(true));
     }
 
@@ -456,10 +457,10 @@ private void verifyTableRepairedSince(TableReference tableReference, long repair
         OptionalLong repairedAt = lastRepairedSince(tableReference, repairedSince);
         assertThat(repairedAt.isPresent()).isTrue();
 
-        verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(tableReference, repairedAt.getAsLong());
+        verify(mockTableRepairMetrics, timeout(5000)).lastRepairedAt(eq(tableReference), longThat(l -> l >= repairedAt.getAsLong()));
 
         int expectedTokenRanges = expectedRepaired.size();
-        verify(mockTableRepairMetrics, times(expectedTokenRanges))
+        verify(mockTableRepairMetrics, atLeast(expectedTokenRanges))
                 .repairSession(eq(tableReference), anyLong(), any(TimeUnit.class), eq(true));
     }