aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build.xml16
-rw-r--r--docs/xml-docs/fop/testing.xml10
-rw-r--r--lib/buildtools.jarbin42598 -> 42065 bytes
-rw-r--r--src/org/apache/fop/tools/anttasks/RunTest.java2
4 files changed, 26 insertions, 2 deletions
diff --git a/build.xml b/build.xml
index e7ae15fa4..d043f57a7 100644
--- 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 34e27f581..a8a24c258 100644
--- 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 895c2793d..dcb5478bf 100644
--- a/lib/buildtools.jar
+++ b/lib/buildtools.jar
Binary files differ
diff --git a/src/org/apache/fop/tools/anttasks/RunTest.java b/src/org/apache/fop/tools/anttasks/RunTest.java
index 1693aa669..0cb25f627 100644
--- 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 {