Index: java/org/w3c/domts/DOMTest.java
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/java/org/w3c/domts/DOMTest.java,v
retrieving revision 1.10
diff -u -r1.10 DOMTest.java
--- java/org/w3c/domts/DOMTest.java 19 Dec 2003 22:21:04 -0000 1.10
+++ java/org/w3c/domts/DOMTest.java 30 Dec 2003 05:52:42 -0000
@@ -46,6 +46,8 @@
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
+import java.io.File;
+import java.lang.reflect.*;
/**
* This is an abstract base class for generated DOM tests
@@ -151,27 +153,56 @@
return resolvedURI;
}
- public String getResourceURI(String href) throws DOMTestLoadException {
- return resolveURI(href).toString();
- }
-
- public String createTempFileURI() throws DOMTestLoadException {
- try {
- return java
- .io
- .File
- .createTempFile("domts", ".xml")
- .toURL()
- .toExternalForm();
- } catch (IOException ex) {
- throw new DOMTestLoadException(ex);
+ public String getResourceURI(String href, String scheme) throws DOMTestLoadException {
+ if (scheme == null) {
+ throw new NullPointerException("scheme");
+ }
+ if ("file".equals(scheme)) {
+ return resolveURI(href).toString();
+ }
+ if ("http".equals(scheme)) {
+ String httpBase = System.getProperty("org.w3c.domts.httpbase",
+ "http://localhost:8080/webdav/");
+ return httpBase + href;
+ }
+ throw new DOMTestLoadException(new Exception("Unrecognized URI scheme " + scheme));
+ }
+
+ public String createTempURI(String scheme) throws DOMTestLoadException {
+ if (scheme == null) {
+ throw new NullPointerException("scheme");
}
- }
-
- public String createTempHttpURI() throws DOMTestLoadException {
- return "http://localhost:8080/domts/temp/"
- + Integer.toString(new java.util.Random().nextInt())
- + ".xml";
+ if ("file".equals(scheme)) {
+ try {
+ File tempFile = File.createTempFile("domts", ".xml");
+ try {
+ //
+ // if available use JDK 1.4's File.toURI().toString()
+ //
+ Method method = File.class.getMethod("toURI", null);
+ Object uri = method.invoke(tempFile, null);
+ return uri.toString();
+ } catch (NoSuchMethodException ex) {
+ //
+ // File.toURL is not as robust
+ //
+ URL url = tempFile.toURL();
+ return url.toString();
+ }
+ } catch (Exception ex) {
+ throw new DOMTestLoadException(ex);
+ }
+ }
+ if ("http".equals(scheme)) {
+ String httpBase = System.getProperty("org.w3c.domts.httpbase",
+ "http://localhost:8080/webdav/");
+ java.lang.StringBuffer buf = new StringBuffer(httpBase);
+ buf.append("/tmp");
+ buf.append((new java.util.Random()).nextInt(Integer.MAX_VALUE));
+ buf.append(".xml");
+ return buf.toString();
+ }
+ throw new DOMTestLoadException(new Exception("Unrecognized URI scheme " + scheme));
}
public Document load(String docURI, boolean willBeModified)
Index: tests/level3/ls/DOMBuilderTest5.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMBuilderTest5.xml,v
retrieving revision 1.7
diff -u -r1.7 DOMBuilderTest5.xml
--- tests/level3/ls/DOMBuilderTest5.xml 18 Dec 2003 21:05:46 -0000 1.7
+++ tests/level3/ls/DOMBuilderTest5.xml 30 Dec 2003 05:52:42 -0000
@@ -35,13 +35,12 @@
+
- &errorHandlerVars;
-
- &assignErrorHandlerVars;
-
+
+
@@ -52,14 +51,23 @@
-
-
+
+
+
+
+
+
-
-
+
+
+
+
Index: tests/level3/ls/DOMBuilderTest7.xml
===================================================================
RCS file: tests/level3/ls/DOMBuilderTest7.xml
diff -N tests/level3/ls/DOMBuilderTest7.xml
--- tests/level3/ls/DOMBuilderTest7.xml 18 Dec 2003 21:05:46 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
- DOMBuilderTest7
- Curt Arnold
- Parses from an null LSInput.
- 2003-12-08
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: tests/level3/ls/DOMImplementationLSTest1.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMImplementationLSTest1.xml,v
retrieving revision 1.3
diff -u -r1.3 DOMImplementationLSTest1.xml
--- tests/level3/ls/DOMImplementationLSTest1.xml 9 Dec 2003 08:22:27 -0000 1.3
+++ tests/level3/ls/DOMImplementationLSTest1.xml 30 Dec 2003 05:52:42 -0000
@@ -27,8 +27,7 @@
&contributor; &date;
-
-
+
Index: tests/level3/ls/DOMInputSourceTest5.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMInputSourceTest5.xml,v
retrieving revision 1.6
diff -u -r1.6 DOMInputSourceTest5.xml
--- tests/level3/ls/DOMInputSourceTest5.xml 8 Dec 2003 07:50:50 -0000 1.6
+++ tests/level3/ls/DOMInputSourceTest5.xml 30 Dec 2003 05:52:42 -0000
@@ -22,7 +22,8 @@
DOMInputSourceTest5
&creator;
- Tests behaviour of the baseURI of DOMInput
+ Parses a document containing an external entity and checks
+ that resource resolver is passed the baseURI value specified on LSInput.
&contributor; &date;
@@ -32,35 +33,52 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
-
+
+
&vars;
&init;
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
Index: tests/level3/ls/DOMInputSourceTest6.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMInputSourceTest6.xml,v
retrieving revision 1.1
diff -u -r1.1 DOMInputSourceTest6.xml
--- tests/level3/ls/DOMInputSourceTest6.xml 18 Dec 2003 21:05:46 -0000 1.1
+++ tests/level3/ls/DOMInputSourceTest6.xml 30 Dec 2003 05:52:42 -0000
@@ -39,9 +39,10 @@
-
+
+
Index: tests/level3/ls/DOMWriterFilterTest1.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/ls/DOMWriterFilterTest1.xml,v
retrieving revision 1.5
diff -u -r1.5 DOMWriterFilterTest1.xml
--- tests/level3/ls/DOMWriterFilterTest1.xml 8 Dec 2003 07:50:50 -0000 1.5
+++ tests/level3/ls/DOMWriterFilterTest1.xml 30 Dec 2003 05:52:42 -0000
@@ -22,7 +22,7 @@
DOMWriterFilterTest1
&creator;
- Uses a serializer filter to eliminate attributes, parses the output and checks if the attribute is there.
+ Uses a serializer filter to eliminate attributes, parses the output and checks if the attribute is not there.
&contributor; &date;
@@ -53,7 +53,7 @@
-
+
&vars;
&init;
@@ -76,11 +76,10 @@
-
+