diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByNameIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByNameIntegrationTests.java index ec74a2df7ed..87424d76770 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByNameIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByNameIntegrationTests.java @@ -64,6 +64,11 @@ class MockitoBeansByNameIntegrationTests { @BeforeEach void configureMocks() { + assertIsMock(s1, "s1"); + assertIsMock(s2, "s2"); + assertIsMock(service3, "service3"); + assertIsNotMock(service4, "service4"); + given(s1.greeting()).willReturn("mock 1"); given(s2.greeting()).willReturn("mock 2"); given(service3.greeting()).willReturn("mock 3"); @@ -71,11 +76,6 @@ class MockitoBeansByNameIntegrationTests { @Test void checkMocksAndStandardBean() { - assertIsMock(s1, "s1"); - assertIsMock(s2, "s2"); - assertIsMock(service3, "service3"); - assertIsNotMock(service4, "service4"); - assertThat(s1.greeting()).isEqualTo("mock 1"); assertThat(s2.greeting()).isEqualTo("mock 2"); assertThat(service3.greeting()).isEqualTo("mock 3"); diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByTypeIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByTypeIntegrationTests.java index 81417d4b0da..e3e5207b4de 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByTypeIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/typelevel/MockitoBeansByTypeIntegrationTests.java @@ -69,6 +69,14 @@ class MockitoBeansByTypeIntegrationTests implements MockTestInterface01 { @BeforeEach void configureMocks() { + assertIsMock(service01, "service01"); + assertIsMock(service02, "service02"); + assertIsMock(service03, "service03"); + assertIsMock(service04, "service04"); + assertIsMock(service05, "service05"); + assertIsMock(service06, "service06"); + assertIsMock(service07, "service07"); + given(service01.greeting()).willReturn("mock 01"); given(service02.greeting()).willReturn("mock 02"); given(service03.greeting()).willReturn("mock 03"); @@ -80,14 +88,6 @@ class MockitoBeansByTypeIntegrationTests implements MockTestInterface01 { @Test void checkMocks() { - assertIsMock(service01, "service01"); - assertIsMock(service02, "service02"); - assertIsMock(service03, "service03"); - assertIsMock(service04, "service04"); - assertIsMock(service05, "service05"); - assertIsMock(service06, "service06"); - assertIsMock(service07, "service07"); - assertThat(service01.greeting()).isEqualTo("mock 01"); assertThat(service02.greeting()).isEqualTo("mock 02"); assertThat(service03.greeting()).isEqualTo("mock 03"); @@ -127,16 +127,6 @@ class MockitoBeansByTypeIntegrationTests implements MockTestInterface01 { @BeforeEach void configureMocks() { - given(service08.greeting()).willReturn("mock 08"); - given(service09.greeting()).willReturn("mock 09"); - given(service10.greeting()).willReturn("mock 10"); - given(service11.greeting()).willReturn("mock 11"); - given(service12.greeting()).willReturn("mock 12"); - given(service13.greeting()).willReturn("mock 13"); - } - - @Test - void checkMocks() { assertIsMock(service01, "service01"); assertIsMock(service02, "service02"); assertIsMock(service03, "service03"); @@ -151,6 +141,16 @@ class MockitoBeansByTypeIntegrationTests implements MockTestInterface01 { assertIsMock(service12, "service12"); assertIsMock(service13, "service13"); + given(service08.greeting()).willReturn("mock 08"); + given(service09.greeting()).willReturn("mock 09"); + given(service10.greeting()).willReturn("mock 10"); + given(service11.greeting()).willReturn("mock 11"); + given(service12.greeting()).willReturn("mock 12"); + given(service13.greeting()).willReturn("mock 13"); + } + + @Test + void checkMocks() { assertThat(service01.greeting()).isEqualTo("mock 01"); assertThat(service02.greeting()).isEqualTo("mock 02"); assertThat(service03.greeting()).isEqualTo("mock 03");