From 7e53a1f048fdcc8b8b33c7e07df8af8b3820aaf0 Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Tue, 23 Jan 2024 11:35:37 +0100 Subject: [PATCH] Re-enable Jaxb2MarshallerTests on JDK 22+ Since the bug in JDK 22-ea builds has been fixed [1], this commit re-enables the disabled tests. Verified using: OpenJDK Runtime Environment (build 22-ea+31-2314) [1] https://bugs.openjdk.org/browse/JDK-8322214 --- .../org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java index 37b49b2f8cf..f305d971a75 100644 --- a/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java +++ b/spring-oxm/src/test/java/org/springframework/oxm/jaxb/Jaxb2MarshallerTests.java @@ -36,8 +36,6 @@ import jakarta.xml.bind.JAXBElement; import jakarta.xml.bind.annotation.XmlRootElement; import jakarta.xml.bind.annotation.XmlType; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledForJreRange; -import org.junit.jupiter.api.condition.JRE; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.xml.sax.Attributes; @@ -308,7 +306,6 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { } @Test // SPR-10806 - @DisabledForJreRange(min = JRE.JAVA_22, disabledReason = "https://bugs.openjdk.org/browse/JDK-8322216") void unmarshalStreamSourceWithXmlOptions() throws Exception { final jakarta.xml.bind.Unmarshaller unmarshaller = mock(); Jaxb2Marshaller marshaller = new Jaxb2Marshaller() { @@ -343,7 +340,6 @@ class Jaxb2MarshallerTests extends AbstractMarshallerTests { } @Test // SPR-10806 - @DisabledForJreRange(min = JRE.JAVA_22, disabledReason = "https://bugs.openjdk.org/browse/JDK-8322216") void unmarshalSaxSourceWithXmlOptions() throws Exception { final jakarta.xml.bind.Unmarshaller unmarshaller = mock(); Jaxb2Marshaller marshaller = new Jaxb2Marshaller() {