Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Guard against multiple evaluations of before statement #1821

Merged
merged 2 commits into from Nov 10, 2019
Merged

Guard against multiple evaluations of before statement #1821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1669d8b
Guard against multiple evaluations of before statement
marcphilipp Nov 10, 2019
49e41aa
Reset listener when removing it
marcphilipp Nov 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java
View file
Open in desktop
Expand Up @@ -36,11 +36,13 @@ protected Statement withBefores(FrameworkMethod method, final Object target, Sta
return new Statement() {
@Override
public void evaluate() throws Throwable {
// get new test listener and add it to the framework
mockitoTestListener = listenerSupplier.get();
Mockito.framework().addListener(mockitoTestListener);
// init annotated mocks before tests
MockitoAnnotations.initMocks(target);
if (mockitoTestListener == null) {
// get new test listener and add it to the framework
mockitoTestListener = listenerSupplier.get();
Mockito.framework().addListener(mockitoTestListener);
// init annotated mocks before tests
MockitoAnnotations.initMocks(target);
}
base.evaluate();
}
};
Expand All @@ -61,6 +63,7 @@ public void testFinished(Description description) throws Exception {
if (mockitoTestListener != null) {
Mockito.framework().removeListener(mockitoTestListener);
mockitoTestListener.testFinished(new DefaultTestFinishedEvent(target, description.getMethodName(), failure));
mockitoTestListener = null;
}
Mockito.validateMockitoUsage();
} catch (Throwable t) {
Expand Down
33 changes: 29 additions & 4 deletions src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java
View file
Open in desktop
Expand Up @@ -9,11 +9,14 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;

import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runner.notification.Failure;
import org.junit.runner.notification.RunListener;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.model.Statement;
import org.mockito.Mock;
import org.mockito.internal.junit.MockitoTestListener;
import org.mockito.internal.junit.TestFinishedEvent;
Expand All @@ -34,9 +37,7 @@ public void does_not_fail_when_tests_succeeds() throws Exception {
new DefaultInternalRunner(SuccessTest.class, supplier)
.run(newNotifier(runListener));

verify(runListener, never()).testFailure(any(Failure.class));
verify(runListener, times(1)).testFinished(any(Description.class));
verify(mockitoTestListener, only()).testFinished(any(TestFinishedEvent.class));
verifyTestFinishedSuccessfully();
}

@Test
Expand All @@ -53,6 +54,18 @@ public void does_not_fail_second_test_when_first_test_fail() throws Exception {
new DefaultInternalRunner(SuccessTest.class, supplier)
.run(newNotifier(runListener));

verifyTestFinishedSuccessfully();
}

@Test
public void does_not_fail_when_rule_invokes_statement_multiple_times() throws Exception {
new DefaultInternalRunner(TestWithRepeatingRule.class, supplier)
.run(newNotifier(runListener));

verifyTestFinishedSuccessfully();
}

private void verifyTestFinishedSuccessfully() throws Exception {
verify(runListener, never()).testFailure(any(Failure.class));
verify(runListener, times(1)).testFinished(any(Description.class));
verify(mockitoTestListener, only()).testFinished(any(TestFinishedEvent.class));
Expand All @@ -64,7 +77,7 @@ private RunNotifier newNotifier(RunListener listener) {
return notifier;
}

public static final class SuccessTest {
public static class SuccessTest {

@Test
public void this_test_is_NOT_supposed_to_fail() {
Expand All @@ -82,4 +95,16 @@ public void this_test_is_supposed_to_fail() {
assertNotNull(system);
}
}

public static final class TestWithRepeatingRule extends SuccessTest {

@Rule
public TestRule rule = (base, description) -> new Statement() {
@Override
public void evaluate() throws Throwable {
base.evaluate();
base.evaluate();
}
};
}
}