root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Ensure SpringExtensionContextCacheTests are robust 

... by explicitly ordering the test methods.
This commit is contained in:
Sam Brannen 2019-08-30 16:22:54 +02:00
parent 1ea6ce72bb
commit 793f9e3d29
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-test/src/test/java/org/springframework/test/context/cache/SpringExtensionContextCacheTests.java vendored
View File

@ -18,7 +18,10 @@ package org.springframework.test.context.cache;
import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
@ -47,6 +50,7 @@ import static org.springframework.test.context.cache.ContextCacheTestUtils.reset
*/ */
@SpringJUnitConfig(locations = "../junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml") @SpringJUnitConfig(locations = "../junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml")
@TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class }) @TestExecutionListeners({ DependencyInjectionTestExecutionListener.class, DirtiesContextTestExecutionListener.class })
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
class SpringExtensionContextCacheTests { class SpringExtensionContextCacheTests {
private static ApplicationContext dirtiedApplicationContext; private static ApplicationContext dirtiedApplicationContext;
@ -68,6 +72,7 @@ class SpringExtensionContextCacheTests {
@Test @Test
@DirtiesContext @DirtiesContext
@Order(1)
void dirtyContext() { void dirtyContext() {
assertContextCacheStatistics("dirtyContext()", 1, 0, 1); assertContextCacheStatistics("dirtyContext()", 1, 0, 1);
assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull(); assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull();
@ -75,6 +80,7 @@ class SpringExtensionContextCacheTests {
} }
@Test @Test
@Order(2)
void verifyContextDirty() { void verifyContextDirty() {
assertContextCacheStatistics("verifyContextWasDirtied()", 1, 0, 2); assertContextCacheStatistics("verifyContextWasDirtied()", 1, 0, 2);
assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull(); assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull();
@ -83,6 +89,7 @@ class SpringExtensionContextCacheTests {
} }
@Test @Test
@Order(3)
void verifyContextNotDirty() { void verifyContextNotDirty() {
assertContextCacheStatistics("verifyContextWasNotDirtied()", 1, 1, 2); assertContextCacheStatistics("verifyContextWasNotDirtied()", 1, 1, 2);
assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull(); assertThat(this.applicationContext).as("The application context should have been autowired.").isNotNull();