Browse Source

Remove unnecessary JDK 9+ check in MergedAnnotationsTests

pull/28041/head
Sam Brannen 4 years ago
parent
commit
839cc5f7f8
  1. 3
      spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java

3
spring-core/src/test/java/org/springframework/core/annotation/MergedAnnotationsTests.java

@ -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);
} }

Loading…
Cancel
Save