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

Remove unnecessary JDK 9+ check in MergedAnnotationsTests

This commit is contained in:
Sam Brannen 2022-02-08 14:19:32 +01:00
parent bf40033e86
commit 839cc5f7f8
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@ import java.util.stream.Stream;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.JRE;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.MergedAnnotation.Adapt; import org.springframework.core.annotation.MergedAnnotation.Adapt;
@ -1871,12 +1870,10 @@ class MergedAnnotationsTests {
assertThat(webMappingWithAliases.toString()).isNotEqualTo(synthesizedWebMapping1.toString()); assertThat(webMappingWithAliases.toString()).isNotEqualTo(synthesizedWebMapping1.toString());
if (JRE.currentVersion().ordinal() > JRE.JAVA_8.ordinal()) { // The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes()
// The unsynthesized annotation for handleMappedWithSamePathAndValueAttributes() // should produce the same toString() results as synthesized annotations for
// should produce the same toString() results as synthesized annotations for // handleMappedWithPathAttribute() on Java 9 or higher
// handleMappedWithPathAttribute() on Java 9 or higher assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
assertToStringForWebMappingWithPathAndValue(webMappingWithPathAndValue);
}
assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping1); assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping1);
assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping2); assertToStringForWebMappingWithPathAndValue(synthesizedWebMapping2);
} }