Skip to content

change xmlunit to xmlunit-matchers dependency, update tests #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stariy95 merged 1 commit into from
Sep 7, 2022
Merged

change xmlunit to xmlunit-matchers dependency, update tests #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions cayenne-ant/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,15 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-jakarta-jaxb-impl</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
Expand Down
33 changes: 10 additions & 23 deletions cayenne-ant/src/test/java/org/apache/cayenne/tools/DbImporterTaskTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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");
Expand Down Expand Up @@ -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<Difference>) 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();
}
Expand Down
10 changes: 8 additions & 2 deletions maven-plugins/cayenne-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,14 @@
</dependency>

<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-jakarta-jaxb-impl</artifactId>
<scope>test</scope>
</dependency>

Expand Down
42 changes: 15 additions & 27 deletions ...ugins/cayenne-maven-plugin/src/test/java/org/apache/cayenne/tools/DbImporterMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -44,28 +32,34 @@
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;


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");
Expand Down Expand Up @@ -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();
Expand Down
18 changes: 12 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,12 +404,18 @@
<version>10.14.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<version>1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId>
<version>2.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-jakarta-jaxb-impl</artifactId>
<version>2.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down