* //passes when someMethod() is called no later than within 100 ms
* //exits immediately when verification is satisfied (e.g. may not wait full 100 ms)
- * verify(mock, timeout(100)).someMethod();
+ * verify(mock, timeout(Duration.ofMillis(100))).someMethod();
* //above is an alias to:
- * verify(mock, timeout(100).times(1)).someMethod();
+ * verify(mock, timeout(Duration.ofMillis(100)).times(1)).someMethod();
*
* //passes as soon as someMethod() has been called 2 times under 100 ms
- * verify(mock, timeout(100).times(2)).someMethod();
+ * verify(mock, timeout(Duration.ofMillis(100)).times(2)).someMethod();
*
* //equivalent: this also passes as soon as someMethod() has been called 2 times under 100 ms
- * verify(mock, timeout(100).atLeast(2)).someMethod();
+ * verify(mock, timeout(Duration.ofMillis(100)).atLeast(2)).someMethod();
* + * See also {@link #after(Duration)} method for testing async code. + * Differences between {@code timeout()} and {@code after} are explained in Javadoc for {@link #after(Duration)}. + * + *
+ * //passes when someMethod() is called no later than within 100 ms
+ * //exits immediately when verification is satisfied (e.g. may not wait full 100 ms)
+ * verify(mock, timeout(Duration.ofMillis(100))).someMethod();
+ * //above is an alias to:
+ * verify(mock, timeout(Duration.ofMillis(100)).times(1)).someMethod();
+ *
+ * //passes as soon as someMethod() has been called 2 times under 100 ms
+ * verify(mock, timeout(Duration.ofMillis(100)).times(2)).someMethod();
+ *
+ * //equivalent: this also passes as soon as someMethod() has been called 2 times under 100 ms
+ * verify(mock, timeout(Duration.ofMillis(100)).atLeast(2)).someMethod();
+ * + * Not yet implemented to work with InOrder verification. + *
+ * See also {@link #timeout(Duration)} method for testing async code. + * Differences between {@code timeout()} and {@code after()} are explained below. + * + *
+ * //passes after 100ms, if someMethod() has only been called once at that time.
+ * verify(mock, after(Duration.ofMillis(100))).someMethod();
+ * //above is an alias to:
+ * verify(mock, after(Duration.ofMillis(100)).times(1)).someMethod();
+ *
+ * //passes if someMethod() is called *exactly* 2 times, as tested after 100 millis
+ * verify(mock, after(Duration.ofMillis(100)).times(2)).someMethod();
+ *
+ * //passes if someMethod() has not been called, as tested after 100 millis
+ * verify(mock, after(Duration.ofMillis(100)).never()).someMethod();
+ *
+ * //verifies someMethod() after a given time span using given verification mode
+ * //useful only if you have your own custom verification modes.
+ * verify(mock, new After(Duration.ofMillis(100), yourOwnVerificationMode)).someMethod();
+ *
+ * //1.
+ * mock.foo();
+ * verify(mock, after(Duration.ofSeconds(1))).foo();
+ * //waits 1 second and succeeds
+ *
+ * //2.
+ * mock.foo();
+ * verify(mock, timeout(Duration.ofSeconds(1))).foo();
+ * //succeeds immediately
+ * * Typically, you won't use this class explicitly. Instead use timeout() method on Mockito class. * See javadoc for {@link VerificationWithTimeout} + * @deprecated Use {@link After#After(Duration, VerificationMode)} instead. */ + @Deprecated public After(long delayMillis, VerificationMode verificationMode) { - this(10, delayMillis, verificationMode); + this(Duration.ofMillis(delayMillis), verificationMode); + } + + /** + * See the javadoc for {@link VerificationAfterDelay} + *
+ * Typically, you won't use this class explicitly. Instead use timeout() method on Mockito class.
+ * See javadoc for {@link VerificationWithTimeout}
+ */
+ public After(Duration delay, VerificationMode verificationMode) {
+ this(Duration.ofMillis(10), delay, verificationMode);
}
- After(long pollingPeriod, long delayMillis, VerificationMode verificationMode) {
- this(new VerificationOverTimeImpl(pollingPeriod, delayMillis, verificationMode, false));
+ After(Duration pollingPeriod, Duration delay, VerificationMode verificationMode) {
+ this(new VerificationOverTimeImpl(pollingPeriod, delay, verificationMode, false));
}
After(VerificationOverTimeImpl verificationOverTime) {
diff --git a/src/main/java/org/mockito/verification/Timeout.java b/src/main/java/org/mockito/verification/Timeout.java
index 99dcc45f53..b7679abf26 100644
--- a/src/main/java/org/mockito/verification/Timeout.java
+++ b/src/main/java/org/mockito/verification/Timeout.java
@@ -6,6 +6,8 @@
import static org.mockito.internal.exceptions.Reporter.atMostAndNeverShouldNotBeUsedWithTimeout;
+import java.time.Duration;
+
import org.mockito.internal.util.Timer;
import org.mockito.internal.verification.VerificationOverTimeImpl;
import org.mockito.internal.verification.VerificationWrapper;
@@ -23,23 +25,35 @@ public class Timeout extends VerificationWrapper
* Typically, you won't use this class explicitly. Instead use timeout() method on Mockito class.
* See javadoc for {@link VerificationWithTimeout}
+ * @deprecated Use {@link Timeout#Timeout(Duration, VerificationMode)} instead.
*/
+ @Deprecated
public Timeout(long millis, VerificationMode delegate) {
- this(10, millis, delegate);
+ this(Duration.ofMillis(millis), delegate);
+ }
+
+ /**
+ * See the javadoc for {@link VerificationWithTimeout}
+ *
+ * Typically, you won't use this class explicitly. Instead use timeout() method on Mockito class.
+ * See javadoc for {@link VerificationWithTimeout}
+ */
+ public Timeout(Duration timeout, VerificationMode delegate) {
+ this(Duration.ofMillis(10), timeout, delegate);
}
/**
* See the javadoc for {@link VerificationWithTimeout}
*/
- Timeout(long pollingPeriodMillis, long millis, VerificationMode delegate) {
- this(new VerificationOverTimeImpl(pollingPeriodMillis, millis, delegate, true));
+ Timeout(Duration pollingPeriod, Duration timeout, VerificationMode delegate) {
+ this(new VerificationOverTimeImpl(pollingPeriod, timeout, delegate, true));
}
/**
* See the javadoc for {@link VerificationWithTimeout}
*/
- Timeout(long pollingPeriodMillis, VerificationMode delegate, Timer timer) {
- this(new VerificationOverTimeImpl(pollingPeriodMillis, delegate, true, timer));
+ Timeout(Duration pollingPeriod, VerificationMode delegate, Timer timer) {
+ this(new VerificationOverTimeImpl(pollingPeriod, delegate, true, timer));
}
Timeout(VerificationOverTimeImpl verificationOverTime) {
diff --git a/src/test/java/org/mockito/internal/util/TimerTest.java b/src/test/java/org/mockito/internal/util/TimerTest.java
index 8a4a173e02..2f2885b0da 100644
--- a/src/test/java/org/mockito/internal/util/TimerTest.java
+++ b/src/test/java/org/mockito/internal/util/TimerTest.java
@@ -4,6 +4,8 @@
*/
package org.mockito.internal.util;
+import java.time.Duration;
+
import org.assertj.core.api.Assertions;
import org.junit.Rule;
import org.junit.Test;
@@ -18,7 +20,7 @@ public class TimerTest extends TestBase {
@Test
public void should_return_true_if_task_is_in_acceptable_time_bounds() {
//given
- long duration = 10000L;
+ Duration duration = Duration.ofSeconds(10);
Timer timer = new Timer(duration);
//when
@@ -31,7 +33,7 @@ public void should_return_true_if_task_is_in_acceptable_time_bounds() {
@Test
public void should_return_false_when_time_run_out() throws Exception {
//given
- Timer timer = new Timer(0);
+ Timer timer = new Timer(Duration.ZERO);
timer.start();
//when
@@ -45,7 +47,7 @@ public void should_return_false_when_time_run_out() throws Exception {
public void should_throw_friendly_reminder_exception_when_duration_is_negative() {
expectedException.expect(FriendlyReminderException.class);
expectedException.expectMessage("Don't panic! I'm just a friendly reminder!");
- new Timer(-1);
+ new Timer(Duration.ofMillis(-1));
}
private void oneMillisecondPasses() throws InterruptedException {
diff --git a/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java b/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java
index 82cceeaea7..5f206c5420 100644
--- a/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java
+++ b/src/test/java/org/mockito/internal/verification/VerificationOverTimeImplTest.java
@@ -9,6 +9,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.MockitoAnnotations.initMocks;
+import java.time.Duration;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -29,7 +31,8 @@ public class VerificationOverTimeImplTest {
@Before
public void setUp() {
initMocks(this);
- impl = new VerificationOverTimeImpl(10, 1000, delegate, true);
+ impl = new VerificationOverTimeImpl(
+ Duration.ofMillis(10), Duration.ofSeconds(1), delegate, true);
}
@Test
diff --git a/src/test/java/org/mockito/verification/TimeoutTest.java b/src/test/java/org/mockito/verification/TimeoutTest.java
index ae6e5d2e84..3719ae4215 100644
--- a/src/test/java/org/mockito/verification/TimeoutTest.java
+++ b/src/test/java/org/mockito/verification/TimeoutTest.java
@@ -7,6 +7,8 @@
import static org.junit.Assert.fail;
import static org.mockito.Mockito.*;
+import java.time.Duration;
+
import org.junit.Test;
import org.mockito.InOrder;
import org.mockito.Mock;
@@ -28,7 +30,7 @@ public class TimeoutTest extends TestBase {
@Test
public void should_pass_when_verification_passes() {
- Timeout t = new Timeout(1, mode, timer);
+ Timeout t = new Timeout(Duration.ofMillis(1), mode, timer);
when(timer.isCounting()).thenReturn(true);
doNothing().when(mode).verify(data);
@@ -42,7 +44,7 @@ public void should_pass_when_verification_passes() {
@Test
public void should_fail_because_verification_fails() {
- Timeout t = new Timeout(1, mode, timer);
+ Timeout t = new Timeout(Duration.ofMillis(1), mode, timer);
when(timer.isCounting()).thenReturn(true, true, true, false);
doThrow(error).
@@ -60,7 +62,7 @@ public void should_fail_because_verification_fails() {
@Test
public void should_pass_even_if_first_verification_fails() {
- Timeout t = new Timeout(1, mode, timer);
+ Timeout t = new Timeout(Duration.ofMillis(1), mode, timer);
when(timer.isCounting()).thenReturn(true, true, true, false);
doThrow(error).
@@ -74,7 +76,7 @@ public void should_pass_even_if_first_verification_fails() {
@Test
public void should_try_to_verify_correct_number_of_times() {
- Timeout t = new Timeout(10, mode, timer);
+ Timeout t = new Timeout(Duration.ofMillis(10), mode, timer);
doThrow(error).when(mode).verify(data);
when(timer.isCounting()).thenReturn(true, true, true, true, true, false);
diff --git a/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java b/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java
index 0c50578f6c..230b632910 100644
--- a/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java
+++ b/src/test/java/org/mockitousage/verification/VerificationWithTimeoutTest.java
@@ -10,6 +10,7 @@
import static org.mockito.junit.MockitoJUnit.rule;
import static org.mockitoutil.Stopwatch.createNotStarted;
+import java.time.Duration;
import java.util.concurrent.TimeUnit;
import org.assertj.core.api.Assertions;
@@ -57,6 +58,17 @@ public void should_verify_with_timeout() {
verify(mock).oneArg('c'); //sanity check
}
+ @Test
+ public void should_verify_with_timeout_duration() {
+ // when
+ async.runAfter(50, callMock('c'));
+ async.runAfter(500, callMock('c'));
+
+ // then
+ verify(mock, timeout(Duration.ofMillis(200)).only()).oneArg('c');
+ verify(mock).oneArg('c'); //sanity check
+ }
+
@Test
public void should_verify_with_timeout_and_fail() {
// when
@@ -72,6 +84,21 @@ public void call() {
//TODO let's have a specific exception vs. generic assertion error + message
}
+ @Test
+ public void should_verify_with_timeout_and_fail_duration() {
+ // when
+ async.runAfter(200, callMock('c'));
+
+ // then
+ Assertions.assertThatThrownBy(new ThrowableAssert.ThrowingCallable() {
+ @Override
+ public void call() {
+ verify(mock, timeout(Duration.ofMillis(50)).only()).oneArg('c');
+ }
+ }).isInstanceOf(AssertionError.class).hasMessageContaining("Wanted but not invoked");
+ //TODO let's have a specific exception vs. generic assertion error + message
+ }
+
@Test
@Ignore //TODO nice to have
public void should_verify_with_timeout_and_fail_early() {