This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch ivy-1670-use-modern-xmlunit in repository https://gitbox.apache.org/repos/asf/ant-ivy.git
commit 1c6afbce314814b2a7ac90276ca2a4289acb35e9 Author: Stefan Bodewig <[email protected]> AuthorDate: Wed Jul 15 21:35:38 2026 +0200 [IVY-1670] use a more modern version of XMLUnit --- asciidoc/release-notes.adoc | 2 ++ ivy.xml | 3 ++- .../ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java | 11 +++++------ version.properties | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/asciidoc/release-notes.adoc b/asciidoc/release-notes.adoc index f5006e0e..c053b31e 100644 --- a/asciidoc/release-notes.adoc +++ b/asciidoc/release-notes.adoc @@ -52,6 +52,8 @@ Note, if you have resolved dependencies with version of Ivy prior to 2.6.1, you - DOCUMENTATION: bla bla bla (jira:IVY-1234[]) (Thanks to Jane Doe) //// +- IMPROVEMENT: switched to using XMLUnit 2.x in tests (jira:IVY-1670[]) + == Committers and Contributors Here is the list of people who have contributed source code and documentation up to this release. Many thanks to all of them, and also to the whole IvyDE community contributing ideas and feedback, and promoting the use of Apache Ivy ! diff --git a/ivy.xml b/ivy.xml index 2841c3b0..9856f6ee 100644 --- a/ivy.xml +++ b/ivy.xml @@ -69,7 +69,8 @@ <dependency org="org.apache.ant" name="ant-junit" rev="${apache-ant.version}" conf="test" transitive="false"/> <dependency org="org.apache.ant" name="ant-junit4" rev="${apache-ant.version}" conf="test" transitive="false"/> <dependency org="ant-contrib" name="ant-contrib" rev="${ant-contrib.version}" conf="test" transitive="false"/> - <dependency org="xmlunit" name="xmlunit" rev="${xmlunit.version}" conf="test" transitive="false"/> + <dependency org="org.xmlunit" name="xmlunit-core" rev="${xmlunit.version}" conf="test" transitive="false"/> + <dependency org="org.xmlunit" name="xmlunit-matchers" rev="${xmlunit.version}" conf="test" transitive="false"/> <!-- Global excludes --> <exclude org="junit" module="junit" conf="core,default,httpclient,oro,vfs,sftp,pack200,standalone,ant"/> diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java index 74d8a869..70c908d5 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriterTest.java @@ -40,9 +40,10 @@ import org.junit.Before; import org.junit.Test; import static org.apache.ivy.core.module.descriptor.Configuration.Visibility.PUBLIC; -import static org.custommonkey.xmlunit.XMLAssert.assertXMLEqual; +import static org.xmlunit.matchers.CompareMatcher.isIdenticalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; public class XmlModuleDescriptorWriterTest { @@ -162,14 +163,12 @@ public class XmlModuleDescriptorWriterTest { XmlModuleDescriptorWriter.write(md, LICENSE, dest); assertTrue(dest.exists()); - String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))) - .replaceAll("\r\n", "\n").replace('\r', '\n'); + String wrote = FileUtil.readEntirely(new BufferedReader(new FileReader(dest))); wrote = wrote.replaceFirst("publication=\"([0-9])*\"", "publication=\"20140429153143\""); System.out.println(wrote); - String expected = readEntirely("test-write-extrainfo-from-maven.xml").replaceAll("\r\n", - "\n").replace('\r', '\n'); - assertXMLEqual(expected, wrote); + String expected = readEntirely("test-write-extrainfo-from-maven.xml"); + assertThat(wrote, isIdenticalTo(wrote).ignoreWhitespace()); } @Test diff --git a/version.properties b/version.properties index 65341c01..1268790b 100644 --- a/version.properties +++ b/version.properties @@ -43,4 +43,4 @@ jsch.agentproxy.version=0.0.9 jsch.version=0.1.55 junit.version=4.13.2 oro.version=2.0.8 -xmlunit.version=1.6 +xmlunit.version=2.12.0
