Merge pull request #201 from ihrasko/18.x-bump-xmlunit-to-2.9.1

Bump org.xmlunit to 2.9.1
PANTHEONtech · Nov 14, 2023 · d91aea7 · d91aea7
2 parents e8afc9d + f7e1004
commit d91aea7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 29 deletions.
diff --git a/examples/devices/lighty-network-topology-device/pom.xml b/examples/devices/lighty-network-topology-device/pom.xml
@@ -55,18 +55,5 @@
             <artifactId>xmlunit-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.xmlunit</groupId>
-            <artifactId>xmlunit-matchers</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.xmlunit</groupId>
-            <artifactId>xmlunit-assertj</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
-
 </project>
-
diff --git a/...y-network-topology-device/src/test/java/io/lighty/netconf/device/topology/DeviceTest.java b/...y-network-topology-device/src/test/java/io/lighty/netconf/device/topology/DeviceTest.java
@@ -9,9 +9,9 @@
 
 import static io.lighty.netconf.device.topology.TestUtils.xmlFileToInputStream;
 import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
-import static org.xmlunit.assertj.XmlAssert.assertThat;
 
 import io.lighty.netconf.device.utils.TimeoutUtil;
 import io.netty.channel.nio.NioEventLoopGroup;
@@ -44,6 +44,10 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
+import org.xmlunit.builder.DiffBuilder;
+import org.xmlunit.builder.Input;
+import org.xmlunit.diff.DefaultNodeMatcher;
+import org.xmlunit.diff.ElementSelectors;
 
 public class DeviceTest {
 
@@ -236,9 +240,14 @@ private NetconfMessage sendRequestToDevice(String requestFileName,
 
     private void assertResponseIsIdentical(final NetconfMessage response, final InputStream comparedResponse) {
         assertNotNull(response);
-        assertThat(response.getDocument())
-                .and(comparedResponse)
-                .ignoreWhitespace()
-                .areIdentical();
+        final var actual = Input.fromString(response.toString()).build();
+        final var expected = Input.fromStream(comparedResponse).build();
+
+        final var diff = DiffBuilder.compare(actual).withTest(expected)
+            .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byName))
+            .checkForIdentical()
+            .ignoreWhitespace()
+            .build();
+        assertFalse(diff.hasDifferences(), "XML identical " + diff);
     }
 }
diff --git a/examples/parents/examples-bom/pom.xml b/examples/parents/examples-bom/pom.xml
@@ -77,17 +77,7 @@
             <dependency>
                 <groupId>org.xmlunit</groupId>
                 <artifactId>xmlunit-core</artifactId>
-                <version>2.7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.xmlunit</groupId>
-                <artifactId>xmlunit-matchers</artifactId>
-                <version>2.7.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.xmlunit</groupId>
-                <artifactId>xmlunit-assertj</artifactId>
-                <version>2.7.0</version>
+                <version>2.9.1</version>
             </dependency>
         </dependencies>
     </dependencyManagement>