#3673 - Update dependencies

- xmlunit 1.6. -> 2.9.1
inception-project · Jul 29, 2023 · 0299a43 · 0299a43
1 parent 91b22c2
commit 0299a43
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 32 deletions.
diff --git a/inception/inception-io-bioc/pom.xml b/inception/inception-io-bioc/pom.xml
@@ -114,8 +114,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-assertj3</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...c/src/test/java/de/tudarmstadt/ukp/inception/io/bioc/BioCXmlDocumentReaderWriterTest.java b/...c/src/test/java/de/tudarmstadt/ukp/inception/io/bioc/BioCXmlDocumentReaderWriterTest.java
@@ -30,18 +30,16 @@
 import static org.apache.uima.fit.factory.CollectionReaderFactory.createReaderDescription;
 import static org.apache.uima.fit.factory.TypeSystemDescriptionFactory.createTypeSystemDescription;
 import static org.apache.uima.util.CasCreationUtils.mergeTypeSystems;
+import static org.xmlunit.assertj3.XmlAssert.assertThat;
+import static org.xmlunit.builder.Input.fromFile;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.uima.UIMAFramework;
 import org.apache.uima.cas.CAS;
-import org.custommonkey.xmlunit.XMLAssert;
 import org.dkpro.core.testing.IOTestRunner;
 import org.dkpro.core.testing.TestOptions;
 import org.junit.jupiter.api.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 public class BioCXmlDocumentReaderWriterTest
 {
@@ -72,12 +70,8 @@ public void testOneWay() throws Exception
 
     private void assertXmlEquals(File expected, File actual)
     {
-        try {
-            XMLAssert.assertXMLEqual(new InputSource(expected.getPath()),
-                    new InputSource(actual.getPath()));
-        }
-        catch (SAXException | IOException e) {
-            throw new RuntimeException(e);
-        }
+        assertThat(fromFile(expected.getPath())) //
+                .and(fromFile(actual.getPath())) //
+                .areSimilar();
     }
 }
diff --git a/inception/inception-io-html/pom.xml b/inception/inception-io-html/pom.xml
@@ -117,8 +117,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-assertj3</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/.../src/test/java/de/tudarmstadt/ukp/inception/io/html/dkprocore/HtmlDocumentReaderTest.java b/.../src/test/java/de/tudarmstadt/ukp/inception/io/html/dkprocore/HtmlDocumentReaderTest.java
@@ -23,19 +23,17 @@
 import static org.apache.uima.fit.util.JCasUtil.select;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.dkpro.core.testing.IOTestRunner.testOneWay;
+import static org.xmlunit.builder.Input.fromFile;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.apache.uima.collection.CollectionReader;
 import org.apache.uima.fit.factory.JCasFactory;
 import org.apache.uima.jcas.JCas;
-import org.custommonkey.xmlunit.XMLAssert;
 import org.dkpro.core.io.xmi.XmiWriter;
 import org.dkpro.core.testing.TestOptions;
 import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
+import org.xmlunit.assertj3.XmlAssert;
 
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Heading;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Paragraph;
@@ -143,12 +141,8 @@ public void testReadFileWithHeadAndDoctypeAndWriteAsXmi() throws Exception
 
     private void assertXmlEquals(File expected, File actual)
     {
-        try {
-            XMLAssert.assertXMLEqual(new InputSource(expected.getPath()),
-                    new InputSource(actual.getPath()));
-        }
-        catch (SAXException | IOException e) {
-            throw new RuntimeException(e);
-        }
+        XmlAssert.assertThat(fromFile(expected.getPath())) //
+                .and(fromFile(actual.getPath())) //
+                .areSimilar();
     }
 }
diff --git a/inception/pom.xml b/inception/pom.xml
@@ -66,9 +66,9 @@
     <junit-platform.version>1.10.0</junit-platform.version>
     <mockito.version>5.4.0</mockito.version>
     <assertj.version>3.24.2</assertj.version>
+    <xmlunit.version>2.9.1</xmlunit.version>
 
     <awaitility.version>4.2.0</awaitility.version>
-    <xmlunit.version>1.6</xmlunit.version>
 
     <dkpro.version>2.4.0</dkpro.version>
     <uima.version>3.4.1</uima.version>
@@ -404,6 +404,16 @@
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.xmlunit</groupId>
+      <artifactId>xmlunit-assertj3</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
@@ -1103,6 +1113,16 @@
         <artifactId>assertj-core</artifactId>
         <version>${assertj.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-core</artifactId>
+        <version>${xmlunit.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.xmlunit</groupId>
+        <artifactId>xmlunit-assertj3</artifactId>
+        <version>${xmlunit.version}</version>
+      </dependency>
       <dependency>
         <groupId>no.nav.security</groupId>
         <artifactId>mock-oauth2-server</artifactId>
@@ -1125,11 +1145,6 @@
         <artifactId>awaitility</artifactId>
         <version>${awaitility.version}</version>
       </dependency>
-      <dependency>
-        <groupId>xmlunit</groupId>
-        <artifactId>xmlunit</artifactId>
-        <version>${xmlunit.version}</version>
-      </dependency>
 
       <!-- Wicket jQuery -->
       <dependency>
@@ -2597,6 +2612,8 @@
             <dependency>org.mockito:mockito-core</dependency>
             <dependency>org.mockito:mockito-junit-jupiter</dependency>
             <dependency>org.assertj:assertj-core</dependency>
+            <dependency>org.xmlunit:xmlunit-core</dependency>
+            <dependency>org.xmlunit:xmlunit-assertj3</dependency>
             <dependency>com.squareup.okhttp3:mockwebserver</dependency>
             <dependency>com.squareup.okhttp3:okhttp</dependency>
             <dependency>com.squareup.okio:okio</dependency>