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

Fixes #1853: Allow @MockitoSettings to be inherited #1854

Merged
merged 1 commit into from
Jan 2, 2020
Merged

Fixes #1853: Allow @MockitoSettings to be inherited #1854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions subprojects/junit-jupiter/src/main/java/org/mockito/junit/jupiter/MockitoSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.quality.Strictness;

import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;

import static java.lang.annotation.RetentionPolicy.RUNTIME;
Expand All @@ -15,6 +16,7 @@
* Annotation that can configure Mockito as invoked by the {@link MockitoExtension}.
*/
@ExtendWith(MockitoExtension.class)
@Inherited
@Retention(RUNTIME)
public @interface MockitoSettings {

Expand Down
20 changes: 20 additions & 0 deletions subprojects/junit-jupiter/src/test/java/org/mockitousage/StrictnessTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,26 @@ void by_default_configures_strict_stubs_in_runner() {
assertThat(result.getThrowable().get()).isInstanceOf(UnnecessaryStubbingException.class);
}

@MockitoSettings(strictness = Strictness.WARN)
static class BaseWarnStubs {}

static class InheritedWarnStubs extends BaseWarnStubs {
@Mock
private Function<Integer, String> rootMock;

@Test
void should_execute_successfully_on_warn_stubs_inherited_from_base_class() {
Mockito.when(rootMock.apply(10)).thenReturn("Foo");
}
}

@Test
void inherits_strictness_from_base_class() {
TestExecutionResult result = invokeTestClassAndRetrieveMethodResult(InheritedWarnStubs.class);

assertThat(result.getStatus()).isEqualTo(TestExecutionResult.Status.SUCCESSFUL);
}

private TestExecutionResult invokeTestClassAndRetrieveMethodResult(Class<?> clazz) {
LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
.selectors(
Expand Down