diff --git a/src/main/java/org/mockito/Mock.java b/src/main/java/org/mockito/Mock.java index 32a0f6f3f4..fd9f76bee8 100644 --- a/src/main/java/org/mockito/Mock.java +++ b/src/main/java/org/mockito/Mock.java @@ -120,7 +120,7 @@ * Mock will have custom strictness, see {@link MockSettings#strictness(org.mockito.quality.Strictness)}. * For examples how to use 'Mock' annotation and parameters see {@link Mock}. * - * @since 4.6.0 + * @since 4.6.1 */ Strictness strictness() default Strictness.NOT_SET; @@ -128,21 +128,23 @@ enum Strictness { /** * Default value used to indicate the mock does not override the test level strictness. + * + * @since 4.6.1 */ NOT_SET(null), /** - * see {@link org.mockito.quality.Strictness#LENIENT} + * See {@link org.mockito.quality.Strictness#LENIENT} */ LENIENT(org.mockito.quality.Strictness.LENIENT), /** - * see {@link org.mockito.quality.Strictness#WARN} + * See {@link org.mockito.quality.Strictness#WARN} */ WARN(org.mockito.quality.Strictness.WARN), /** - * see {@link org.mockito.quality.Strictness#STRICT_STUBS} + * See {@link org.mockito.quality.Strictness#STRICT_STUBS} */ STRICT_STUBS(org.mockito.quality.Strictness.STRICT_STUBS); diff --git a/src/test/java/org/mockito/MockTest.java b/src/test/java/org/mockito/MockTest.java index 7b9a8085a5..484c4011b1 100644 --- a/src/test/java/org/mockito/MockTest.java +++ b/src/test/java/org/mockito/MockTest.java @@ -20,13 +20,13 @@ public MockTest(org.mockito.quality.Strictness strictness) { } @Test - public void shouldHaveMatchingEnumInMockStrictnessEnum() { + public void should_have_matching_enum_in_mock_strictness_enum() { final Mock.Strictness mockStrictness = Mock.Strictness.valueOf(this.strictness.name()); assertThat(mockStrictness.outer()).isEqualTo(strictness); } @Parameterized.Parameters - public static org.mockito.quality.Strictness[] data() { + public static org.mockito.quality.Strictness[] data() { return org.mockito.quality.Strictness.values(); } } diff --git a/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java b/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java index 7c958c42d8..7250555880 100644 --- a/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java +++ b/src/test/java/org/mockitousage/strictness/StrictnessMockAnnotationTest.java @@ -22,14 +22,12 @@ public class StrictnessMockAnnotationTest { public static class StrictStubsTest { - public @Rule - MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS); + public @Rule MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.STRICT_STUBS); @Mock(strictness = Mock.Strictness.LENIENT) IMethods lenientMock; - @Mock - IMethods regularMock; + @Mock IMethods regularMock; @Test public void mock_is_lenient() { @@ -44,16 +42,14 @@ public void mock_is_strict() { when(regularMock.simpleMethod("2")).thenReturn("2"); Assertions.assertThatThrownBy(() -> ProductionCode.simpleMethod(regularMock, "4")) - .isInstanceOf(PotentialStubbingProblem.class); + .isInstanceOf(PotentialStubbingProblem.class); } } public static class LenientStubsTest { - public @Rule - MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.LENIENT); + public @Rule MockitoRule rule = MockitoJUnit.rule().strictness(Strictness.LENIENT); - @Mock - IMethods lenientMock; + @Mock IMethods lenientMock; @Mock(strictness = Mock.Strictness.STRICT_STUBS) IMethods regularMock; @@ -71,7 +67,7 @@ public void mock_is_strict() { when(regularMock.simpleMethod("2")).thenReturn("2"); Assertions.assertThatThrownBy(() -> ProductionCode.simpleMethod(regularMock, "4")) - .isInstanceOf(PotentialStubbingProblem.class); + .isInstanceOf(PotentialStubbingProblem.class); } } }