added support for easily using w3c testsuite for build target test

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194335 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index e7ae15fa4d5a276c00aa2a2b1abde48ce69e668c..d043f57a71c2922243fb5e82a3ffb0f9bc5bc995 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -572,8 +572,22 @@ Sometimes ant gives out this warnings, but the build is finished without any pro
 
   <target name="test" depends="package">
     <echo message="Testing build in jar file ${build.dir}/${name}.jar against reference"/>
-    <runTest testSuite="basictests.xml" basedir="test/" reference="reference/fop.jar"
+    <runTest testSuite="basictests.xml" basedir="test/" reference="test/reference/fop.jar"
          refVersion="FOP 0.19.0-CVS"/>
+    <runTest testSuite="bugtests.xml" basedir="test/" reference="test/reference/fop.jar"
+         refVersion="FOP 0.19.0-CVS"/>
+<!--
+    <runTest testSuite="testsuite.xml" basedir="TestSuite/NIST/" reference="test/reference/fop.jar"
+         refVersion="FOP 0.19.0-CVS"/>
+    <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/IBM/" reference="test/reference/fop.jar"
+         refVersion="FOP 0.19.0-CVS"/>
+    <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/FOP/" reference="test/reference/fop.jar"
+         refVersion="FOP 0.19.0-CVS"/>
+    <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/XEP/" reference="test/reference/fop.jar"
+         refVersion="FOP 0.19.0-CVS"/>
+    <runTest testSuite="testsuite.xml" basedir="TestSuite/contrib/XSLFormatter/" reference="test/reference/fop.jar"
+         refVersion="FOP 0.19.0-CVS"/>
+-->
   </target>
 
   <target name="all" depends="package"/> <!-- "all" target for us Makefile converts ;-) -->

diff --git a/docs/xml-docs/fop/testing.xml b/docs/xml-docs/fop/testing.xml
index 34e27f581733c4ffb036ccf8919b6faf32a5078b..a8a24c25885bace868be7e4876476f6e5ee5ed0e 100644 (file)
--- a/docs/xml-docs/fop/testing.xml
+++ b/docs/xml-docs/fop/testing.xml
@@ -20,6 +20,16 @@ loaded to create the reference output.
     </p>
   </s2>
 
+  <s2 title="W3C TestSuite">
+    <p>
+The testing is set up so that you can download the testsuite from
+<jump href="http://www.w3.org/Style/XSL/TestSuite/">http://www.w3.org/Style/XSL/TestSuite/</jump>,
+unzip the file into the base directory of FOP.
+Then you can uncomment the lines in the build.xml file in the test target and it
+will run through all the tests in the testsuite distribution.
+    </p>
+  </s2>
+
   <s2 title="Writing a Test">
     <p>
 A test belongs to one of a few catagories. A basic test should excercise one

diff --git a/lib/buildtools.jar b/lib/buildtools.jar
index 895c2793d46c0754c60832d97cf1c99c48a6b653..dcb5478bf99792f960b04115591384844d0fed2b 100644 (file)
Binary files a/lib/buildtools.jar and b/lib/buildtools.jar differ

diff --git a/src/org/apache/fop/tools/anttasks/RunTest.java b/src/org/apache/fop/tools/anttasks/RunTest.java
index 1693aa669b9a4f7cfe7cc4f60563b4ff81a7825d..0cb25f62717fadfe515374d829ab370728c2c341 100644 (file)
--- a/src/org/apache/fop/tools/anttasks/RunTest.java
+++ b/src/org/apache/fop/tools/anttasks/RunTest.java
@@ -114,7 +114,7 @@ public class RunTest extends Task {
         //} else {
         try {
             ClassLoader loader = new URLClassLoader(
-                                   new URL[]{new URL("file:" + basedir + referenceJar)});
+                                   new URL[]{new URL("file:" + referenceJar)});
             boolean failed = false;
 
             try {