Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change @TestConstructor.autowire attribute into an enum

Browse Source 
Prior to this commit, @TestConstructor supported a boolean `autowire`
attribute which naturally limited the configuration to two states: on
or off. Since we may need to support additional autowiring modes in the
future, the use of a boolean is limiting.

This commit address this issue by introducing a new AutowireMode enum
in @TestConstructor with ALL and ANNOTATED constants. In addition, the
attribute has been renamed to `autowireMode`, and the system property
has been renamed to `spring.test.constructor.autowire.mode` for greater
clarity of purpose.

Closes gh-23224
This commit is contained in:
Sam Brannen
2019-07-11 18:00:52 +02:00
parent c8f8dfa39e
commit fc38bb4fc6
5 changed files with 145 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/TestConstructorAnnotationIntegrationTests.java
View File

@@ -28,6 +28,7 @@ import org.springframework.test.context.junit.jupiter.comics.Dog;
import org.springframework.test.context.junit.jupiter.comics.Person;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.context.TestConstructor.AutowireMode.ALL;
/**
* Integration tests which demonstrate support for automatically
@@ -45,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
@SpringJUnitConfig(TestConfig.class)
@TestPropertySource(properties = "enigma = 42")
@TestConstructor(autowire = true)
@TestConstructor(autowireMode = ALL)
class TestConstructorAnnotationIntegrationTests {
final ApplicationContext applicationContext;
@@ -53,6 +54,7 @@ class TestConstructorAnnotationIntegrationTests {
final Dog dog;
final Integer enigma;
TestConstructorAnnotationIntegrationTests(ApplicationContext applicationContext, Person dilbert, Dog dog,
@Value("${enigma}") Integer enigma) {

40
spring-test/src/test/java/org/springframework/test/context/support/TestConstructorUtilsTests.java
View File

@@ -22,9 +22,13 @@ import org.junit.After;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.SpringProperties;
import org.springframework.test.context.TestConstructor;
import static org.assertj.core.api.Assertions.assertThat;
import static org.springframework.test.context.TestConstructor.TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME;
import static org.springframework.test.context.TestConstructor.AutowireMode.ALL;
import static org.springframework.test.context.TestConstructor.AutowireMode.ANNOTATED;
/**
* Unit tests for {@link TestConstructorUtils}.
@@ -36,7 +40,7 @@ public class TestConstructorUtilsTests {
@After
public void clearGlobalFlag() {
System.clearProperty(TestConstructor.TEST_CONSTRUCTOR_AUTOWIRE_PROPERTY_NAME);
setGlobalFlag(null);
}
@Test
@@ -66,6 +70,26 @@ public class TestConstructorUtilsTests {
assertNotAutowirable(TestConstructorAnnotationOverridesGlobalFlagTestCase.class);
}
@Test
public void globalFlagVariations() throws Exception {
Class<?> testClass = AutomaticallyAutowiredTestCase.class;
setGlobalFlag(ALL.name());
assertAutowirable(testClass);
setGlobalFlag(ALL.name().toLowerCase());
assertAutowirable(testClass);
setGlobalFlag("\t" + ALL.name().toLowerCase() + " ");
assertAutowirable(testClass);
setGlobalFlag("bogus");
assertNotAutowirable(testClass);
setGlobalFlag(" ");
assertNotAutowirable(testClass);
}
private void assertAutowirable(Class<?> testClass) throws NoSuchMethodException {
Constructor<?> constructor = testClass.getDeclaredConstructor();
assertThat(TestConstructorUtils.isAutowirableConstructor(constructor, testClass)).isTrue();
@@ -77,14 +101,20 @@ public class TestConstructorUtilsTests {
}
private void setGlobalFlag() {
System.setProperty(TestConstructor.TEST_CONSTRUCTOR_AUTOWIRE_PROPERTY_NAME, "true");
setGlobalFlag(ALL.name());
}
private void setGlobalFlag(String flag) {
SpringProperties.setProperty(TEST_CONSTRUCTOR_AUTOWIRE_MODE_PROPERTY_NAME, flag);
}
static class NotAutowirableTestCase {
}
@TestConstructor(autowire = false)
// The following declaration simply verifies that @Autowired on the constructor takes
// precedence.
@TestConstructor(autowireMode = ANNOTATED)
static class AutowiredAnnotationTestCase {
@Autowired
@@ -92,14 +122,14 @@ public class TestConstructorUtilsTests {
}
}
@TestConstructor(autowire = true)
@TestConstructor(autowireMode = ALL)
static class TestConstructorAnnotationTestCase {
}
static class AutomaticallyAutowiredTestCase {
}
@TestConstructor(autowire = false)
@TestConstructor(autowireMode = ANNOTATED)
static class TestConstructorAnnotationOverridesGlobalFlagTestCase {
}