elena 2003/11/13 14:49:35
Modified: java/tests/dom/dom3 Test.java
java/tests/thread Test.java
Log:
Fix tests according to the DOM Level 3 Core CR. Patches from Neil Delima.
Revision Changes Path
1.12 +6 -6 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Test.java 11 Nov 2003 20:15:02 -0000 1.11
+++ Test.java 13 Nov 2003 22:49:35 -0000 1.12
@@ -214,7 +214,7 @@
root.insertBefore(newElem, testElem);
root.appendChild(core.createElementNS("UndefinedNamespace",
"NS1:foo"));
- config = core.getConfig();
+ config = core.getDomConfig();
config.setParameter("error-handler",errorHandler);
config.setParameter("validate", Boolean.TRUE);
core.normalizeDocument();
@@ -265,7 +265,7 @@
testElem.removeAttributeNode(testElem.getAttributeNodeNS(null,
"contr"));
NamedNodeMap map = testElem.getAttributes();
- config = core.getConfig();
+ config = core.getDomConfig();
errorCounter = 0;
config.setParameter("psvi", Boolean.TRUE);
config.setParameter("error-handler",errorHandler);
@@ -569,7 +569,7 @@
errorCounter = 0;
config = builder.getConfig();
config.setParameter("error-handler",errorHandler);
- config.setParameter("entity-resolver",resolver);
+ config.setParameter("resource-resolver",resolver);
config.setParameter("validate", Boolean.TRUE);
config.setParameter("psvi", Boolean.TRUE);
@@ -604,11 +604,11 @@
Element root = core2.getDocumentElement();
root.removeAttributeNS("http://www.w3.org/2001/XMLSchema";, "xsi");
root.removeAttributeNS("http://www.w3.org/2001/XMLSchema";,
"noNamespaceSchemaLocation");
- config = core2.getConfig();
+ config = core2.getDomConfig();
config.setParameter("error-handler",errorHandler);
config.setParameter("schema-type",
"http://www.w3.org/2001/XMLSchema";);
config.setParameter("schema-location","personal.xsd");
- config.setParameter("entity-resolver",resolver);
+ config.setParameter("resource-resolver",resolver);
config.setParameter("validate", Boolean.TRUE);
core2.normalizeDocument();
Assertion.verify(errorCounter == 1, "1 error should be reported:
"+errorCounter);
@@ -646,7 +646,7 @@
fError.append(":");
fError.append(locator.getColumnNumber());
fError.append(":");
- fError.append(locator.getOffset());
+ fError.append(locator.getByteOffset());
Node node = locator.getRelatedNode();
if (node != null) {
1.3 +2 -2 xml-xerces/java/tests/thread/Test.java
Index: Test.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/tests/thread/Test.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Test.java 8 Jan 2003 21:43:06 -0000 1.2
+++ Test.java 13 Nov 2003 22:49:35 -0000 1.3
@@ -261,7 +261,7 @@
Document doc = fDOMParser.getDocument();
domCheckSum(doc);
CoreDocumentImpl core = (CoreDocumentImpl) doc;
- DOMConfiguration config = core.getConfig();
+ DOMConfiguration config = core.getDomConfig();
config.setParameter("validate", Boolean.TRUE);
core.normalizeDocument();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
