Sitelet https://github.com/xmlunit/xmlunit/pull/308/files
Skip to content

add null check for NodeFilters.Default predicate #308

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

Closed
dzik-darek wants to merge 1 commit into from
Closed

add null check for NodeFilters.Default predicate #308

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
3 changes: 2 additions & 1 deletion xmlunit-core/src/main/java/org/xmlunit/diff/NodeFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ public final class NodeFilters {
public static final Predicate<Node> Default = new Predicate<Node>() {
@Override
public boolean test(Node n) {
return n.getNodeType() != Node.DOCUMENT_TYPE_NODE;
return n != null
&& n.getNodeType() != Node.DOCUMENT_TYPE_NODE;
}
};

Expand Down
21 changes: 21 additions & 0 deletions xmlunit-core/src/test/java/org/xmlunit/diff/DOMDifferenceEngineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,27 @@ public boolean test(Attr a) {
assertEquals(1, ex.invoked);
}

@Test public void compareAttributesWithNullValues() {
DOMDifferenceEngine d = new DOMDifferenceEngine();
DiffExpecter ex = new DiffExpecter(ComparisonType.ATTR_VALUE);
d.addDifferenceListener(ex);
d.setComparisonController(ComparisonControllers.StopWhenDifferent);

Element e1 = doc.createElement("foo");
e1.setAttribute("x", null);
Element e2 = doc.createElement("foo");
e2.setAttribute("x", null);
Element e3 = doc.createElement("foo");
e3.setAttribute("x", "2137");

assertEquals(wrap(ComparisonResult.EQUAL),
d.compareNodes(e1, new XPathContext(),
e2, new XPathContext()));
assertEquals(wrapAndStop(ComparisonResult.DIFFERENT),
d.compareNodes(e1, new XPathContext(),
e3, new XPathContext()));
}

@Test public void compareNodesWithNodeFilter() {
DOMDifferenceEngine d = new DOMDifferenceEngine();
d.setNodeFilter(new Predicate<Node>() {
Expand Down