From 597eaaf604ddc5ea3d9c71d07d8c900f6ae5dfc4 Mon Sep 17 00:00:00 2001 From: Ivan-nikitko <70625960+Ivan-nikitko@users.noreply.github.com> Date: Wed, 10 Aug 2022 12:59:02 +0200 Subject: [PATCH] change xmlunit to xmlunit-matchers dependency --- cayenne-ant/pom.xml | 10 +++-- .../cayenne/tools/DbImporterTaskTest.java | 33 +++++---------- maven-plugins/cayenne-maven-plugin/pom.xml | 10 ++++- .../cayenne/tools/DbImporterMojoTest.java | 42 +++++++------------ pom.xml | 18 +++++--- 5 files changed, 52 insertions(+), 61 deletions(-) diff --git a/cayenne-ant/pom.xml b/cayenne-ant/pom.xml index f44ac436cb..46eebc6138 100644 --- a/cayenne-ant/pom.xml +++ b/cayenne-ant/pom.xml @@ -95,11 +95,15 @@ test - xmlunit - xmlunit + org.xmlunit + xmlunit-matchers + test + + + org.xmlunit + xmlunit-jakarta-jaxb-impl test - diff --git a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java index aa48f56411..5d169b0012 100644 --- a/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java +++ b/cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java @@ -26,12 +26,8 @@ import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.UnknownElement; import org.apache.tools.ant.util.FileUtils; -import org.custommonkey.xmlunit.DetailedDiff; -import org.custommonkey.xmlunit.Diff; -import org.custommonkey.xmlunit.Difference; -import org.custommonkey.xmlunit.XMLUnit; import org.junit.Test; -import org.xml.sax.SAXException; +import org.xmlunit.matchers.CompareMatcher; import java.io.File; import java.io.FileReader; @@ -41,10 +37,15 @@ import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.Statement; -import java.util.List; -import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.*; +import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.assertCatalog; +import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.assertCatalogAndSchema; +import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.assertFlat; +import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.assertSchema; +import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.assertSkipRelationshipsLoading; +import static org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineeringUtils.assertTableTypes; import static org.apache.cayenne.util.Util.isBlank; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -53,9 +54,6 @@ // based on "cayenneTestConnection", like we do in cayenne-server, etc. public class DbImporterTaskTest { - static { - XMLUnit.setIgnoreWhitespace(true); - } private static File distDir(String name) { File distDir = new File(FileUtil.baseTestDirectory(), "cdbImport"); @@ -179,19 +177,8 @@ private void verifyResult(File map, File mapFileCopy) { try { FileReader control = new FileReader(map.getAbsolutePath() + "-result"); FileReader test = new FileReader(mapFileCopy); - - DetailedDiff diff = new DetailedDiff(new Diff(control, test)); - if (!diff.similar()) { - for (Difference d : ((List) diff.getAllDifferences())) { - - System.out.println("-------------------------------------------"); - System.out.println(d.getTestNodeDetail().getNode()); - System.out.println(d.getControlNodeDetail().getValue()); - } - fail(diff.toString()); - } - - } catch (SAXException | IOException e) { + assertThat(test, CompareMatcher.isSimilarTo(control).ignoreWhitespace()); + } catch (IOException e) { e.printStackTrace(); fail(); } diff --git a/maven-plugins/cayenne-maven-plugin/pom.xml b/maven-plugins/cayenne-maven-plugin/pom.xml index 3e7e6eb768..6a5c4e65ce 100644 --- a/maven-plugins/cayenne-maven-plugin/pom.xml +++ b/maven-plugins/cayenne-maven-plugin/pom.xml @@ -119,8 +119,14 @@ - xmlunit - xmlunit + org.xmlunit + xmlunit-matchers + test + + + + org.xmlunit + xmlunit-jakarta-jaxb-impl test diff --git a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java index 18d4168d15..29bdfc9fce 100644 --- a/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java +++ b/maven-plugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java @@ -18,18 +18,6 @@ ****************************************************************/ package org.apache.cayenne.tools; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.net.URL; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Iterator; -import java.util.Objects; - import org.apache.cayenne.dbsync.reverse.dbimport.Catalog; import org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfiguration; import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable; @@ -44,17 +32,27 @@ import org.apache.maven.project.ProjectBuilder; import org.apache.maven.project.ProjectBuildingRequest; import org.codehaus.plexus.util.FileUtils; -import org.custommonkey.xmlunit.DetailedDiff; -import org.custommonkey.xmlunit.Diff; -import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier; -import org.custommonkey.xmlunit.XMLUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; +import org.xmlunit.matchers.CompareMatcher; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.URL; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Iterator; +import java.util.Objects; import static org.apache.cayenne.util.Util.isBlank; +import static org.hamcrest.MatcherAssert.assertThat; import static org.mockito.Mockito.mock; @@ -62,10 +60,6 @@ public class DbImporterMojoTest extends AbstractMojoTestCase { private static DerbyManager derbyAssembly; - static { - XMLUnit.setIgnoreWhitespace(true); - } - @BeforeClass public static void beforeClass() throws IOException, SQLException { derbyAssembly = new DerbyManager("target/derby"); @@ -478,13 +472,7 @@ private void verifyResult(File map, File mapFileCopy) { FileReader control = new FileReader(map.getAbsolutePath() + "-result"); FileReader test = new FileReader(mapFileCopy); - Diff prototype = new Diff(control, test); - prototype.overrideElementQualifier(new ElementNameAndAttributeQualifier()); - DetailedDiff diff = new DetailedDiff(prototype); - - if (!diff.similar()) { - fail(diff.toString()); - } + assertThat(test, CompareMatcher.isSimilarTo(control).ignoreWhitespace()); } catch (Exception e) { e.printStackTrace(); fail(); diff --git a/pom.xml b/pom.xml index 4db0e91a0d..9397a19664 100644 --- a/pom.xml +++ b/pom.xml @@ -404,12 +404,18 @@ 10.14.2.0 test - - xmlunit - xmlunit - 1.6 - test - + + org.xmlunit + xmlunit-matchers + 2.9.0 + test + + + org.xmlunit + xmlunit-jakarta-jaxb-impl + 2.9.0 + test + org.slf4j slf4j-api