Menu
▾
▴
SF.net SVN: xmlunit:[411] trunk/xmlunit/src
|
From: <bo...@us...> - 2010-07-06 15:00:43
|
Revision: 411
http://xmlunit.svn.sourceforge.net/xmlunit/?rev=411&view=rev
Author: bodewig
Date: 2010-07-06 15:00:37 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
use the more generic nodeSpecificTests method
Modified Paths:
--------------
trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml
trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/diff/DOMDifferenceEngineTest.java
Modified: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml
===================================================================
--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml 2010-07-06 10:43:39 UTC (rev 410)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml 2010-07-06 15:00:37 UTC (rev 411)
@@ -103,6 +103,12 @@
(ProcessingInstruction) test);
}
break;
+ case Node.DOCUMENT_TYPE_NODE:
+ if (test instanceof DocumentType) {
+ return compareDocTypes((DocumentType) control,
+ (DocumentType) test);
+ }
+ break;
}
return ComparisonResult.EQUAL;
}
@@ -117,8 +123,8 @@
test, null, test.getData()));
}
- ComparisonResult compareDocuments(Document control,
- Document test) {
+ private ComparisonResult compareDocuments(Document control,
+ Document test) {
DocumentType controlDt = control.getDoctype();
DocumentType testDt = test.getDoctype();
]]></literal>
@@ -129,7 +135,7 @@
<literal><![CDATA[
if (controlDt != null && testDt != null) {
]]></literal>
- <compareMethodExpr method="compareDocTypes"
+ <compareMethodExpr method="nodeTypeSpecificComparison"
controlExpr="controlDt"
testExpr="testDt"/>
<literal><![CDATA[
@@ -143,8 +149,8 @@
test, null, test.getXmlEncoding()));
}
- ComparisonResult compareDocTypes(DocumentType control,
- DocumentType test) {
+ private ComparisonResult compareDocTypes(DocumentType control,
+ DocumentType test) {
]]></literal>
<lastResultDef/>
<compare type="DOCTYPE_NAME" property="getName()"/>
Modified: trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/diff/DOMDifferenceEngineTest.java
===================================================================
--- trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/diff/DOMDifferenceEngineTest.java 2010-07-06 10:43:39 UTC (rev 410)
+++ trunk/xmlunit/src/tests/java-core/net/sf/xmlunit/diff/DOMDifferenceEngineTest.java 2010-07-06 15:00:37 UTC (rev 411)
@@ -27,6 +27,7 @@
import org.w3c.dom.DocumentType;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
import org.w3c.dom.ProcessingInstruction;
import org.w3c.dom.Text;
import static org.junit.Assert.*;
@@ -247,7 +248,8 @@
+ "\">"
+ "<Book/>")
.build());
- assertEquals(ComparisonResult.CRITICAL, d.compareDocuments(d1, d2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(d1, d2));
assertEquals(1, ex.invoked);
d = new DOMDifferenceEngine();
@@ -261,7 +263,8 @@
d2 = Convert.toDocument(Input.fromMemory("<?xml version=\"1.1\""
+ " encoding=\"UTF-8\"?>"
+ "<Book/>").build());
- assertEquals(ComparisonResult.CRITICAL, d.compareDocuments(d1, d2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(d1, d2));
assertEquals(1, ex.invoked);
d = new DOMDifferenceEngine();
@@ -275,7 +278,8 @@
d2 = Convert.toDocument(Input.fromMemory("<?xml version=\"1.0\""
+ " standalone=\"no\"?>"
+ "<Book/>").build());
- assertEquals(ComparisonResult.CRITICAL, d.compareDocuments(d1, d2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(d1, d2));
assertEquals(1, ex.invoked);
d = new DOMDifferenceEngine();
@@ -300,7 +304,8 @@
d2 = Convert.toDocument(Input.fromMemory("<?xml version=\"1.0\""
+ " encoding=\"UTF-16\"?>"
+ "<Book/>").build());
- assertEquals(ComparisonResult.CRITICAL, d.compareDocuments(d1, d2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(d1, d2));
assertEquals(1, ex.invoked);
}
@@ -311,6 +316,9 @@
this.publicId = publicId;
this.systemId = systemId;
}
+ @Override public short getNodeType() {
+ return Node.DOCUMENT_TYPE_NODE;
+ }
public NamedNodeMap getEntities() {
return null;
}
@@ -338,7 +346,8 @@
d.setDifferenceEvaluator(DifferenceEvaluators.DefaultStopWhenDifferent);
DocumentType dt1 = new DocType("name", "pub", "system");
DocumentType dt2 = new DocType("name2", "pub", "system");
- assertEquals(ComparisonResult.CRITICAL, d.compareDocTypes(dt1, dt2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(dt1, dt2));
assertEquals(1, ex.invoked);
d = new DOMDifferenceEngine();
@@ -346,7 +355,8 @@
d.addDifferenceListener(ex);
d.setDifferenceEvaluator(DifferenceEvaluators.DefaultStopWhenDifferent);
dt2 = new DocType("name", "pub2", "system");
- assertEquals(ComparisonResult.CRITICAL, d.compareDocTypes(dt1, dt2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(dt1, dt2));
assertEquals(1, ex.invoked);
d = new DOMDifferenceEngine();
@@ -365,7 +375,8 @@
}
});
dt2 = new DocType("name", "pub", "system2");
- assertEquals(ComparisonResult.CRITICAL, d.compareDocTypes(dt1, dt2));
+ assertEquals(ComparisonResult.CRITICAL,
+ d.nodeTypeSpecificComparison(dt1, dt2));
assertEquals(1, ex.invoked);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
