add: Asserts#assertEventually( Duration duration, Duration retryInter…

…val, oap.util.function.Try.ThrowingRunnable asserts )
oaplatform · Sep 27, 2023 · e04ac65 · e04ac65
1 parent 486ae25
commit e04ac65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/oap-stdlib/src/main/java/oap/testng/Asserts.java b/oap-stdlib/src/main/java/oap/testng/Asserts.java
@@ -45,6 +45,7 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.util.Map;
 
 import static java.util.stream.Collectors.toList;
@@ -76,11 +77,15 @@ public static void eventually( long retryTimeout, int retries, Try.ThrowingRunna
             else throw new AssertionError( "timeout" );
     }
 
-    @SneakyThrows
     public static void assertEventually( long retryTimeout, int retries, oap.util.function.Try.ThrowingRunnable asserts ) {
         eventually( retryTimeout, retries, asserts );
     }
 
+    public static void assertEventually( Duration duration, Duration retryInterval, oap.util.function.Try.ThrowingRunnable asserts ) {
+        int retries = ( int ) ( duration.toMillis() / retryInterval.toMillis() );
+        eventually( retryInterval.toMillis(), retries, asserts );
+    }
+
     @Deprecated
     public static <A> void assertEquals( java.util.stream.Stream<? extends A> actual, java.util.stream.Stream<? extends A> expected ) {
         if( actual == null && expected != null ) fail( "actual stream is null" );

diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
 
     <properties>
 
-        <oap.project.version>18.11.8</oap.project.version>
+        <oap.project.version>18.11.9</oap.project.version>
 
         <oap.deps.testng.version>7.8.0</oap.deps.testng.version>
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>