elena 2003/03/19 16:39:27
Modified: java/tests/dom/dom3 Test.java
java/tests/dom/ids Test.java
java/tests/dom/registry Test.java
Log:
Modified the DOM L3 tests according to the latest DOM L3 draft:
http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/
Revision Changes Path
1.8 +18 -21 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Test.java 10 Feb 2003 19:14:34 -0000 1.7
+++ Test.java 20 Mar 2003 00:39:27 -0000 1.8
@@ -67,7 +67,7 @@
import org.apache.xerces.dom3.DOMConfiguration;
import org.apache.xerces.dom3.DOMError;
import org.apache.xerces.dom3.DOMErrorHandler;
-import org.apache.xerces.dom3.DOMImplementationRegistry;
+import org.apache.xerces.dom3.bootstrap.DOMImplementationRegistry;
import org.apache.xerces.dom3.DOMLocator;
import org.apache.xerces.xni.psvi.ElementPSVI;
import org.w3c.dom.Attr;
@@ -116,11 +116,11 @@
config.setParameter("validate",Boolean.FALSE);
//----------------------------
- // TEST: lookupNamespacePrefix
+ // TEST: lookupPrefix
// isDefaultNamespace
// lookupNamespaceURI
//----------------------------
- //System.out.println("TEST #1: lookupNamespacePrefix,
isDefaultNamespace, lookupNamespaceURI, input: tests/dom/dom3/input.xml");
+ //System.out.println("TEST #1: lookupPrefix, isDefaultNamespace,
lookupNamespaceURI, input: tests/dom/dom3/input.xml");
{
Document doc = builder.parseURI("tests/dom/dom3/input.xml");
@@ -128,10 +128,9 @@
NodeImpl elem = (NodeImpl)ls.item(0);
if (namespaces) {
-
//System.out.println("[a:elem_a].lookupNamespacePrefix('http://www.example.com', true)
== null");
- Assertion.assert(elem.lookupNamespacePrefix(
-
"http://www.example.com";, true) == null,
-
"[a:elem_a].lookupNamespacePrefix(http://www.example.com)==null");
+
//System.out.println("[a:elem_a].lookupPrefix('http://www.example.com', true) ==
null");
+
Assertion.assert(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");
@@ -139,25 +138,23 @@
"[a:elem_a].isDefaultNamespace(http://www.example.com)==true");
-
//System.out.println("[a:elem_a].lookupNamespacePrefix('http://www.example.com',
false) == ns1");
- Assertion.assert(elem.lookupNamespacePrefix(
-
"http://www.example.com";, false).equals("ns1"),
-
"[a:elem_a].lookupNamespacePrefix(http://www.example.com)==ns1");
+
//System.out.println("[a:elem_a].lookupPrefix('http://www.example.com', false) ==
ns1");
+
Assertion.assert(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";),
"[a:elem_a].lookupNamespaceURI('xsi') ==
'http://www.w3.org/2001/XMLSchema-instance'" );
} else {
- Assertion.assert( elem.lookupNamespacePrefix(
-
"http://www.example.com";, false) ==
null,"lookupNamespacePrefix(http://www.example.com)==null");
+ Assertion.assert( 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.lookupNamespacePrefix("url1:",false).equals("foo"),
- "[bar:leaf].lookupNamespacePrefix('url1:', false)
== foo");
- //System.out.println("[bar:leaf].lookupNamespacePrefix('url1:',
false) == "+ );
+ Assertion.assert(elem.lookupPrefix("url1:").equals("foo"),
+ "[bar:leaf].lookupPrefix('url1:', false) == foo");
+ //System.out.println("[bar:leaf].lookupPrefix('url1:', false) == "+
);
//System.out.println("==>Create b:baz with namespace 'b:' and
xmlns:x='b:'");
ls = doc.getElementsByTagName("baz");
@@ -169,12 +166,12 @@
elem.appendChild(e1);
-
Assertion.assert(((NodeImpl)e1).lookupNamespacePrefix("b:",false).equals("p"),
- "[p:baz].lookupNamespacePrefix('b:', false) == p");
+ Assertion.assert(((NodeImpl)e1).lookupPrefix("b:").equals("p"),
+ "[p:baz].lookupPrefix('b:', false) == p");
- //System.out.println("[p:baz].lookupNamespacePrefix('b:', false) ==
"+ ((NodeImpl)e1).lookupNamespacePrefix("b:",false));
+ //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";),
"[bar:leaf].lookupNamespaceURI('xsi') ==
'http://www.w3.org/2001/XMLSchema-instance'" );
@@ -650,11 +647,11 @@
fError.append(locator.getColumnNumber());
fError.append(":");
fError.append(locator.getOffset());
- Node node = locator.getErrorNode();
+ Node node = locator.getRelatedNode();
if (node != null) {
fError.append("[");
- fError.append(locator.getErrorNode().getNodeName());
+ fError.append(locator.getRelatedNode().getNodeName());
fError.append("]");
}
String systemId = locator.getUri();
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Test.java 31 Dec 2002 01:37:38 -0000 1.6
+++ Test.java 20 Mar 2003 00:39:27 -0000 1.7
@@ -184,13 +184,13 @@
elem = doc.getElementById("eb0009");
Assertion.assert(elem !=null, "elem by id 'eb0009'");
AttrImpl attr = (AttrImpl)person.getAttributeNode("idAttr");
- Assertion.assert(attr.getIsId(), "attribute is id");
+ Assertion.assert(attr.isId(), "attribute is id");
person.setIdAttribute("idAttr", false);
elem = doc.getElementById("eb0009");
Assertion.assert(elem ==null, "element with id 'eb0009 removed'");
- Assertion.assert(!attr.getIsId(), "attribute is not id");
+ Assertion.assert(!attr.isId(), "attribute is not id");
System.out.println("done.");
1.6 +2 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Test.java 26 Aug 2002 22:03:09 -0000 1.5
+++ Test.java 20 Mar 2003 00:39:27 -0000 1.6
@@ -59,7 +59,7 @@
package dom.registry;
import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.DOMImplementationRegistry;
+import org.w3c.dom.bootstrap.DOMImplementationRegistry;
import org.apache.xerces.dom.CoreDOMImplementationImpl;
import org.apache.xerces.dom.DOMImplementationImpl;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
