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

Improve tests for synthesized array of annotations

This commit is contained in:
Sam Brannen 2020-04-22 15:17:33 +02:00
parent 5721c747b2
commit a9cc7b3edc
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java
View File

@ -1956,7 +1956,7 @@ class MergedAnnotationsTests {
}
@Test
void synthesizeWithAttributeAliasesInNestedAnnotations() throws Exception {
void synthesizeWithArrayOfAnnotations() throws Exception {
Hierarchy hierarchy = HierarchyClass.class.getAnnotation(Hierarchy.class);
assertThat(hierarchy).isNotNull();
Hierarchy synthesizedHierarchy = MergedAnnotation.from(hierarchy).synthesize();
@ -1964,33 +1964,17 @@ class MergedAnnotationsTests {
TestConfiguration[] configs = synthesizedHierarchy.value();
assertThat(configs).isNotNull();
assertThat(configs).allMatch(SynthesizedAnnotation.class::isInstance);
assertThat(
Arrays.stream(configs).map(TestConfiguration::location)).containsExactly(
"A", "B");
assertThat(Arrays.stream(configs).map(TestConfiguration::value)).containsExactly(
"A", "B");
}
assertThat(configs).extracting(TestConfiguration::value).containsExactly("A", "B");
assertThat(configs).extracting(TestConfiguration::location).containsExactly("A", "B");
@Test
void synthesizeWithArrayOfAnnotations() throws Exception {
Hierarchy hierarchy = HierarchyClass.class.getAnnotation(Hierarchy.class);
assertThat(hierarchy).isNotNull();
Hierarchy synthesizedHierarchy = MergedAnnotation.from(hierarchy).synthesize();
assertThat(synthesizedHierarchy).isInstanceOf(SynthesizedAnnotation.class);
TestConfiguration contextConfig = TestConfigurationClass.class.getAnnotation(
TestConfiguration.class);
TestConfiguration contextConfig = TestConfigurationClass.class.getAnnotation(TestConfiguration.class);
assertThat(contextConfig).isNotNull();
TestConfiguration[] configs = synthesizedHierarchy.value();
assertThat(
Arrays.stream(configs).map(TestConfiguration::location)).containsExactly(
"A", "B");
// Alter array returned from synthesized annotation
configs[0] = contextConfig;
assertThat(configs).extracting(TestConfiguration::value).containsExactly("simple.xml", "B");
// Re-retrieve the array from the synthesized annotation
configs = synthesizedHierarchy.value();
assertThat(
Arrays.stream(configs).map(TestConfiguration::location)).containsExactly(
"A", "B");
assertThat(configs).extracting(TestConfiguration::value).containsExactly("A", "B");
}
@Test