elena 2003/03/24 12:11:06
Modified: java/tests/dom DTest.java
java/tests/dom/dom3 Test.java
java/tests/dom/ids Test.java
java/tests/dom/mem Test.java
java/tests/dom/registry Test.java
java/tests/dom/rename Test.java
java/tests/dom/util Assertion.java
Log:
rename assert methods to allow running under JDK 1.4 without warnings
Revision Changes Path
1.4 +38 -38 xml-xerces/java/tests/dom/DTest.java
Index: DTest.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/DTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DTest.java 1 May 2000 19:22:05 -0000 1.3
+++ DTest.java 24 Mar 2003 20:11:04 -0000 1.4
@@ -229,30 +229,30 @@
//************************************************* ERROR TESTS
DTest tests = new DTest();
- OK &= Assertion.assert(tests.DOMExceptionsTest(document, "appendChild", new
Class[]{Node.class}, new Object[]{docBody}, DOMException.HIERARCHY_REQUEST_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(docNode3, "appendChild", new
Class[]{Node.class}, new Object[]{docNode4}, DOMException.HIERARCHY_REQUEST_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(doc, "insertBefore", new
Class[]{Node.class, Node.class}, new Object[]{docEntity, docFirstElement},
DOMException.HIERARCHY_REQUEST_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(doc, "replaceChild", new
Class[]{Node.class, Node.class}, new Object[]{docCDATASection, docFirstElement},
DOMException.HIERARCHY_REQUEST_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(document, "appendChild", new
Class[]{Node.class}, new Object[]{docBody}, DOMException.HIERARCHY_REQUEST_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(docNode3, "appendChild", new
Class[]{Node.class}, new Object[]{docNode4}, DOMException.HIERARCHY_REQUEST_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(doc, "insertBefore", new
Class[]{Node.class, Node.class}, new Object[]{docEntity, docFirstElement},
DOMException.HIERARCHY_REQUEST_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(doc, "replaceChild", new
Class[]{Node.class, Node.class}, new Object[]{docCDATASection, docFirstElement},
DOMException.HIERARCHY_REQUEST_ERR ));
docFirstElement.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(docFirstElement.getNodeValue() == null);
+ OK &= Assertion.verify(docFirstElement.getNodeValue() == null);
docReferenceEntity.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(docReferenceEntity.getNodeValue() == null);
+ OK &= Assertion.verify(docReferenceEntity.getNodeValue() == null);
docEntity.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(docEntity.getNodeValue() == null);
+ OK &= Assertion.verify(docEntity.getNodeValue() == null);
doc.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(doc.getNodeValue() == null);
+ OK &= Assertion.verify(doc.getNodeValue() == null);
docType.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(docType.getNodeValue() == null);
+ OK &= Assertion.verify(docType.getNodeValue() == null);
docDocFragment.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(docDocFragment.getNodeValue() == null);
+ OK &= Assertion.verify(docDocFragment.getNodeValue() == null);
docNotation.setNodeValue("This shouldn't do anything!");
- OK &= Assertion.assert(docNotation.getNodeValue() == null);
+ OK &= Assertion.verify(docNotation.getNodeValue() == null);
- OK &= Assertion.assert(tests.DOMExceptionsTest(docReferenceEntity,
"appendChild", new Class[]{Node.class}, new Object[]{entityReferenceText2 },
DOMException.NO_MODIFICATION_ALLOWED_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(docBodyLevel32, "insertBefore",
new Class[]{Node.class, Node.class}, new Object[]{docTextNode11,docBody },
DOMException.NOT_FOUND_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(docBodyLevel32, "removeChild",
new Class[]{Node.class}, new Object[]{docFirstElement}, DOMException.NOT_FOUND_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(docBodyLevel32, "replaceChild",
new Class[]{Node.class, Node.class}, new Object[]{docTextNode11,docFirstElement },
DOMException.NOT_FOUND_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(docReferenceEntity,
"appendChild", new Class[]{Node.class}, new Object[]{entityReferenceText2 },
DOMException.NO_MODIFICATION_ALLOWED_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(docBodyLevel32, "insertBefore",
new Class[]{Node.class, Node.class}, new Object[]{docTextNode11,docBody },
DOMException.NOT_FOUND_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(docBodyLevel32, "removeChild",
new Class[]{Node.class}, new Object[]{docFirstElement}, DOMException.NOT_FOUND_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(docBodyLevel32, "replaceChild",
new Class[]{Node.class, Node.class}, new Object[]{docTextNode11,docFirstElement },
DOMException.NOT_FOUND_ERR ));
//!! Throws a NOT_FOUND_ERR ********
@@ -677,7 +677,7 @@
//************************************************* ERROR TESTS
DTest tests = new DTest();
- Assertion.assert(
+ Assertion.verify(
tests.DOMExceptionsTest(document.getDocumentElement(),
"appendChild",
new Class[]{Node.class},
@@ -685,7 +685,7 @@
DOMException.HIERARCHY_REQUEST_ERR));
attribute2 = document.createAttribute("testAttribute2");
- Assertion.assert(
+ Assertion.verify(
tests.DOMExceptionsTest(document.getDocumentElement(),
"removeAttributeNode",
new Class[]{Attr.class},
@@ -694,7 +694,7 @@
Element element = (Element)document.getLastChild().getLastChild();
// Tests setNamedItem
- Assertion.assert(
+ Assertion.verify(
tests.DOMExceptionsTest(element,
"setAttributeNode",
new Class[]{Attr.class},
@@ -837,45 +837,45 @@
DTest tests = new DTest();
//!! Throws INDEX_SIZE_ERR ********************
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "deleteData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "deleteData", new
Class[]{int.class, int.class},
new Object[]{new Integer(-1),new Integer(5) },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "deleteData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "deleteData", new
Class[]{int.class, int.class},
new Object[]{new Integer(2),new Integer(-1) },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "deleteData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "deleteData", new
Class[]{int.class, int.class},
new Object[]{new Integer(100),new Integer(5) },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "insertData", new
Class[]{int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "insertData", new
Class[]{int.class, String.class},
new Object[]{new Integer(-1),"Stuff inserted" },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "insertData", new
Class[]{int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "insertData", new
Class[]{int.class, String.class},
new Object[]{new Integer(100),"Stuff inserted" },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "replaceData", new
Class[]{int.class, int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "replaceData", new
Class[]{int.class, int.class, String.class},
new Object[]{new Integer(-1),new Integer(5),"Replacement
stuff" }, DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "replaceData", new
Class[]{int.class, int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "replaceData", new
Class[]{int.class, int.class, String.class},
new Object[]{new Integer(100),new Integer(5),"Replacement
stuff" }, DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "replaceData", new
Class[]{int.class, int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "replaceData", new
Class[]{int.class, int.class, String.class},
new Object[]{new Integer(2),new Integer(-1),"Replacement
stuff" }, DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "substringData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "substringData", new
Class[]{int.class, int.class},
new Object[]{new Integer(-1),new Integer(5) },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "substringData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "substringData", new
Class[]{int.class, int.class},
new Object[]{new Integer(100),new Integer(5) },
DOMException.INDEX_SIZE_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(charData, "substringData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(charData, "substringData", new
Class[]{int.class, int.class},
new Object[]{new Integer(2),new Integer(-1) },
DOMException.INDEX_SIZE_ERR ));
//!! Throws NO_MODIFICATION_ALLOWED_ERR ********
Node node =
document.getDocumentElement().getElementsByTagName("dBodyLevel24").item(0).getFirstChild().getChildNodes().item(0);
// node gets ourEntityReference node's child text
- OK &= Assertion.assert(tests.DOMExceptionsTest(node, "appendData", new
Class[]{String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(node, "appendData", new
Class[]{String.class},
new Object[]{"new data" },
DOMException.NO_MODIFICATION_ALLOWED_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(node, "deleteData", new
Class[]{int.class, int.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(node, "deleteData", new
Class[]{int.class, int.class},
new Object[]{new Integer(5),new Integer(10) },
DOMException.NO_MODIFICATION_ALLOWED_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(node, "insertData", new
Class[]{int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(node, "insertData", new
Class[]{int.class, String.class},
new Object[]{new Integer(5),"Stuff inserted" },
DOMException.NO_MODIFICATION_ALLOWED_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(node, "replaceData", new
Class[]{int.class, int.class, String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(node, "replaceData", new
Class[]{int.class, int.class, String.class},
new Object[]{new Integer(5),new Integer(10),"Replacementstuff"
}, DOMException.NO_MODIFICATION_ALLOWED_ERR ));
- OK &= Assertion.assert(tests.DOMExceptionsTest(node, "setData", new
Class[]{String.class},
+ OK &= Assertion.verify(tests.DOMExceptionsTest(node, "setData", new
Class[]{String.class},
new Object[]{"New setdata stuff"},
DOMException.NO_MODIFICATION_ALLOWED_ERR ));
@@ -1105,7 +1105,7 @@
// check on the ownerDocument of the cloned nodes
Document doc2 = (Document) node2;
- Assertion.assert(doc2.getDocumentElement().getOwnerDocument() == doc2);
+ Assertion.verify(doc2.getDocumentElement().getOwnerDocument() == doc2);
// Deep clone test comparison is also in testNode
@@ -1210,8 +1210,8 @@
DTest tests = new DTest();
- OK &= Assertion.assert(tests.DOMExceptionsTest(document, "appendChild", new
Class[]{Node.class}, new Object[]{testElementNode}, DOMException.HIERARCHY_REQUEST_ERR
));
- OK &= Assertion.assert(tests.DOMExceptionsTest(testTextNode, "appendChild",
new Class[]{Node.class}, new Object[]{testTextNode},
DOMException.HIERARCHY_REQUEST_ERR ));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(document, "appendChild", new
Class[]{Node.class}, new Object[]{testElementNode}, DOMException.HIERARCHY_REQUEST_ERR
));
+ OK &= Assertion.verify(tests.DOMExceptionsTest(testTextNode, "appendChild",
new Class[]{Node.class}, new Object[]{testTextNode},
DOMException.HIERARCHY_REQUEST_ERR ));
// OK &= Assertion.assert(tests.DOMExceptionsTest(document, "insertBefore", new
Class[]{Node.class, Node.class}, new
Object[]{document.getElementsByTagName("docEntity").item(0),
document.getElementsByTagName("docFirstElement").item(0)},
DOMException.HIERARCHY_REQUEST_ERR ));
// OK &= Assertion.assert(tests.DOMExceptionsTest(document, "replaceChild", new
Class[]{Node.class, Node.class}, new
Object[]{document.getElementsByTagName("docCDATASection").item(0),
document.getElementsByTagName("docFirstElement").item(0)},
DOMException.HIERARCHY_REQUEST_ERR ));
1.9 +56 -56 xml-xerces/java/tests/dom/dom3/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/dom3/Test.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Test.java 20 Mar 2003 00:39:27 -0000 1.8
+++ Test.java 24 Mar 2003 20:11:05 -0000 1.9
@@ -105,7 +105,7 @@
DOMImplementationLS impl =
(DOMImplementationLS)DOMImplementationRegistry.newInstance().getDOMImplementation("LS-Load");
- Assertion.assert(impl!=null, "domImplementation != null");
+ Assertion.verify(impl!=null, "domImplementation != null");
DOMBuilder builder =
impl.createDOMBuilder(DOMImplementationLS.MODE_SYNCHRONOUS,
null);
@@ -129,30 +129,30 @@
NodeImpl elem = (NodeImpl)ls.item(0);
if (namespaces) {
//System.out.println("[a:elem_a].lookupPrefix('http://www.example.com', true) ==
null");
-
Assertion.assert(elem.lookupPrefix("http://www.example.com";).equals("ns1"),
+
Assertion.verify(elem.lookupPrefix("http://www.example.com";).equals("ns1"),
"[a:elem_a].lookupPrefix(http://www.example.com)==null");
//System.out.println("[a:elem_a].isDefaultNamespace('http://www.example.com') ==
true");
-
Assertion.assert(elem.isDefaultNamespace("http://www.example.com";) == true,
+
Assertion.verify(elem.isDefaultNamespace("http://www.example.com";) == true,
"[a:elem_a].isDefaultNamespace(http://www.example.com)==true");
//System.out.println("[a:elem_a].lookupPrefix('http://www.example.com', false) ==
ns1");
-
Assertion.assert(elem.lookupPrefix("http://www.example.com";).equals("ns1"),
+
Assertion.verify(elem.lookupPrefix("http://www.example.com";).equals("ns1"),
"[a:elem_a].lookupPrefix(http://www.example.com)==ns1");
-
Assertion.assert(elem.lookupNamespaceURI("xsi").equals("http://www.w3.org/2001/XMLSchema-instance";),
+
Assertion.verify(elem.lookupNamespaceURI("xsi").equals("http://www.w3.org/2001/XMLSchema-instance";),
"[a:elem_a].lookupNamespaceURI('xsi') ==
'http://www.w3.org/2001/XMLSchema-instance'" );
} else {
- Assertion.assert( elem.lookupPrefix("http://www.example.com";)
== null,"lookupPrefix(http://www.example.com)==null");
+ Assertion.verify( elem.lookupPrefix("http://www.example.com";)
== null,"lookupPrefix(http://www.example.com)==null");
}
ls = doc.getElementsByTagName("bar:leaf");
elem = (NodeImpl)ls.item(0);
- Assertion.assert(elem.lookupPrefix("url1:").equals("foo"),
+ Assertion.verify(elem.lookupPrefix("url1:").equals("foo"),
"[bar:leaf].lookupPrefix('url1:', false) == foo");
//System.out.println("[bar:leaf].lookupPrefix('url1:', false) == "+
);
@@ -166,14 +166,14 @@
elem.appendChild(e1);
- Assertion.assert(((NodeImpl)e1).lookupPrefix("b:").equals("p"),
+ Assertion.verify(((NodeImpl)e1).lookupPrefix("b:").equals("p"),
"[p:baz].lookupPrefix('b:', false) == p");
//System.out.println("[p:baz].lookupPrefix('b:', false) == "+
((NodeImpl)e1).lookupPrefix("b:",false));
-
Assertion.assert(elem.lookupNamespaceURI("xsi").equals("http://www.w3.org/2001/XMLSchema-instance";),
+
Assertion.verify(elem.lookupNamespaceURI("xsi").equals("http://www.w3.org/2001/XMLSchema-instance";),
"[bar:leaf].lookupNamespaceURI('xsi') ==
'http://www.w3.org/2001/XMLSchema-instance'" );
@@ -189,7 +189,7 @@
config.setParameter("error-handler",errorHandler);
config.setParameter("validate", Boolean.TRUE);
DocumentImpl core =
(DocumentImpl)builder.parseURI("tests/dom/dom3/schema.xml");
- Assertion.assert(errorCounter == 0, "No errors should be reported");
+ Assertion.verify(errorCounter == 0, "No errors should be reported");
errorCounter = 0;
NodeList ls2 = core.getElementsByTagName("decVal");
@@ -218,13 +218,13 @@
config.setParameter("error-handler",errorHandler);
config.setParameter("validate", Boolean.TRUE);
core.normalizeDocument();
- Assertion.assert(errorCounter == 3, "3 errors should be reported");
+ Assertion.verify(errorCounter == 3, "3 errors should be reported");
errorCounter = 0;
config.setParameter("validate", Boolean.FALSE);
config.setParameter("comments", Boolean.FALSE);
core.normalizeDocument();
- Assertion.assert(errorCounter == 0, "No errors should be reported");
+ Assertion.verify(errorCounter == 0, "No errors should be reported");
config = builder.getConfig();
@@ -244,12 +244,12 @@
config.setParameter("validate", Boolean.TRUE);
config.setParameter("psvi", Boolean.TRUE);
DocumentImpl core =
(DocumentImpl)builder.parseURI("data/personal-schema.xml");
- Assertion.assert(errorCounter == 0, "No errors should be reported");
+ Assertion.verify(errorCounter == 0, "No errors should be reported");
NodeList ls2 = core.getElementsByTagName("person");
Element testElem = (Element)ls2.item(0);
-
Assertion.assert(((ElementPSVI)testElem).getElementDeclaration().getName().equals("person"),
"testElem decl");
+
Assertion.verify(((ElementPSVI)testElem).getElementDeclaration().getName().equals("person"),
"testElem decl");
Element e1 = core.createElementNS(null, "person");
core.getDocumentElement().appendChild(e1);
@@ -271,8 +271,8 @@
config.setParameter("error-handler",errorHandler);
config.setParameter("validate", Boolean.TRUE);
core.normalizeDocument();
- Assertion.assert(errorCounter == 0, "No errors should be reported");
-
Assertion.assert(((ElementPSVI)e1).getElementDeclaration().getName().equals("person"),
"e1 decl");
+ Assertion.verify(errorCounter == 0, "No errors should be reported");
+
Assertion.verify(((ElementPSVI)e1).getElementDeclaration().getName().equals("person"),
"e1 decl");
config = builder.getConfig();
config.setParameter("validate", Boolean.FALSE);
@@ -320,57 +320,57 @@
// xsl:stylesheet should include 2 namespace declarations
String name = root.getNodeName();
- Assertion.assert(name.equals("xsl:stylesheet"), "xsl:stylesheet");
+ Assertion.verify(name.equals("xsl:stylesheet"), "xsl:stylesheet");
String value = root.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"xsl");
- Assertion.assert(value!=null, "xmlns:xsl != null");
-
Assertion.assert(value.equals("http://www.w3.org/1999/XSL/Transform";),
"xmlns:xsl="+value);
+ Assertion.verify(value!=null, "xmlns:xsl != null");
+
Assertion.verify(value.equals("http://www.w3.org/1999/XSL/Transform";),
"xmlns:xsl="+value);
value = root.getAttributeNS("http://www.w3.org/2000/xmlns/";, "NS1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://attr1";), "xmlns:NS1="+value);
// child includes 2 namespace decls
- Assertion.assert(child1.getNodeName().equals("NS2:child1"),
"NS2:child1");
+ Assertion.verify(child1.getNodeName().equals("NS2:child1"),
"NS2:child1");
value = child1.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"NS2");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://child1";), "xmlns:NS2="+value);
value = child1.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"NS1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://attr2";), "xmlns:NS1="+value);
// child3
- Assertion.assert(child3.getNodeName().equals("xsl:child3"),
"xsl:child3");
+ Assertion.verify(child3.getNodeName().equals("xsl:child3"),
"xsl:child3");
value = child3.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"NS1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://a2";), "xmlns:NS1="+value);
value = child3.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"a1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://a1";), "xmlns:a1="+value);
value = child3.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"xsl");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://www.w3.org/1999/XSL/Transform";), "xmlns:xsl="+value);
Attr attr = child3.getAttributeNodeNS("http://a2";, "attr2");
- Assertion.assert(attr != null, "NS1:attr2 !=null");
+ Assertion.verify(attr != null, "NS1:attr2 !=null");
- Assertion.assert(child3.getAttributes().getLength() == 5,
"xsl:child3 has 5 attrs");
+ Assertion.verify(child3.getAttributes().getLength() == 5,
"xsl:child3 has 5 attrs");
// child 4
Attr temp =
child4.getAttributeNodeNS("http://www.w3.org/2000/xmlns/";, "xmlns");
- Assertion.assert(temp.getNodeName().equals("xmlns"), "attribute
name is xmlns");
- Assertion.assert(temp.getNodeValue().length() == 0, "xmlns=''");
+ Assertion.verify(temp.getNodeName().equals("xmlns"), "attribute
name is xmlns");
+ Assertion.verify(temp.getNodeValue().length() == 0, "xmlns=''");
/*
OutputFormat format = new OutputFormat((Document)doc);
format.setLineSeparator(LineSeparator.Windows);
@@ -437,52 +437,52 @@
// xsl:stylesheet should include 2 namespace declarations
String name = root.getNodeName();
- Assertion.assert(name.equals("xsl:stylesheet"), "xsl:stylesheet");
+ Assertion.verify(name.equals("xsl:stylesheet"), "xsl:stylesheet");
String value = root.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"xsl");
- Assertion.assert(value!=null, "xmlns:xsl != null");
-
Assertion.assert(value.equals("http://www.w3.org/1999/XSL/Transform";),
"xmlns:xsl="+value);
+ Assertion.verify(value!=null, "xmlns:xsl != null");
+
Assertion.verify(value.equals("http://www.w3.org/1999/XSL/Transform";),
"xmlns:xsl="+value);
value = root.getAttributeNS("http://www.w3.org/2000/xmlns/";, "NS1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://attr1";), "xmlns:NS1="+value);
// child includes 2 namespace decls
- Assertion.assert(child1.getNodeName().equals("NS2:child1"),
"NS2:child1");
+ Assertion.verify(child1.getNodeName().equals("NS2:child1"),
"NS2:child1");
value = child1.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"NS2");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://child1";), "xmlns:NS2="+value);
value = child1.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"NS1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://attr2";), "xmlns:NS1="+value);
// child3
- Assertion.assert(child3.getNodeName().equals("xsl:child3"),
"xsl:child3");
+ Assertion.verify(child3.getNodeName().equals("xsl:child3"),
"xsl:child3");
value = child3.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"NS1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://a2";), "xmlns:NS1="+value);
value = child3.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"a1");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://a1";), "xmlns:a1="+value);
value = child3.getAttributeNS("http://www.w3.org/2000/xmlns/";,
"xsl");
- Assertion.assert(value!=null &&
+ Assertion.verify(value!=null &&
value.equals("http://www.w3.org/1999/XSL/Transform";), "xmlns:xsl="+value);
Attr attr = child3.getAttributeNodeNS("http://a2";, "attr2");
- Assertion.assert(attr != null, "NS6:attr2 !=null");
+ Assertion.verify(attr != null, "NS6:attr2 !=null");
- Assertion.assert(child3.getAttributes().getLength() == 5,
"xsl:child3 has 5 attrs");
+ Assertion.verify(child3.getAttributes().getLength() == 5,
"xsl:child3 has 5 attrs");
@@ -524,12 +524,12 @@
Node entity = doctype.getEntities().getNamedItem("ent3");
NodeList ls = test.getChildNodes();
- Assertion.assert(ls.getLength()==5, "List length");
+ Assertion.verify(ls.getLength()==5, "List length");
String compare1 = "Home Address: 1900 Dallas Road (East) City: Dallas.
California. USA PO #5668";
-
Assertion.assert(((TextImpl)ls.item(0)).getWholeText().equals(compare1), "Compare1");
+
Assertion.verify(((TextImpl)ls.item(0)).getWholeText().equals(compare1), "Compare1");
String compare2 = "Address: 1900 Dallas Road (East) City: Dallas.
California. USA PO #5668";
-
Assertion.assert(((TextImpl)ls.item(1)).getWholeText().equals(compare2), "Compare2");
+
Assertion.verify(((TextImpl)ls.item(1)).getWholeText().equals(compare2), "Compare2");
//TEST replaceWholeText()
@@ -538,22 +538,22 @@
TextImpl original = (TextImpl)ls.item(0);
Node newNode = original.replaceWholeText("Replace with this text");
ls = test.getChildNodes();
- Assertion.assert(ls.getLength() == 1, "Length == 1");
- Assertion.assert(ls.item(0).getNodeValue().equals("Replace with this
text"), "Replacement works");
- Assertion.assert(newNode != original, "New node created");
+ Assertion.verify(ls.getLength() == 1, "Length == 1");
+ Assertion.verify(ls.item(0).getNodeValue().equals("Replace with this
text"), "Replacement works");
+ Assertion.verify(newNode != original, "New node created");
// replace text for node which is not yet attached to the tree
Text text = doc.createTextNode("readonly");
((NodeImpl)text).setReadOnly(true, true);
text = ((TextImpl)text).replaceWholeText("Data");
- Assertion.assert(text.getNodeValue().equals("Data"), "New value
'Data'");
+ Assertion.verify(text.getNodeValue().equals("Data"), "New value
'Data'");
// test with second child that does not have any content
test = (Element)doc.getElementsByTagName("elem").item(1);
try {
((TextImpl)test.getFirstChild()).replaceWholeText("can't replace");
} catch (DOMException e){
- Assertion.assert(e !=null);
+ Assertion.verify(e !=null);
}
String compare3 = "Test: The Content ends here. ";
//Assertion.assert(((Text)test.getFirstChild()).getWholeText().equals(compare3),
"Compare3");
@@ -576,21 +576,21 @@
// schema-type is not set validate against both grammars
errorCounter = 0;
DocumentImpl core2 =
(DocumentImpl)builder.parseURI("tests/dom/dom3/both-error.xml");
- Assertion.assert(errorCounter == 4, "4 errors should be reported");
+ Assertion.verify(errorCounter == 4, "4 errors should be reported");
errorCounter = 0;
// set schema-type to be XML Schema
config.setParameter("schema-type",
"http://www.w3.org/2001/XMLSchema";);
// test parsing a file that has both XML schema and DTD
core2 = (DocumentImpl)builder.parseURI("tests/dom/dom3/both.xml");
- Assertion.assert(errorCounter == 0, "No errors should be reported");
+ Assertion.verify(errorCounter == 0, "No errors should be reported");
// parse a file with XML schema and DTD but validate against DTD
only
errorCounter = 0;
config.setParameter("schema-type","http://www.w3.org/TR/REC-xml";);
core2 =
(DocumentImpl)builder.parseURI("tests/dom/dom3/both-error.xml");
- Assertion.assert(errorCounter == 3, "3 errors should be reported");
+ Assertion.verify(errorCounter == 3, "3 errors should be reported");
// parse a file with DTD only but set schema-location and
// validate against XML Schema
@@ -611,7 +611,7 @@
config.setParameter("entity-resolver",resolver);
config.setParameter("validate", Boolean.TRUE);
core2.normalizeDocument();
- Assertion.assert(errorCounter == 1, "1 error should be reported:
"+errorCounter);
+ Assertion.verify(errorCounter == 1, "1 error should be reported:
"+errorCounter);
}
1.8 +17 -17 xml-xerces/java/tests/dom/ids/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/ids/Test.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Test.java 20 Mar 2003 00:39:27 -0000 1.7
+++ Test.java 24 Mar 2003 20:11:05 -0000 1.8
@@ -126,46 +126,46 @@
System.out.println("DOM IDs Test...");
Element el = doc.getElementById("one.worker");
- Assertion.assert(el != null);
+ Assertion.verify(el != null);
Element el2 = doc.getElementById("one.worker there");
- Assertion.assert(el2 == null);
+ Assertion.verify(el2 == null);
if (el != null) {
Assertion.equals(el.getAttribute("id"), "one.worker");
el.setAttribute("id", "my.worker");
el2 = doc.getElementById("my.worker");
- Assertion.assert(el2 == el);
+ Assertion.verify(el2 == el);
el2 = doc.getElementById("one.worker");
- Assertion.assert(el2 == null);
+ Assertion.verify(el2 == null);
el.removeAttribute("id");
el2 = doc.getElementById("my.worker");
- Assertion.assert(el2 == null);
+ Assertion.verify(el2 == null);
}
// find default id attribute and check its value
NodeList elementList = doc.getElementsByTagName("person");
Element testEmployee = (Element)elementList.item(1);
Attr id = testEmployee.getAttributeNode("id2");
- Assertion.assert(id.getNodeValue().equals("id02"), "value == 'id02'");
+ Assertion.verify(id.getNodeValue().equals("id02"), "value == 'id02'");
Element elem = doc.getElementById("id02");
- Assertion.assert(elem.getNodeName().equals("person"), "return by id
'id02'");
+ Assertion.verify(elem.getNodeName().equals("person"), "return by id
'id02'");
//
// remove default attribute and check on retrieval what its value
Attr removedAttr = testEmployee.removeAttributeNode(id);
String value = testEmployee.getAttribute("id2");
- Assertion.assert(value.equals("default.id"), "value='default.id'");
+ Assertion.verify(value.equals("default.id"), "value='default.id'");
elem = doc.getElementById("default.id");
- Assertion.assert(elem !=null, "elem by id 'default.id'");
+ Assertion.verify(elem !=null, "elem by id 'default.id'");
elem = doc.getElementById("id02");
- Assertion.assert(elem ==null, "elem by id '02'");
+ Assertion.verify(elem ==null, "elem by id '02'");
ElementImpl person = (ElementImpl)doc.getElementsByTagNameNS(null,
"person").item(0);
person.removeAttribute("id");
@@ -174,23 +174,23 @@
person.setIdAttribute("idAttr", true);
elem = doc.getElementById("eb0009");
- Assertion.assert(elem !=null, "elem by id 'eb0009'");
+ Assertion.verify(elem !=null, "elem by id 'eb0009'");
doc.getDocumentElement().removeChild(person);
elem = doc.getElementById("eb0009");
- Assertion.assert(elem ==null, "element with id 'eb0009 removed'");
+ Assertion.verify(elem ==null, "element with id 'eb0009 removed'");
doc.getDocumentElement().appendChild(person);
elem = doc.getElementById("eb0009");
- Assertion.assert(elem !=null, "elem by id 'eb0009'");
+ Assertion.verify(elem !=null, "elem by id 'eb0009'");
AttrImpl attr = (AttrImpl)person.getAttributeNode("idAttr");
- Assertion.assert(attr.isId(), "attribute is id");
+ Assertion.verify(attr.isId(), "attribute is id");
person.setIdAttribute("idAttr", false);
elem = doc.getElementById("eb0009");
- Assertion.assert(elem ==null, "element with id 'eb0009 removed'");
+ Assertion.verify(elem ==null, "element with id 'eb0009 removed'");
- Assertion.assert(!attr.isId(), "attribute is not id");
+ Assertion.verify(!attr.isId(), "attribute is not id");
System.out.println("done.");
1.12 +203 -203 xml-xerces/java/tests/dom/mem/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/mem/Test.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Test.java 11 Dec 2002 14:54:07 -0000 1.11
+++ Test.java 24 Mar 2003 20:11:05 -0000 1.12
@@ -260,23 +260,23 @@
doc.appendChild(rootEl);
Text textNode = doc.createTextNode("Doc03 text stuff");
- Assertion.assert(rootEl.getFirstChild() == null);
- Assertion.assert(rootEl.getLastChild() == null);
+ Assertion.verify(rootEl.getFirstChild() == null);
+ Assertion.verify(rootEl.getLastChild() == null);
rootEl.appendChild(textNode);
- Assertion.assert(rootEl.getFirstChild() == textNode);
- Assertion.assert(rootEl.getLastChild() == textNode);
+ Assertion.verify(rootEl.getFirstChild() == textNode);
+ Assertion.verify(rootEl.getLastChild() == textNode);
- Assertion.assert(textNode.getNextSibling() == null);
- Assertion.assert(textNode.getPreviousSibling() == null);
+ Assertion.verify(textNode.getNextSibling() == null);
+ Assertion.verify(textNode.getPreviousSibling() == null);
Text textNode2 = doc.createTextNode("Doc03 text stuff");
rootEl.appendChild(textNode2);
- Assertion.assert(textNode.getNextSibling() == textNode2);
- Assertion.assert(textNode2.getNextSibling() == null);
- Assertion.assert(textNode.getPreviousSibling() == null);
- Assertion.assert(textNode2.getPreviousSibling() == textNode);
+ Assertion.verify(textNode.getNextSibling() == textNode2);
+ Assertion.verify(textNode2.getNextSibling() == null);
+ Assertion.verify(textNode.getPreviousSibling() == null);
+ Assertion.verify(textNode2.getPreviousSibling() == textNode);
- Assertion.assert(rootEl.getFirstChild() == textNode);
- Assertion.assert(rootEl.getLastChild() == textNode2);
+ Assertion.verify(rootEl.getFirstChild() == textNode);
+ Assertion.verify(rootEl.getLastChild() == textNode2);
NodeList nodeList = doc.getElementsByTagName("*");
};
@@ -390,20 +390,20 @@
{
NamedNodeMap nnm = null;
- Assertion.assert(nnm == null);
+ Assertion.verify(nnm == null);
Document doc = new DocumentImpl();
nnm = doc.getAttributes(); // Should be null, because node type
// is not Element.
- Assertion.assert(nnm == null);
- Assertion.assert(!(nnm != null));
+ Assertion.verify(nnm == null);
+ Assertion.verify(!(nnm != null));
Element el = doc.createElement("NamedNodeMap01");
NamedNodeMap nnm2 = el.getAttributes(); // Should be an empty, but
non-null map.
- Assertion.assert(nnm2 != null);
- Assertion.assert(nnm != nnm2);
+ Assertion.verify(nnm2 != null);
+ Assertion.verify(nnm != nnm2);
nnm = nnm2;
- Assertion.assert(nnm == nnm2);
+ Assertion.verify(nnm == nnm2);
}
@@ -418,15 +418,15 @@
Element el1 = doc1.createElement("abc");
doc1.appendChild(el1);
- Assertion.assert(el1.getParentNode() != null);
+ Assertion.verify(el1.getParentNode() != null);
el1.setAttribute("foo", "foovalue");
Node el2 = doc2.importNode(el1, true);
- Assertion.assert(el2.getParentNode() == null);
+ Assertion.verify(el2.getParentNode() == null);
String tagName = el2.getNodeName();
Assertion.equals(tagName, "abc");
- Assertion.assert(el2.getOwnerDocument() == doc2);
+ Assertion.verify(el2.getOwnerDocument() == doc2);
Assertion.equals(((Element) el2).getAttribute("foo"), "foovalue");
- Assertion.assert(doc1 != doc2);
+ Assertion.verify(doc1 != doc2);
}
@@ -446,15 +446,15 @@
el.appendChild(tx);
int textLength = tx.getLength();
- Assertion.assert(textLength == 5);
+ Assertion.verify(textLength == 5);
NodeList nl = tx.getChildNodes();
int nodeListLen = nl.getLength();
- Assertion.assert(nodeListLen == 0);
+ Assertion.verify(nodeListLen == 0);
nl = el.getChildNodes();
nodeListLen = nl.getLength();
- Assertion.assert(nodeListLen == 1);
+ Assertion.verify(nodeListLen == 1);
}
@@ -465,24 +465,24 @@
{
NodeList nl = null;
NodeList nl2 = null;
- Assertion.assert(nl == null);
- Assertion.assert(!(nl != null));
- Assertion.assert(nl == nl2);
+ Assertion.verify(nl == null);
+ Assertion.verify(!(nl != null));
+ Assertion.verify(nl == nl2);
Document doc = new DocumentImpl();
nl = doc.getChildNodes(); // Should be non-null, but empty
- Assertion.assert(nl != null);
+ Assertion.verify(nl != null);
int len = nl.getLength();
- Assertion.assert(len == 0);
+ Assertion.verify(len == 0);
Element el = doc.createElement("NodeList01");
doc.appendChild(el);
len = nl.getLength();
- Assertion.assert(len == 1);
- Assertion.assert(nl != nl2);
+ Assertion.verify(len == 1);
+ Assertion.verify(nl != nl2);
nl2 = nl;
- Assertion.assert(nl == nl2);
+ Assertion.verify(nl == nl2);
}
@@ -494,7 +494,7 @@
{
Document doc = new DocumentImpl();
- Assertion.assert(DOMExceptionsTest(doc, "createElement",
+ Assertion.verify(DOMExceptionsTest(doc, "createElement",
new Class[]{String.class},
new Object[]{"!@@ bad element name"},
DOMException.INVALID_CHARACTER_ERR));
@@ -514,12 +514,12 @@
Element n1, n2, n3;
n1 = n2 = n3 = el;
- Assertion.assert(n1 == n2);
- Assertion.assert(n1 == n3);
- Assertion.assert(n1 == el);
- Assertion.assert(n1 != null);
+ Assertion.verify(n1 == n2);
+ Assertion.verify(n1 == n3);
+ Assertion.verify(n1 == el);
+ Assertion.verify(n1 != null);
n1 = n2 = n3 = null;
- Assertion.assert(n1 == null);
+ Assertion.verify(n1 == null);
}
@@ -540,13 +540,13 @@
Element cloned = (Element)root.cloneNode(true);
Attr a = cloned.getAttributeNode("CTestAttr");
- Assertion.assert(a != null);
+ Assertion.verify(a != null);
s = a.getValue();
Assertion.equals(s, "CTestAttrValue");
a = null;
a = cloned.getAttributeNode("CTestAttr");
- Assertion.assert(a != null);
+ Assertion.verify(a != null);
s = a.getValue();
Assertion.equals(s, "CTestAttrValue");
@@ -569,14 +569,14 @@
Element cloned = (Element)root.cloneNode(true);
Attr a = cloned.getAttributeNode("attr");
- Assertion.assert(a.getSpecified() == false);
+ Assertion.verify(a.getSpecified() == false);
a = cloned.getAttributeNode("attr2");
- Assertion.assert(a.getSpecified() == true);
+ Assertion.verify(a.getSpecified() == true);
// now if we clone the default attribute by itself the clone should be
// specified
a = (Attr)attr.cloneNode(true);
- Assertion.assert(a.getSpecified() == true);
+ Assertion.verify(a.getSpecified() == true);
}
@@ -591,25 +591,25 @@
{
DOMImplementation impl = DOMImplementationImpl.getDOMImplementation();
- Assertion.assert(impl.hasFeature("XML", "2.0") == true);
- Assertion.assert(impl.hasFeature("XML", null) == true);
+ Assertion.verify(impl.hasFeature("XML", "2.0") == true);
+ Assertion.verify(impl.hasFeature("XML", null) == true);
// We also support 1.0
- Assertion.assert(impl.hasFeature("XML", "1.0") == true);
- Assertion.assert(impl.hasFeature("XML", "3.0") == false);
- Assertion.assert(impl.hasFeature("Traversal", null) == true);
-
-
- Assertion.assert(impl.hasFeature("HTML", null) == false);
- Assertion.assert(impl.hasFeature("Views", null) == false);
- Assertion.assert(impl.hasFeature("StyleSheets", null) == false);
- Assertion.assert(impl.hasFeature("CSS", null) == false);
- Assertion.assert(impl.hasFeature("CSS2", null) == false);
- Assertion.assert(impl.hasFeature("Events", null) == true);
- Assertion.assert(impl.hasFeature("UIEvents", null) == false);
- Assertion.assert(impl.hasFeature("MouseEvents", null) == false);
- Assertion.assert(impl.hasFeature("MutationEvents", null) == true);
- Assertion.assert(impl.hasFeature("HTMLEvents", null) == false);
- Assertion.assert(impl.hasFeature("Range", null) == true);
+ Assertion.verify(impl.hasFeature("XML", "1.0") == true);
+ Assertion.verify(impl.hasFeature("XML", "3.0") == false);
+ Assertion.verify(impl.hasFeature("Traversal", null) == true);
+
+
+ Assertion.verify(impl.hasFeature("HTML", null) == false);
+ Assertion.verify(impl.hasFeature("Views", null) == false);
+ Assertion.verify(impl.hasFeature("StyleSheets", null) == false);
+ Assertion.verify(impl.hasFeature("CSS", null) == false);
+ Assertion.verify(impl.hasFeature("CSS2", null) == false);
+ Assertion.verify(impl.hasFeature("Events", null) == true);
+ Assertion.verify(impl.hasFeature("UIEvents", null) == false);
+ Assertion.verify(impl.hasFeature("MouseEvents", null) == false);
+ Assertion.verify(impl.hasFeature("MutationEvents", null) == true);
+ Assertion.verify(impl.hasFeature("HTMLEvents", null) == false);
+ Assertion.verify(impl.hasFeature("Range", null) == true);
}
@@ -627,21 +627,21 @@
DocumentType dt = impl.createDocumentType(qName, pubId, sysId);
- Assertion.assert(dt != null);
- Assertion.assert(dt.getNodeType() == Node.DOCUMENT_TYPE_NODE);
+ Assertion.verify(dt != null);
+ Assertion.verify(dt.getNodeType() == Node.DOCUMENT_TYPE_NODE);
Assertion.equals(dt.getNodeName(), qName);
- Assertion.assert(dt.getNamespaceURI() == null);
- Assertion.assert(dt.getPrefix() == null);
- Assertion.assert(dt.getLocalName() == null);
+ Assertion.verify(dt.getNamespaceURI() == null);
+ Assertion.verify(dt.getPrefix() == null);
+ Assertion.verify(dt.getLocalName() == null);
Assertion.equals(dt.getPublicId(), pubId);
Assertion.equals(dt.getSystemId(), sysId);
- Assertion.assert(dt.getInternalSubset() == null);
- Assertion.assert(dt.getOwnerDocument() == null);
+ Assertion.verify(dt.getInternalSubset() == null);
+ Assertion.verify(dt.getOwnerDocument() == null);
NamedNodeMap nnm = dt.getEntities();
- Assertion.assert(nnm.getLength() == 0);
+ Assertion.verify(nnm.getLength() == 0);
nnm = dt.getNotations();
- Assertion.assert(nnm.getLength() == 0);
+ Assertion.verify(nnm.getLength() == 0);
//
// Qualified name without prefix should also work.
@@ -649,35 +649,35 @@
qName = "docName";
dt = impl.createDocumentType(qName, pubId, sysId);
- Assertion.assert(dt != null);
- Assertion.assert(dt.getNodeType() == Node.DOCUMENT_TYPE_NODE);
+ Assertion.verify(dt != null);
+ Assertion.verify(dt.getNodeType() == Node.DOCUMENT_TYPE_NODE);
Assertion.equals(dt.getNodeName(), qName);
- Assertion.assert(dt.getNamespaceURI() == null);
- Assertion.assert(dt.getPrefix() == null);
- Assertion.assert(dt.getLocalName() == null);
+ Assertion.verify(dt.getNamespaceURI() == null);
+ Assertion.verify(dt.getPrefix() == null);
+ Assertion.verify(dt.getLocalName() == null);
Assertion.equals(dt.getPublicId(), pubId);
Assertion.equals(dt.getSystemId(), sysId);
- Assertion.assert(dt.getInternalSubset() == null);
- Assertion.assert(dt.getOwnerDocument() == null);
+ Assertion.verify(dt.getInternalSubset() == null);
+ Assertion.verify(dt.getOwnerDocument() == null);
// Creating a DocumentType with invalid or malformed qName should fail.
- Assertion.assert(DOMExceptionsTest(impl, "createDocumentType",
+ Assertion.verify(DOMExceptionsTest(impl, "createDocumentType",
new Class[]{String.class, String.class, String.class},
new Object[]{"<docName", pubId, sysId},
DOMException.INVALID_CHARACTER_ERR));
- Assertion.assert(DOMExceptionsTest(impl, "createDocumentType",
+ Assertion.verify(DOMExceptionsTest(impl, "createDocumentType",
new Class[]{String.class, String.class, String.class},
new Object[]{":docName", pubId, sysId},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(impl, "createDocumentType",
+ Assertion.verify(DOMExceptionsTest(impl, "createDocumentType",
new Class[]{String.class, String.class, String.class},
new Object[]{"docName:", pubId, sysId},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(impl, "createDocumentType",
+ Assertion.verify(DOMExceptionsTest(impl, "createDocumentType",
new Class[]{String.class, String.class, String.class},
new Object[]{"<doc::Name", pubId, sysId},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(impl, "createDocumentType",
+ Assertion.verify(DOMExceptionsTest(impl, "createDocumentType",
new Class[]{String.class, String.class, String.class},
new Object[]{"<doc:N:ame", pubId, sysId},
DOMException.NAMESPACE_ERR));
@@ -699,29 +699,29 @@
String docNSURI = "http://document.namespace";;
Document doc = impl.createDocument(docNSURI, qName, dt);
- Assertion.assert(dt.getOwnerDocument() == doc);
- Assertion.assert(doc.getOwnerDocument() == null);
+ Assertion.verify(dt.getOwnerDocument() == doc);
+ Assertion.verify(doc.getOwnerDocument() == null);
- Assertion.assert(doc.getNodeType() == Node.DOCUMENT_NODE);
- Assertion.assert(doc.getDoctype() == dt);
+ Assertion.verify(doc.getNodeType() == Node.DOCUMENT_NODE);
+ Assertion.verify(doc.getDoctype() == dt);
Assertion.equals(doc.getNodeName(), "#document");
- Assertion.assert(doc.getNodeValue() == null);
+ Assertion.verify(doc.getNodeValue() == null);
Element el = doc.getDocumentElement();
Assertion.equals(el.getLocalName(), "docName");
Assertion.equals(el.getNamespaceURI(), docNSURI);
Assertion.equals(el.getNodeName(), qName);
- Assertion.assert(el.getOwnerDocument() == doc);
- Assertion.assert(el.getParentNode() == doc);
+ Assertion.verify(el.getOwnerDocument() == doc);
+ Assertion.verify(el.getParentNode() == doc);
Assertion.equals(el.getPrefix(), "foo");
Assertion.equals(el.getTagName(), qName);
- Assertion.assert(el.hasChildNodes() == false);
+ Assertion.verify(el.hasChildNodes() == false);
//
// Creating a second document with the same docType object should fail.
//
- Assertion.assert(DOMExceptionsTest(impl, "createDocument",
+ Assertion.verify(DOMExceptionsTest(impl, "createDocument",
new Class[]{String.class,
String.class,
DocumentType.class},
@@ -770,34 +770,34 @@
Assertion.equals(elb.getNodeName(), "elb");
Assertion.equals(elb.getNamespaceURI(), "http://nsb";);
- Assertion.assert(elb.getPrefix() == null);
+ Assertion.verify(elb.getPrefix() == null);
Assertion.equals(elb.getLocalName(), "elb");
Assertion.equals(elb.getTagName(), "elb");
Assertion.equals(elc.getNodeName(), "elc");
- Assertion.assert(elc.getNamespaceURI() == null);
- Assertion.assert(elc.getPrefix() == null);
+ Assertion.verify(elc.getNamespaceURI() == null);
+ Assertion.verify(elc.getPrefix() == null);
Assertion.equals(elc.getLocalName(), "elc");
Assertion.equals(elc.getTagName(), "elc");
// Badly formed qualified name
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "<a"},
DOMException.INVALID_CHARACTER_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, ":a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "a:"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "a::a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "a:a:a"},
DOMException.NAMESPACE_ERR));
@@ -806,42 +806,42 @@
String xmlURI = "http://www.w3.org/XML/1998/namespace";;
Assertion.equals(doc.createElementNS(xmlURI, "xml:a").getNamespaceURI(),
xmlURI);
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "xml:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"", "xml:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{null, "xml:a"},
DOMException.NAMESPACE_ERR));
//xmlns prefix must be bound to the xmlns namespace
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "xmlns"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{xmlURI, "xmlns"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(doc.createElementNS(null, "noNamespace").getNamespaceURI() ==
null);
+ Assertion.verify(doc.createElementNS(null, "noNamespace").getNamespaceURI() ==
null);
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{null, "xmlns:a"},
DOMException.NAMESPACE_ERR));
//In fact, any prefix != null should have a namespaceURI != null
Assertion.equals(doc.createElementNS("http://nsa";,
"foo:a").getNamespaceURI(), "http://nsa";);
- Assertion.assert(DOMExceptionsTest(doc, "createElementNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createElementNS",
new Class[]{String.class, String.class},
new Object[]{null, "foo:a"},
DOMException.NAMESPACE_ERR));
@@ -867,7 +867,7 @@
elem = doc.createElementNS(xmlURI, "foo:a");
elem.setPrefix("xml");
elem = doc.createElementNS("http://nsa";, "foo:a");
- Assertion.assert(DOMExceptionsTest(elem, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(elem, "setPrefix",
new Class[]{String.class},
new Object[]{"xml"},
DOMException.NAMESPACE_ERR));
@@ -875,13 +875,13 @@
elem.setPrefix("xmlns");
//Also an element can not have a prefix with namespaceURI == null
elem = doc.createElementNS(null, "a");
- Assertion.assert(DOMExceptionsTest(elem, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(elem, "setPrefix",
new Class[]{String.class},
new Object[]{"foo"},
DOMException.NAMESPACE_ERR));
//Only prefix of Element and Attribute can be changed
- Assertion.assert(DOMExceptionsTest(doc, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(doc, "setPrefix",
new Class[]{String.class},
new Object[]{"foo"},
DOMException.NAMESPACE_ERR));
@@ -924,41 +924,41 @@
Assertion.equals(attra.getPrefix(), "a");
Assertion.equals(attra.getLocalName(), "attra");
Assertion.equals(attra.getName(), "a:attra");
- Assertion.assert(attra.getOwnerElement() == null);
+ Assertion.verify(attra.getOwnerElement() == null);
Assertion.equals(attrb.getNodeName(), "attrb");
Assertion.equals(attrb.getNamespaceURI(), "http://nsb";);
Assertion.equals(attrb.getPrefix(), null);
Assertion.equals(attrb.getLocalName(), "attrb");
Assertion.equals(attrb.getName(), "attrb");
- Assertion.assert(attrb.getOwnerElement() == null);
+ Assertion.verify(attrb.getOwnerElement() == null);
Assertion.equals(attrc.getNodeName(), "attrc");
- Assertion.assert(attrc.getNamespaceURI() == null);
- Assertion.assert(attrc.getPrefix() == null);
+ Assertion.verify(attrc.getNamespaceURI() == null);
+ Assertion.verify(attrc.getPrefix() == null);
Assertion.equals(attrc.getLocalName(), "attrc");
Assertion.equals(attrc.getName(), "attrc");
- Assertion.assert(attrc.getOwnerElement() == null);
+ Assertion.verify(attrc.getOwnerElement() == null);
// Badly formed qualified name
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "<a"},
DOMException.INVALID_CHARACTER_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, ":a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "a:"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "a::a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "a:a:a"},
DOMException.NAMESPACE_ERR));
@@ -967,15 +967,15 @@
String xmlURI = "http://www.w3.org/XML/1998/namespace";;
Assertion.equals(doc.createAttributeNS(xmlURI, "xml:a").getNamespaceURI(),
xmlURI);
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "xml:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"", "xml:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{null, "xml:a"},
DOMException.NAMESPACE_ERR));
@@ -983,45 +983,45 @@
//xmlns must have namespaceURI == "http://www.w3.org/2000/xmlns/";
String xmlnsURI = "http://www.w3.org/2000/xmlns/";;
Assertion.equals(doc.createAttributeNS(xmlnsURI,
"xmlns").getNamespaceURI(), xmlnsURI);
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "xmlns"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{xmlURI, "xmlns"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"", "xmlns"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{null, "xmlns"},
DOMException.NAMESPACE_ERR));
//xmlns:a must have namespaceURI == "http://www.w3.org/2000/xmlns/";
Assertion.equals(doc.createAttributeNS(xmlnsURI,
"xmlns:a").getNamespaceURI(), xmlnsURI);
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"http://nsa";, "xmlns:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{xmlURI, "xmlns:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{"", "xmlns:a"},
DOMException.NAMESPACE_ERR));
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{null, "xmlns:a"},
DOMException.NAMESPACE_ERR));
//In fact, any prefix != null should have a namespaceURI != null
Assertion.equals(doc.createAttributeNS("http://nsa";,
"foo:a").getNamespaceURI(), "http://nsa";);
- Assertion.assert(DOMExceptionsTest(doc, "createAttributeNS",
+ Assertion.verify(DOMExceptionsTest(doc, "createAttributeNS",
new Class[]{String.class, String.class},
new Object[]{null, "foo:a"},
DOMException.NAMESPACE_ERR));
@@ -1036,7 +1036,7 @@
Assertion.equals(attr.getName(), "bar:a");
//The spec does not prevent us from setting prefix to a node without prefix
attr = doc.createAttributeNS("http://nsa";, "a");
- Assertion.assert(attr.getPrefix() == null);
+ Assertion.verify(attr.getPrefix() == null);
attr.setPrefix("bar");
Assertion.equals(attr.getNodeName(), "bar:a");
Assertion.equals(attr.getNamespaceURI(), "http://nsa";);
@@ -1047,31 +1047,31 @@
attr = doc.createAttributeNS(xmlURI, "foo:a");
attr.setPrefix("xml");
attr = doc.createAttributeNS("http://nsa";, "foo:a");
- Assertion.assert(DOMExceptionsTest(attr, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(attr, "setPrefix",
new Class[]{String.class},
new Object[]{"xml"},
DOMException.NAMESPACE_ERR));
//Special case for xmlns:a where namespaceURI must be xmlURI
attr = doc.createAttributeNS("http://nsa";, "foo:a");
- Assertion.assert(DOMExceptionsTest(attr, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(attr, "setPrefix",
new Class[]{String.class},
new Object[]{"xmlns"},
DOMException.NAMESPACE_ERR));
//Special case for xmlns where no prefix can be set
attr = doc.createAttributeNS(xmlnsURI, "xmlns");
- Assertion.assert(DOMExceptionsTest(attr, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(attr, "setPrefix",
new Class[]{String.class},
new Object[]{"xml"},
DOMException.NAMESPACE_ERR));
//Also an attribute can not have a prefix with namespaceURI == null
attr = doc.createAttributeNS(null, "a");
- Assertion.assert(DOMExceptionsTest(attr, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(attr, "setPrefix",
new Class[]{String.class},
new Object[]{"foo"},
DOMException.NAMESPACE_ERR));
//Only prefix of Element and Attribute can be changed
- Assertion.assert(DOMExceptionsTest(attr, "setPrefix",
+ Assertion.verify(DOMExceptionsTest(attr, "setPrefix",
new Class[]{String.class},
new Object[]{"foo"},
DOMException.NAMESPACE_ERR));
@@ -1120,60 +1120,60 @@
//
NodeList nl = doc.getElementsByTagName("a:ela");
- Assertion.assert(nl.getLength() == 1);
- Assertion.assert(nl.item(0) == ela);
+ Assertion.verify(nl.getLength() == 1);
+ Assertion.verify(nl.item(0) == ela);
nl = doc.getElementsByTagName("elb");
- Assertion.assert(nl.getLength() == 2);
- Assertion.assert(nl.item(0) == elb);
- Assertion.assert(nl.item(1) == ele);
+ Assertion.verify(nl.getLength() == 2);
+ Assertion.verify(nl.item(0) == elb);
+ Assertion.verify(nl.item(1) == ele);
nl = doc.getElementsByTagName("d:ela");
- Assertion.assert(nl.getLength() == 1);
- Assertion.assert(nl.item(0) == eld);
+ Assertion.verify(nl.getLength() == 1);
+ Assertion.verify(nl.item(0) == eld);
//
// Access with DOM Level 2 getElementsByTagNameNS
//
nl = doc.getElementsByTagNameNS(null, "elc");
- Assertion.assert(nl.getLength() == 1);
- Assertion.assert(nl.item(0) == elc);
+ Assertion.verify(nl.getLength() == 1);
+ Assertion.verify(nl.item(0) == elc);
nl = doc.getElementsByTagNameNS("http://nsa";, "ela");
- Assertion.assert(nl.getLength() == 2);
- Assertion.assert(nl.item(0) == ela);
- Assertion.assert(nl.item(1) == eld);
+ Assertion.verify(nl.getLength() == 2);
+ Assertion.verify(nl.item(0) == ela);
+ Assertion.verify(nl.item(1) == eld);
nl = doc.getElementsByTagNameNS(null, "elb");
- Assertion.assert(nl.getLength() == 0);
+ Assertion.verify(nl.getLength() == 0);
nl = doc.getElementsByTagNameNS("http://nsb";, "elb");
- Assertion.assert(nl.getLength() == 1);
- Assertion.assert(nl.item(0) == elb);
+ Assertion.verify(nl.getLength() == 1);
+ Assertion.verify(nl.item(0) == elb);
nl = doc.getElementsByTagNameNS("*", "elb");
- Assertion.assert(nl.getLength() == 2);
- Assertion.assert(nl.item(0) == elb);
- Assertion.assert(nl.item(1) == ele);
+ Assertion.verify(nl.getLength() == 2);
+ Assertion.verify(nl.item(0) == elb);
+ Assertion.verify(nl.item(1) == ele);
nl = doc.getElementsByTagNameNS("http://nsa";, "*");
- Assertion.assert(nl.getLength() == 2);
- Assertion.assert(nl.item(0) == ela);
- Assertion.assert(nl.item(1) == eld);
+ Assertion.verify(nl.getLength() == 2);
+ Assertion.verify(nl.item(0) == ela);
+ Assertion.verify(nl.item(1) == eld);
nl = doc.getElementsByTagNameNS("*", "*");
- Assertion.assert(nl.getLength() == 6); // Gets the document root
element, plus 5 more
+ Assertion.verify(nl.getLength() == 6); // Gets the document root
element, plus 5 more
- Assertion.assert(nl.item(6) == null);
+ Assertion.verify(nl.item(6) == null);
// Assertion.assert(nl.item(-1) == 0);
nl = rootEl.getElementsByTagNameNS("*", "*");
- Assertion.assert(nl.getLength() == 5);
+ Assertion.verify(nl.getLength() == 5);
nl = doc.getElementsByTagNameNS("http://nsa";, "d:ela");
- Assertion.assert(nl.getLength() == 0);
+ Assertion.verify(nl.getLength() == 0);
//
@@ -1183,16 +1183,16 @@
nl = doc.getElementsByTagNameNS("*", "*");
NodeList nla = ela.getElementsByTagNameNS("*", "*");
- Assertion.assert(nl.getLength() == 6);
- Assertion.assert(nla.getLength() == 0);
+ Assertion.verify(nl.getLength() == 6);
+ Assertion.verify(nla.getLength() == 0);
rootEl.removeChild(elc);
- Assertion.assert(nl.getLength() == 5);
- Assertion.assert(nla.getLength() == 0);
+ Assertion.verify(nl.getLength() == 5);
+ Assertion.verify(nla.getLength() == 0);
ela.appendChild(elc);
- Assertion.assert(nl.getLength() == 6);
- Assertion.assert(nla.getLength() == 1);
+ Assertion.verify(nl.getLength() == 6);
+ Assertion.verify(nla.getLength() == 1);
}
@@ -1235,22 +1235,22 @@
Assertion.equals(attra.getNamespaceURI(), "http://nsa";);
Assertion.equals(attra.getLocalName(), "attra");
Assertion.equals(attra.getName(), "a:attra");
- Assertion.assert(attra.getNodeType() == Node.ATTRIBUTE_NODE);
+ Assertion.verify(attra.getNodeType() == Node.ATTRIBUTE_NODE);
Assertion.equals(attra.getNodeValue(), "");
Assertion.equals(attra.getPrefix(), "a");
- Assertion.assert(attra.getSpecified() == true);
+ Assertion.verify(attra.getSpecified() == true);
Assertion.equals(attra.getValue(), "");
- Assertion.assert(attra.getOwnerElement() == null);
+ Assertion.verify(attra.getOwnerElement() == null);
// Test methods of NamedNodeMap
NamedNodeMap nnm = rootEl.getAttributes();
- Assertion.assert(nnm.getLength() == 4);
- Assertion.assert(nnm.getNamedItemNS("http://nsa";, "attra") == attrd);
- Assertion.assert(nnm.getNamedItemNS("http://nsb";, "attrb") == attrb);
- Assertion.assert(nnm.getNamedItemNS("http://nse";, "attrb") == attre);
- Assertion.assert(nnm.getNamedItemNS(null, "attrc") == attrc);
- Assertion.assert(nnm.getNamedItemNS(null, "attra") == null);
- Assertion.assert(nnm.getNamedItemNS("http://nsa";, "attrb") == null);
+ Assertion.verify(nnm.getLength() == 4);
+ Assertion.verify(nnm.getNamedItemNS("http://nsa";, "attra") == attrd);
+ Assertion.verify(nnm.getNamedItemNS("http://nsb";, "attrb") == attrb);
+ Assertion.verify(nnm.getNamedItemNS("http://nse";, "attrb") == attre);
+ Assertion.verify(nnm.getNamedItemNS(null, "attrc") == attrc);
+ Assertion.verify(nnm.getNamedItemNS(null, "attra") == null);
+ Assertion.verify(nnm.getNamedItemNS("http://nsa";, "attrb") == null);
}
@@ -1264,8 +1264,8 @@
DocumentType dt = impl.createDocumentType("foo", "PubId", "SysId");
Document doc = impl.createDocument(null, "foo", dt);
- Assertion.assert(((NodeImpl) doc).getTextContent() == null);
- Assertion.assert(((NodeImpl) dt).getTextContent() == null);
+ Assertion.verify(((NodeImpl) doc).getTextContent() == null);
+ Assertion.verify(((NodeImpl) dt).getTextContent() == null);
// no-ops:
((NodeImpl) doc).setTextContent("foo");
((NodeImpl) dt).setTextContent("foo");
@@ -1274,7 +1274,7 @@
Assertion.equals(((NodeImpl) el).getTextContent(), "");
el.setTextContent("yo!");
Node t = el.getFirstChild();
- Assertion.assert(t != null && t.getNodeType() == Node.TEXT_NODE &&
+ Assertion.verify(t != null && t.getNodeType() == Node.TEXT_NODE &&
t.getNodeValue().equals("yo!"));
Assertion.equals(el.getTextContent(), "yo!");
@@ -1301,9 +1301,9 @@
}
public void handle(short operation, String key,
Object data, Node src, Node dst) {
- Assertion.assert(operation == UserDataHandler.NODE_CLONED);
- Assertion.assert(key == fKey && data == fData && src == fNode);
- Assertion.assert(dst != null &&
+ Assertion.verify(operation == UserDataHandler.NODE_CLONED);
+ Assertion.verify(key == fKey && data == fData && src == fNode);
+ Assertion.verify(dst != null &&
dst.getNodeType() == fNode.getNodeType());
fCalled = true;
}
@@ -1311,26 +1311,26 @@
el.setUserData("mykey", c, null);
el.setUserData("mykey2", el2, null);
- Assertion.assert(el.getUserData("mykey") == c);
- Assertion.assert(el.getUserData("mykey2") == el2);
+ Assertion.verify(el.getUserData("mykey") == c);
+ Assertion.verify(el.getUserData("mykey2") == el2);
el.setUserData("mykey", null, null);
- Assertion.assert(el.getUserData("mykey") == null);
+ Assertion.verify(el.getUserData("mykey") == null);
el.setUserData("mykey2", null, null);
- Assertion.assert(el.getUserData("mykey2") == null);
+ Assertion.verify(el.getUserData("mykey2") == null);
MyHandler h = new MyHandler("mykey", c, el);
el.setUserData("mykey", c, h);
MyHandler h2 = new MyHandler("mykey2", el2, el);
el.setUserData("mykey2", el2, h2);
Node cl = el.cloneNode(false);
- Assertion.assert(h.fCalled == true);
- Assertion.assert(h2.fCalled == true);
+ Assertion.verify(h.fCalled == true);
+ Assertion.verify(h2.fCalled == true);
el.setTextContent("zapped!");
Node t2 = el.getFirstChild();
- Assertion.assert(t2.getNodeValue().equals("zapped!"));
- Assertion.assert(t2.getNextSibling() == null);
+ Assertion.verify(t2.getNodeValue().equals("zapped!"));
+ Assertion.verify(t2.getNextSibling() == null);
}
@@ -1351,17 +1351,17 @@
NodeImpl n2 = (NodeImpl) doc.createElement("el");
n2.setTextContent("yo!");
- Assertion.assert(n1.isEqualNode(n2) == true);
+ Assertion.verify(n1.isEqualNode(n2) == true);
n2.setTextContent("yoyo!");
- Assertion.assert(n1.isEqualNode(n2) == false);
+ Assertion.verify(n1.isEqualNode(n2) == false);
n1.setTextContent("yoyo!");
((Element) n1).setAttribute("a1", "v1");
((Element) n1).setAttributeNS("uri", "a2", "v2");
((Element) n2).setAttribute("a1", "v1");
((Element) n2).setAttributeNS("uri", "a2", "v2");
- Assertion.assert(n1.isEqualNode(n2) == true);
+ Assertion.verify(n1.isEqualNode(n2) == true);
Element elem = doc.createElementNS(null, "e2");
root.appendChild(elem);
@@ -1371,23 +1371,23 @@
// check that setAttribute sets both name and value
elem.setAttributeNS("http://attr","p:attr1","v2";);
Attr attr2 = elem.getAttributeNodeNS("http://attr";, "attr1");
- Assertion.assert(attr2.getNodeName().equals("p:attr1"), "p:attr1");
- Assertion.assert(attr2.getNodeValue().equals("v2"), "value v2");
+ Assertion.verify(attr2.getNodeName().equals("p:attr1"), "p:attr1");
+ Assertion.verify(attr2.getNodeValue().equals("v2"), "value v2");
// check that prefix is not null
elem.setAttributeNS("http://attr","attr1","v2";);
attr2 = elem.getAttributeNodeNS("http://attr";, "attr1");
- Assertion.assert(attr2.getNodeName().equals("attr1"), "attr1");
+ Assertion.verify(attr2.getNodeName().equals("attr1"), "attr1");
((Element) n2).setAttribute("a1", "v2");
- Assertion.assert(n1.isEqualNode(n2) == false);
+ Assertion.verify(n1.isEqualNode(n2) == false);
root.appendChild(n1);
root.appendChild(n2);
NodeImpl clone = (NodeImpl) root.cloneNode(true);
- Assertion.assert(clone.isEqualNode(root) == true);
+ Assertion.verify(clone.isEqualNode(root) == true);
}
1.7 +4 -4 xml-xerces/java/tests/dom/registry/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/registry/Test.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Test.java 20 Mar 2003 00:39:27 -0000 1.6
+++ Test.java 24 Mar 2003 20:11:05 -0000 1.7
@@ -79,7 +79,7 @@
DOMImplementationRegistry registry = null;
try {
registry = DOMImplementationRegistry.newInstance();
- Assertion.assert(registry != null);
+ Assertion.verify(registry != null);
} catch (Exception e) {
e.printStackTrace();
}
@@ -87,7 +87,7 @@
try {
DOMImplementation i = registry.getDOMImplementation("XML");
- Assertion.assert(i ==
+ Assertion.verify(i ==
CoreDOMImplementationImpl.getDOMImplementation());
} catch (Exception e) {
@@ -98,7 +98,7 @@
DOMImplementation i =
registry.getDOMImplementation("XML MutationEvents");
- Assertion.assert(i ==
+ Assertion.verify(i ==
DOMImplementationImpl.getDOMImplementation());
} catch (Exception e) {
1.2 +36 -36 xml-xerces/java/tests/dom/rename/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/rename/Test.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Test.java 20 Jun 2002 01:29:51 -0000 1.1
+++ Test.java 24 Mar 2003 20:11:06 -0000 1.2
@@ -127,14 +127,14 @@
// getting the first "email" element
NodeList elements = doc.getElementsByTagName("email");
Element child = (Element) elements.item(0);
- Assertion.assert(child != null);
+ Assertion.verify(child != null);
Assertion.equals(child.getNodeName(), "email");
// default must be there
Attr at = child.getAttributeNode("defaultEmailAttr");
- Assertion.assert(at != null);
+ Assertion.verify(at != null);
Assertion.equals(at.getValue(), "defaultEmailValue");
- Assertion.assert(at.getSpecified() == false);
+ Assertion.verify(at.getSpecified() == false);
// attach some data
child.setUserData("mydata", "yo", this);
@@ -144,27 +144,27 @@
Element newChild = (Element) doc.renameNode(child, null, "url");
Assertion.equals(newChild.getNodeName(), "url");
- Assertion.assert(newChild.getNamespaceURI() == null);
+ Assertion.verify(newChild.getNamespaceURI() == null);
// old default must no longer be there
- Assertion.assert(newChild.hasAttribute("defaultEmailAttr") == false);
- Assertion.assert(at.getSpecified() == true);
+ Assertion.verify(newChild.hasAttribute("defaultEmailAttr") == false);
+ Assertion.verify(at.getSpecified() == true);
// new default must be there
at = newChild.getAttributeNode("defaultUrlAttr");
- Assertion.assert(at != null);
+ Assertion.verify(at != null);
Assertion.equals(at.getValue(), "defaultUrlValue");
- Assertion.assert(at.getSpecified() == false);
+ Assertion.verify(at.getSpecified() == false);
// data must still be there
Assertion.equals((String) newChild.getUserData("mydata"), "yo");
// and handler must have been called if new node was created
if (newChild != child) {
- Assertion.assert(lastOperation == UserDataHandler.NODE_RENAMED);
- Assertion.assert(lastKey == "mydata");
+ Assertion.verify(lastOperation == UserDataHandler.NODE_RENAMED);
+ Assertion.verify(lastKey == "mydata");
Assertion.equals((String) lastData, "yo");
- Assertion.assert(lastSource == child);
- Assertion.assert(lastDestination == newChild);
+ Assertion.verify(lastSource == child);
+ Assertion.verify(lastDestination == newChild);
resetHandlerData();
}
@@ -173,29 +173,29 @@
Assertion.equals(newChild2.getNodeName(), "foo");
Assertion.equals(newChild2.getNamespaceURI(), "ns1");
- Assertion.assert(newChild2.hasAttribute("defaultUrlAttr") == false);
+ Assertion.verify(newChild2.hasAttribute("defaultUrlAttr") == false);
// data must still be there
Assertion.equals((String) newChild2.getUserData("mydata"), "yo");
// and handler must have been called if new node was created
if (newChild2 != newChild) {
- Assertion.assert(lastOperation == UserDataHandler.NODE_RENAMED);
- Assertion.assert(lastKey == "mydata");
+ Assertion.verify(lastOperation == UserDataHandler.NODE_RENAMED);
+ Assertion.verify(lastKey == "mydata");
Assertion.equals((String) lastData, "yo");
- Assertion.assert(lastSource == newChild);
- Assertion.assert(lastDestination == newChild2);
+ Assertion.verify(lastSource == newChild);
+ Assertion.verify(lastDestination == newChild2);
resetHandlerData();
}
// getting the second "email" element
child = (Element) elements.item(1);
- Assertion.assert(child != null);
+ Assertion.verify(child != null);
Assertion.equals(child.getNodeName(), "email");
// default must be there
at = child.getAttributeNode("defaultEmailAttr");
- Assertion.assert(at != null);
+ Assertion.verify(at != null);
Assertion.equals(at.getValue(), "defaultEmailValue");
- Assertion.assert(at.getSpecified() == false);
+ Assertion.verify(at.getSpecified() == false);
// attach some data
at.setUserData("mydata", "yo", this);
@@ -203,43 +203,43 @@
// renaming an attribute without a url
Attr newAt = (Attr) doc.renameNode(at, null, "foo");
- Assertion.assert(newAt != null);
+ Assertion.verify(newAt != null);
Assertion.equals(newAt.getNodeName(), "foo");
Assertion.equals(newAt.getNamespaceURI(), null);
Assertion.equals(newAt.getValue(), "defaultEmailValue");
- Assertion.assert(newAt.getSpecified() == true);
- Assertion.assert(child.hasAttribute("foo") == true);
+ Assertion.verify(newAt.getSpecified() == true);
+ Assertion.verify(child.hasAttribute("foo") == true);
// default must be back
- Assertion.assert(child.hasAttribute("defaultEmailAttr") == true);
+ Assertion.verify(child.hasAttribute("defaultEmailAttr") == true);
// data must still be there
Assertion.equals((String) newAt.getUserData("mydata"), "yo");
// and handler must have been called if new node was created
if (newAt != at) {
- Assertion.assert(lastOperation == UserDataHandler.NODE_RENAMED);
- Assertion.assert(lastKey == "mydata");
+ Assertion.verify(lastOperation == UserDataHandler.NODE_RENAMED);
+ Assertion.verify(lastKey == "mydata");
Assertion.equals((String) lastData, "yo");
- Assertion.assert(lastSource == at);
- Assertion.assert(lastDestination == newAt);
+ Assertion.verify(lastSource == at);
+ Assertion.verify(lastDestination == newAt);
resetHandlerData();
}
// renaming an attribute with a url
Attr newAt2 = (Attr) doc.renameNode(newAt, "ns1", "bar");
- Assertion.assert(newAt2 != null);
+ Assertion.verify(newAt2 != null);
Assertion.equals(newAt2.getNodeName(), "bar");
Assertion.equals(newAt2.getNamespaceURI(), "ns1");
Assertion.equals(newAt2.getValue(), "defaultEmailValue");
- Assertion.assert(newAt2.getSpecified() == true);
- Assertion.assert(child.hasAttributeNS("ns1", "bar") == true);
+ Assertion.verify(newAt2.getSpecified() == true);
+ Assertion.verify(child.hasAttributeNS("ns1", "bar") == true);
// data must still be there
Assertion.equals((String) newAt2.getUserData("mydata"), "yo");
// and handler must have been called if new node was created
if (newAt2 != newAt) {
- Assertion.assert(lastOperation == UserDataHandler.NODE_RENAMED);
- Assertion.assert(lastKey == "mydata");
+ Assertion.verify(lastOperation == UserDataHandler.NODE_RENAMED);
+ Assertion.verify(lastKey == "mydata");
Assertion.equals((String) lastData, "yo");
- Assertion.assert(lastSource == newAt);
- Assertion.assert(lastDestination == newAt2);
+ Assertion.verify(lastSource == newAt);
+ Assertion.verify(lastDestination == newAt2);
resetHandlerData();
}
1.3 +5 -5 xml-xerces/java/tests/dom/util/Assertion.java
Index: Assertion.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/dom/util/Assertion.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Assertion.java 31 Mar 2000 02:32:34 -0000 1.2
+++ Assertion.java 24 Mar 2003 20:11:06 -0000 1.3
@@ -68,11 +68,11 @@
public class Assertion {
- public static boolean assert(boolean result) {
- return assert(result, null);
+ public static boolean verify(boolean result) {
+ return verify(result, null);
}
- public static boolean assert(boolean result, String error) {
+ public static boolean verify(boolean result, String error) {
if (!result) {
System.err.print("Assertion failed: ");
if (error != null) {
@@ -88,7 +88,7 @@
boolean result = ((s1 != null && s1.equals(s2))
|| (s1 == null && s2 == null));
if (!result) {
- assert(result);
+ verify(result);
System.err.println(" was: equals(" + s1 + ", \"" + s2 + "\")");
}
return result;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
