Author: bckfnn
Date: Mon Sep 12 02:08:52 2005
New Revision: 280298
URL: http://svn.apache.org/viewcvs?rev=280298&view=rev
Log:
Enabled fotree junit tests.
Added:
xmlgraphics/fop/trunk/test/fotree/disabled-testcases.txt (with props)
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
Modified: xmlgraphics/fop/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/build.xml?rev=280298&r1=280297&r2=280298&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Mon Sep 12 02:08:52 2005
@@ -188,6 +188,7 @@
<property name="build.property.examples.mime.type" value="application/pdf"/>
<property name="layoutengine.disabled"
value="test/layoutengine/disabled-testcases.txt"/>
+ <property name="fotree.disabled" value="test/fotree/disabled-testcases.txt"/>
<property name="dist.bin.dir" value="${basedir}/dist-bin"/>
<property name="dist.src.dir" value="${basedir}/dist-src"/>
@@ -579,7 +580,7 @@
<!-- =================================================================== -->
<!-- Testing -->
<!-- =================================================================== -->
- <target name="junit" depends="package, transcoder-pkg" description="Runs
FOP's JUnit tests" if="junit.present">
+ <target name="junit-compile" depends="package, transcoder-pkg"
description="Runs FOP's JUnit tests" if="junit.present">
<mkdir dir="${build.dir}/test-classes"/>
<javac destdir="${build.dir}/test-classes" fork="javac.fork"
debug="${javac.debug}" deprecation="${javac.deprecation}"
@@ -593,6 +594,9 @@
</fileset>
</classpath>
</javac>
+ </target>
+
+ <target name="junit" depends="junit-compile" description="Runs FOP's JUnit
tests" if="junit.present">
<echo message="Running basic functionality tests for fop-transcoder.jar"/>
<mkdir dir="${build.dir}/test-reports/fop-transcoder"/>
<junit haltonerror="yes" fork="${junit.fork}">
@@ -678,6 +682,28 @@
<batchtest todir="${build.dir}/test-reports/fop">
<fileset dir="${build.dir}/test-classes">
<include
name="org/apache/fop/layoutengine/LayoutEngineTestSuite.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="junit-fotree" depends="junit-compile" description="Runs FOP's
FO tree JUnit tests" if="junit.present">
+ <echo message="Running fo tree tests"/>
+ <junit haltonerror="yes" fork="${junit.fork}">
+ <sysproperty key="basedir" value="${basedir}"/>
+ <sysproperty key="jawa.awt.headless" value="true"/>
+ <sysproperty key="fop.layoutengine.disabled" value="${fotree.disabled}"/>
+ <formatter type="brief" usefile="false"/>
+ <classpath>
+ <pathelement location="${build.dir}/test-classes"/>
+ <path refid="libs-build-classpath"/>
+ <fileset dir="build">
+ <include name="fop.jar"/>
+ </fileset>
+ </classpath>
+ <batchtest todir="${build.dir}/test-reports/fop">
+ <fileset dir="${build.dir}/test-classes">
+ <include name="org/apache/fop/fotreetest/FOTreeTestSuite.class"/>
</fileset>
</batchtest>
</junit>
Added: xmlgraphics/fop/trunk/test/fotree/disabled-testcases.txt
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/fotree/disabled-testcases.txt?rev=280298&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/test/fotree/disabled-testcases.txt (added)
+++ xmlgraphics/fop/trunk/test/fotree/disabled-testcases.txt Mon Sep 12
02:08:52 2005
@@ -0,0 +1 @@
+demo-test-failure.fo
Propchange: xmlgraphics/fop/trunk/test/fotree/disabled-testcases.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java?rev=280298&r1=280297&r2=280298&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
Mon Sep 12 02:08:52 2005
@@ -95,6 +95,7 @@
final FOTreeTester tester, final File f) {
suite.addTest(new FOTreeTestCase(f.getName()) {
public void runTest() throws Exception {
+
org.apache.commons.logging.LogFactory.getLog(this.getClass()).info("Starting "
+ f.getName());
prepare(tester, f);
testMain();
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java?rev=280298&r1=280297&r2=280298&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java
Mon Sep 12 02:08:52 2005
@@ -31,6 +31,8 @@
import org.apache.fop.apps.Fop;
import org.apache.fop.fo.Constants;
+import org.apache.fop.fotreetest.ext.TestElementMapping;
+
/**
* Test driver class for FO tree tests.
*/
@@ -56,6 +58,7 @@
FOUserAgent ua = new FOUserAgent();
ua.setBaseURL(testFile.getParentFile().toURL().toString());
ua.setFOEventHandlerOverride(new DummyFOEventHandler(ua));
+ ua.addElementMapping(new TestElementMapping());
Fop fop = new Fop(Constants.RENDER_XML, ua);
SAXResult fores = new SAXResult(fop.getDefaultHandler());
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL:
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=280298&r1=280297&r2=280298&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
Mon Sep 12 02:08:52 2005
@@ -48,7 +48,7 @@
Locator locator,
Attributes attlist,
PropertyList propertyList) throws FOPException {
- super.processNode(elementName, locator, attlist, propertyList);
+ //super.processNode(elementName, locator, attlist, propertyList);
ResultCollector collector = ResultCollector.getInstance();
String propName = attlist.getValue("property");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
