From 956e2ea828cdfd1e3203191d791dbe2c261bacbe Mon Sep 17 00:00:00 2001 From: CoprDistGit Date: Mon, 5 Aug 2024 01:35:29 +0000 Subject: automatic import of ant --- ant-openjdk-jpeg-cmyk.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 ant-openjdk-jpeg-cmyk.patch (limited to 'ant-openjdk-jpeg-cmyk.patch') diff --git a/ant-openjdk-jpeg-cmyk.patch b/ant-openjdk-jpeg-cmyk.patch new file mode 100644 index 0000000..2c0bdfc --- /dev/null +++ b/ant-openjdk-jpeg-cmyk.patch @@ -0,0 +1,29 @@ +diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +index 537a4e8ffaf3af22..bfc8a011ad4b21f8 100644 +--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java ++++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageIOTest.java +@@ -28,6 +28,7 @@ import org.junit.rules.ExpectedException; + + import java.io.File; + ++import static org.hamcrest.Matchers.anyOf; + import static org.hamcrest.Matchers.containsString; + import static org.junit.Assert.assertEquals; + import static org.junit.Assert.assertThat; +@@ -132,13 +133,13 @@ public class ImageIOTest { + + @Test + public void testFailOnError() { +- final String message = "Unsupported Image Type"; + thrown.expect(BuildException.class); +- thrown.expectMessage(message); + try { + buildRule.executeTarget("testFailOnError"); + } finally { +- assertThat(buildRule.getLog(), containsString(message)); ++ assertThat(buildRule.getLog(), ++ anyOf(containsString("Unsupported Image Type"), ++ containsString("Unknown image type"))); + } + } + -- cgit v1.2.3