diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java index 5c86ef4312..7a72f7ecb6 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForBeanFactoryIntegrationTests.java @@ -18,8 +18,10 @@ package org.springframework.test.context.bean.override.mockito; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; @@ -37,6 +39,7 @@ import static org.mockito.BDDMockito.when; * @author Simon Baslé */ @SpringJUnitConfig +@TestMethodOrder(OrderAnnotation.class) class MockitoBeanForBeanFactoryIntegrationTests { @MockitoBean diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java index f216ba6e91..b684c85072 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java @@ -16,8 +16,10 @@ package org.springframework.test.context.bean.override.mockito; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Qualifier; @@ -41,6 +43,7 @@ import static org.mockito.Mockito.doReturn; * @since 6.2 */ @SpringJUnitConfig +@TestMethodOrder(OrderAnnotation.class) public class MockitoBeanWithResetIntegrationTests { @MockitoBean(reset = MockReset.BEFORE) diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java index 742360ea08..77d20b190f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForBeanFactoryIntegrationTests.java @@ -16,8 +16,10 @@ package org.springframework.test.context.bean.override.mockito; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.mockito.Mockito; import org.springframework.beans.factory.FactoryBean; @@ -37,6 +39,7 @@ import static org.mockito.Mockito.doReturn; * @author Simon Baslé */ @SpringJUnitConfig +@TestMethodOrder(OrderAnnotation.class) class MockitoSpyBeanForBeanFactoryIntegrationTests { @MockitoSpyBean diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanWithResetIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanWithResetIntegrationTests.java index 995af78e49..59e46ea915 100644 --- a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanWithResetIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanWithResetIntegrationTests.java @@ -16,8 +16,10 @@ package org.springframework.test.context.bean.override.mockito; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Qualifier; @@ -42,6 +44,7 @@ import static org.mockito.Mockito.doReturn; * @since 6.2 */ @SpringJUnitConfig +@TestMethodOrder(OrderAnnotation.class) public class MockitoSpyBeanWithResetIntegrationTests { @MockitoSpyBean(reset = MockReset.BEFORE)