From 9082b4b24eaee805c438243c6e4c5d32d618e14d Mon Sep 17 00:00:00 2001 From: James Nord Date: Thu, 28 Aug 2025 10:01:16 +0100 Subject: [PATCH 1/2] fix and re-enable unit test on windows --- .../impl/DefaultPluginXmlFactoryTest.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java index 37e320cb3237..60609f5dabf7 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java @@ -21,6 +21,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; import java.io.StringWriter; import java.io.Writer; @@ -37,7 +38,6 @@ import org.apache.maven.api.services.xml.XmlWriterRequest; import org.apache.maven.impl.model.DefaultModelProcessor; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.io.TempDir; import static java.util.UUID.randomUUID; @@ -45,7 +45,6 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.condition.OS.WINDOWS; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -252,19 +251,17 @@ void locateExistingPomWithFilePathShouldReturnSameFileIfRegularFile() throws IOE } @Test - @DisabledOnOs( - value = WINDOWS, - disabledReason = "windows related issue https://github.com/apache/maven/pull/2312#issuecomment-2876291814") void readFromUrlParsesPluginDescriptorCorrectly() throws Exception { Path xmlFile = tempDir.resolve("plugin.xml"); Files.write(xmlFile, SAMPLE_PLUGIN_XML.getBytes()); - PluginDescriptor descriptor = defaultPluginXmlFactory.read(XmlReaderRequest.builder() - .inputStream(xmlFile.toUri().toURL().openStream()) - .build()); - assertThat(descriptor.getName()).isEqualTo(NAME); - assertThat(descriptor.getGroupId()).isEqualTo("org.example"); - assertThat(descriptor.getArtifactId()).isEqualTo("sample-plugin"); - assertThat(descriptor.getVersion()).isEqualTo("1.0.0"); + try (InputStream is = xmlFile.toUri().toURL().openStream()) { + PluginDescriptor descriptor = defaultPluginXmlFactory.read( + XmlReaderRequest.builder().inputStream(is).build()); + assertThat(descriptor.getName()).isEqualTo(NAME); + assertThat(descriptor.getGroupId()).isEqualTo("org.example"); + assertThat(descriptor.getArtifactId()).isEqualTo("sample-plugin"); + assertThat(descriptor.getVersion()).isEqualTo("1.0.0"); + } } @Test From 925aff7f23f4897962842d6c85074fe247ca77f4 Mon Sep 17 00:00:00 2001 From: James Nord Date: Thu, 28 Aug 2025 10:03:22 +0100 Subject: [PATCH 2/2] make test name reflect what is tested --- .../java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java index 60609f5dabf7..66e0bdcc5d19 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/DefaultPluginXmlFactoryTest.java @@ -251,7 +251,7 @@ void locateExistingPomWithFilePathShouldReturnSameFileIfRegularFile() throws IOE } @Test - void readFromUrlParsesPluginDescriptorCorrectly() throws Exception { + void readFromInputStreamParsesPluginDescriptorCorrectly() throws Exception { Path xmlFile = tempDir.resolve("plugin.xml"); Files.write(xmlFile, SAMPLE_PLUGIN_XML.getBytes()); try (InputStream is = xmlFile.toUri().toURL().openStream()) {