You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by vh...@apache.org on 2011/11/07 19:18:32 UTC
svn commit: r1198853 [1/2] - in /xmlgraphics/fop/trunk: ./
src/java/org/apache/fop/fonts/ src/java/org/apache/fop/fonts/autodetect/
src/java/org/apache/fop/tools/fontlist/ test/java/org/apache/fop/
test/java/org/apache/fop/afp/fonts/ test/java/org/apac...
Author: vhennebert
Date: Mon Nov 7 18:18:29 2011
New Revision: 1198853
URL: http://svn.apache.org/viewvc?rev=1198853&view=rev
Log:
Bugzilla 52136: Added to build file JUnit target that uses a regex to run all of the test cases.
Patch by Mehdi Houshmand, applied with minor modifications
Added:
xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTestCase.java
- copied, changed from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTest.java
Removed:
xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTest.java
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java
xmlgraphics/fop/trunk/status.xml
xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/BlockViewportTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/RegionViewportTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontBaseBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventChecker.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Mon Nov 7 18:18:29 2011
@@ -179,8 +179,10 @@ list of possible build targets.
<property name="build.classes.dir" value="${build.dir}/classes"/>
<property name="build.sandbox-classes.dir" value="${build.dir}/sandbox-classes"/>
<property name="build.codegen-classes.dir" value="${build.dir}/codegen-classes"/>
+ <property name="build.codegen.fonts.dir" value="${build.gensrc.dir}/org/apache/fop/fonts/"/>
<property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
<property name="build.examples.dir" value="${build.dir}/examples"/>
+ <property name="build.unit.tests.dir" value="${build.dir}/test-classes"/>
<property name="build.tests.dir" value="${build.dir}/tests"/>
<property name="build.viewer.resources.dir" value="${build.classes.dir}/org/apache/fop/render/awt/viewer/resources"/>
<property name="build.viewer.images.dir" value="${build.classes.dir}/org/apache/fop/render/awt/viewer/images"/>
@@ -283,57 +285,22 @@ list of possible build targets.
<!-- =================================================================== -->
<!-- Generate the source code -->
<!-- =================================================================== -->
+ <macrodef name="create-font">
+ <attribute name="name"/>
+ <sequential>
+ <xslt in="${src.codegen.fonts.dir}/@{name}.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.codegen.fonts.dir}/base14/@{name}.java"/>
+ </sequential>
+ </macrodef>
<target name="codegen" depends="init" description="Generates the java files from the xml resources">
<echo message="Generating the java files from xml resources"/>
<mkdir dir="${build.gensrc.dir}"/>
<mkdir dir="${build.gensrc.dir}/org/apache/fop/fonts/base14"/>
- <xslt in="${src.codegen.fonts.dir}/encodings.xml" style="${src.codegen.fonts.dir}/code-point-mapping.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/CodePointMapping.java"/>
-<!-- Task unrolled because of a bug in Xalan included in some
- JDK 1.4 releases
- <xslt basedir="src/codegen" includes="Helvetica*.xml,Times*.xml,Courier*.xml"
- style="${src.codegen.fonts.dir}/font-file.xsl"
- destdir="${build.gensrc.dir}/org/apache/fop/fonts/base14" extension=".java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- -->
- <xslt in="${src.codegen.fonts.dir}/Courier.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/Courier.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/CourierOblique.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/CourierOblique.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/CourierBold.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/CourierBold.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/CourierBoldOblique.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/CourierBoldOblique.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/Helvetica.xml" style="${src.codegen.fonts.dir}/font-file.xsl" destdir="${build.gensrc.dir}/org/apache/fop/fonts/base14" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/Helvetica.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/HelveticaBold.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/HelveticaBold.java">
+ <xslt in="${src.codegen.fonts.dir}/encodings.xml" style="${src.codegen.fonts.dir}/code-point-mapping.xsl" out="${build.codegen.fonts.dir}/CodePointMapping.java"/>
+ <xslt basedir="${src.codegen.fonts.dir}" includes="Helvetica*.xml,Times*.xml,Courier*.xml" style="${src.codegen.fonts.dir}/font-file.xsl" destdir="${build.codegen.fonts.dir}/base14/" extension=".java">
<param name="encoding" expression="WinAnsiEncoding"/>
</xslt>
- <xslt in="${src.codegen.fonts.dir}/HelveticaOblique.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/HelveticaOblique.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/HelveticaBoldOblique.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/HelveticaBoldOblique.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/TimesRoman.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/TimesRoman.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/TimesItalic.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/TimesItalic.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/TimesBold.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/TimesBold.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/TimesBoldItalic.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/TimesBoldItalic.java">
- <param name="encoding" expression="WinAnsiEncoding"/>
- </xslt>
- <xslt in="${src.codegen.fonts.dir}/Symbol.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/Symbol.java"/>
- <xslt in="${src.codegen.fonts.dir}/ZapfDingbats.xml" style="${src.codegen.fonts.dir}/font-file.xsl" out="${build.gensrc.dir}/org/apache/fop/fonts/base14/ZapfDingbats.java"/>
+ <create-font name="Symbol"/>
+ <create-font name="ZapfDingbats"/>
</target>
<!-- =================================================================== -->
<!-- Compiles the source directory -->
@@ -703,10 +670,10 @@ list of possible build targets.
</patternset>
</target>
<target name="junit-compile-java" depends="package, transcoder-pkg, junit-with-xmlunit, junit-without-xmlunit" if="junit.present">
- <mkdir dir="${build.dir}/test-classes"/>
+ <mkdir dir="${build.unit.tests.dir}"/>
<mkdir dir="${build.dir}/test-gensrc"/>
<mkdir dir="${junit.reports.dir}"/>
- <javac destdir="${build.dir}/test-classes" includeAntRuntime="true">
+ <javac destdir="${build.unit.tests.dir}" includeAntRuntime="true">
<src path="${test.dir}/java"/>
<patternset refid="test-sources"/>
<classpath>
@@ -716,7 +683,7 @@ list of possible build targets.
</fileset>
</classpath>
</javac>
- <copy todir="${build.dir}/test-classes">
+ <copy todir="${build.unit.tests.dir}">
<fileset dir="${test.dir}/java">
<include name="**/*.xsl"/>
</fileset>
@@ -729,7 +696,7 @@ list of possible build targets.
<include name="**/*.java"/>
</fileset>
</eventResourceGenerator>
- <copy todir="${build.dir}/test-classes">
+ <copy todir="${build.unit.tests.dir}">
<fileset dir="${test.dir}/java">
<include name="META-INF/**"/>
<include name="**/*.xml"/>
@@ -744,7 +711,7 @@ list of possible build targets.
<target name="junit-compile" depends="junit-compile-java, junit-compile-copy-resources" description="Compiles FOP's JUnit tests" if="junit.present"/>
<target name="junit-transcoder" depends="junit-compile" description="Runs FOP's JUnit transcoder tests" if="junit.present">
<path id="transcoder-classpath">
- <pathelement location="${build.dir}/test-classes"/>
+ <pathelement location="${build.unit.tests.dir}"/>
<path refid="libs-build-classpath"/>
<fileset dir="${build.dir}">
<include name="fop-transcoder.jar"/>
@@ -759,7 +726,7 @@ list of possible build targets.
JAR needs to be updated.
-->
<path id="transcoder-all-classpath">
- <pathelement location="${build.dir}/test-classes"/>
+ <pathelement location="${build.unit.tests.dir}"/>
<path refid="libs-build-classpath"/>
<fileset dir="build">
<include name="fop-transcoder-allinone.jar"/>
@@ -791,7 +758,7 @@ list of possible build targets.
<echo message="${hyphenation.message}"/>
</target>
<path id="standard-junit-classpath">
- <pathelement location="${build.dir}/test-classes"/>
+ <pathelement location="${build.unit.tests.dir}"/>
<path refid="libs-tools-build-classpath"/>
<pathelement location="${build.dir}/fop.jar"/>
</path>
@@ -816,6 +783,20 @@ list of possible build targets.
</junit>
</sequential>
</macrodef>
+ <target name="junit-all" depends="junit-compile, junit-transcoder, junit-layout-hyphenation, setup-xml-schema" description="Runs FOP's JUnit basic tests" if="junit.present">
+ <junit dir="${basedir}" haltonfailure="yes" fork="${junit.fork}" errorproperty="fop.junit.error" failureproperty="fop.junit.failure">
+ <sysproperty key="jawa.awt.headless" value="true"/>
+ <formatter type="brief" usefile="false"/>
+ <formatter type="plain" usefile="true"/>
+ <formatter type="xml" usefile="true"/>
+ <classpath>
+ <path refid="standard-junit-classpath"/>
+ </classpath>
+ <batchtest todir="${junit.reports.dir}">
+ <fileset dir="${build.unit.tests.dir}" includes="**/*TestCase.class"/>
+ </batchtest>
+ </junit>
+ </target>
<target name="junit-basic" depends="junit-compile" description="Runs FOP's JUnit basic tests" if="junit.present">
<junit-run title="Standard test suite" testsuite="org.apache.fop.StandardTestSuite" outfile="TEST-standard-tests-suite"/>
</target>
@@ -861,17 +842,16 @@ list of possible build targets.
outfile="TEST-intermediate-format"/>
</target>
<target name="junit-events" depends="junit-compile" description="Runs FOP's event JUnit tests" if="junit.present">
- <junit-run title="event" basedir="test/events" testsuite="org.apache.fop.events.EventProcessingTestCase" outfile="TEST-events"/>
+ <junit-run title="event" testsuite="org.apache.fop.events.EventProcessingTestCase" outfile="TEST-events"/>
</target>
<target name="junit-text-linebreak" depends="junit-compile" description="Runs FOP's JUnit unicode linebreak tests" if="junit.present">
- <junit-run title="Unicode UAX#14 support" testsuite="org.apache.fop.text.linebreak.LineBreakStatusTest" outfile="TEST-linebreak"/>
+ <junit-run title="Unicode UAX#14 support" testsuite="org.apache.fop.text.linebreak.LineBreakStatusTestCase" outfile="TEST-linebreak"/>
</target>
<target name="junit-render-pdf" depends="junit-compile">
<junit-run title="render-pdf" testsuite="org.apache.fop.render.pdf.RenderPDFTestSuite" outfile="TEST-render-pdf"/>
</target>
<target name="junit-reduced" depends="junit-userconfig, junit-basic, junit-transcoder, junit-text-linebreak, junit-fotree, junit-render-pdf"/>
- <target name="junit-full" depends="junit-reduced, junit-layout, junit-area-tree-xml-format, junit-intermediate-format"/>
- <target name="junit" depends="junit-full" description="Runs all of FOP's JUnit tests" if="junit.present">
+ <target name="junit" depends="junit-all" description="Runs all of FOP's JUnit tests" if="junit.present">
<fail><condition><or><isset property="fop.junit.error"/><isset property="fop.junit.failure"/><not><isset property="hyphenation.present"/></not></or></condition>
NOTE:
**************************************************************************
@@ -1353,7 +1333,7 @@ NOTE:
<!-- Special target for Gump -->
<!-- =================================================================== -->
<target name="gump" depends="package,transcoder-pkg"/>
- <target name="gump-test" depends="junit-full">
+ <target name="gump-test" depends="junit-all">
<fail>
<condition>
<or>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontDetector.java Mon Nov 7 18:18:29 2011
@@ -27,10 +27,12 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import org.apache.xmlgraphics.util.ClasspathResource;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.fonts.autodetect.FontFileFinder;
import org.apache.fop.util.LogUtil;
-import org.apache.xmlgraphics.util.ClasspathResource;
/**
* Detector of operating system and classpath fonts
@@ -45,17 +47,21 @@ public class FontDetector {
private final FontManager fontManager;
private final FontAdder fontAdder;
private final boolean strict;
+ private final FontEventListener eventListener;
/**
* Main constructor
* @param manager the font manager
* @param adder the font adder
* @param strict true if an Exception should be thrown if an error is found.
+ * @param listener for throwing font related events
*/
- public FontDetector(FontManager manager, FontAdder adder, boolean strict) {
+ public FontDetector(FontManager manager, FontAdder adder, boolean strict,
+ FontEventListener listener) {
this.fontManager = manager;
this.fontAdder = adder;
this.strict = strict;
+ this.eventListener = listener;
}
/**
@@ -66,7 +72,7 @@ public class FontDetector {
public void detect(List<EmbedFontInfo> fontInfoList) throws FOPException {
// search in font base if it is defined and
// is a directory but don't recurse
- FontFileFinder fontFileFinder = new FontFileFinder();
+ FontFileFinder fontFileFinder = new FontFileFinder(eventListener);
String fontBaseURL = fontManager.getFontBaseURL();
if (fontBaseURL != null) {
try {
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventAdapter.java Mon Nov 7 18:18:29 2011
@@ -61,4 +61,9 @@ public class FontEventAdapter implements
getEventProducer().glyphNotAvailable(source, ch, fontName);
}
+ /** {@inheritDoc} */
+ public void fontDirectoryNotFound(Object source, String dir) {
+ getEventProducer().fontDirectoryNotFound(source, dir);
+ }
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventListener.java Mon Nov 7 18:18:29 2011
@@ -48,4 +48,10 @@ public interface FontEventListener {
*/
void glyphNotAvailable(Object source, char ch, String fontName);
+ /**
+ * An error occurred trying to find the font directory specified in the config file.
+ * @param source the event source
+ * @param dir the directory in the config file
+ */
+ void fontDirectoryNotFound(Object source, String dir);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.java Mon Nov 7 18:18:29 2011
@@ -71,4 +71,12 @@ public interface FontEventProducer exten
*/
void glyphNotAvailable(Object source, char ch, String fontName);
+ /**
+ * An error occurred trying to find the font directory specified in the config file.
+ * @param source the event sourece
+ * @param dir the directory in the config file
+ * @event.severity WARN
+ */
+ void fontDirectoryNotFound(Object source, String dir);
+
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontEventProducer.xml Mon Nov 7 18:18:29 2011
@@ -20,4 +20,5 @@
<message key="fontSubstituted">Font "{requested}" not found. Substituting with "{effective}".</message>
<message key="fontLoadingErrorAtAutoDetection">Unable to load font file: {fontURL}.[ Reason: {e}]</message>
<message key="glyphNotAvailable">Glyph "{ch}" (0x{ch,hex}[, {ch,glyph-name}]) not available in font "{fontName}".</message>
+ <message key="fontDirectoryNotFound">'{dir}' does not exist or is not a directory.</message>
</catalogue>
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontInfoConfigurator.java Mon Nov 7 18:18:29 2011
@@ -33,6 +33,7 @@ import org.apache.avalon.framework.confi
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.fonts.autodetect.FontFileFinder;
import org.apache.fop.fonts.autodetect.FontInfoFinder;
@@ -88,7 +89,8 @@ public class FontInfoConfigurator {
// native o/s search (autodetect) configuration
boolean autodetectFonts = (fontsCfg.getChild("auto-detect", false) != null);
if (autodetectFonts) {
- FontDetector fontDetector = new FontDetector(fontManager, fontAdder, strict);
+ FontDetector fontDetector = new FontDetector(fontManager, fontAdder, strict,
+ listener);
fontDetector.detect(fontInfoList);
}
@@ -139,7 +141,7 @@ public class FontInfoConfigurator {
}
// add fonts found in directory
- FontFileFinder fontFileFinder = new FontFileFinder(recursive ? -1 : 1);
+ FontFileFinder fontFileFinder = new FontFileFinder(recursive ? -1 : 1, listener);
List<URL> fontURLList;
try {
fontURLList = fontFileFinder.find(directory);
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java Mon Nov 7 18:18:29 2011
@@ -34,6 +34,8 @@ import org.apache.commons.io.filefilter.
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.fop.fonts.FontEventListener;
+
/**
* Helps to autodetect/locate available operating system fonts.
*/
@@ -44,20 +46,24 @@ public class FontFileFinder extends Dire
/** default depth limit of recursion when searching for font files **/
public static final int DEFAULT_DEPTH_LIMIT = -1;
+ private final FontEventListener eventListener;
/**
* Default constructor
+ * @param listener for throwing font related events
*/
- public FontFileFinder() {
- super(getDirectoryFilter(), getFileFilter(), DEFAULT_DEPTH_LIMIT);
+ public FontFileFinder(FontEventListener listener) {
+ this(DEFAULT_DEPTH_LIMIT, listener);
}
/**
* Constructor
* @param depthLimit recursion depth limit
+ * @param listener for throwing font related events
*/
- public FontFileFinder(int depthLimit) {
+ public FontFileFinder(int depthLimit, FontEventListener listener) {
super(getDirectoryFilter(), getFileFilter(), depthLimit);
+ eventListener = listener;
}
/**
@@ -163,6 +169,12 @@ public class FontFileFinder extends Dire
public List<URL> find(String dir) throws IOException {
List<URL> results = new java.util.ArrayList<URL>();
super.walk(new File(dir), results);
+ File directory = new File(dir);
+ if (!directory.isDirectory()) {
+ eventListener.fontDirectoryNotFound(this, dir);
+ } else {
+ super.walk(directory, results);
+ }
return results;
}
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/tools/fontlist/FontListMain.java Mon Nov 7 18:18:29 2011
@@ -143,6 +143,10 @@ public final class FontListMain {
//ignore
}
+ public void fontDirectoryNotFound(Object source, String msg) {
+ //ignore
+ }
+
};
FontListGenerator listGenerator = new FontListGenerator();
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Nov 7 18:18:29 2011
@@ -60,6 +60,10 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Code" dev="VH" type="add" fixes-bug="52136" due-to="Mehdi Houshmand">
+ Added to build file JUnit target that uses a regex to run all of the test cases. This
+ reduces the risk that some of them are omitted when building FOP.
+ </action>
<action context="Code" dev="PH" type="add" fixes-bug="52089" due-to="JM, Mehdi Houshmand">
Allow JPEG images to be embedded in an AFP document as is, without being decoded and
encoded.
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTest.java Mon Nov 7 18:18:29 2011
@@ -34,7 +34,7 @@ import org.junit.Test;
* Basic runtime test for FOP's transcoders. It is used to verify that
* nothing obvious is broken after compiling.
*/
-public abstract class AbstractBasicTranscoderTestCase extends AbstractFOPTestCase {
+public abstract class AbstractBasicTranscoderTest extends AbstractFOPTest {
/**
* Creates the transcoder to test.
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTest.java Mon Nov 7 18:18:29 2011
@@ -24,19 +24,14 @@ import java.io.File;
/**
* Abstract base test class for FOP's tests.
*/
-public abstract class AbstractFOPTestCase {
+public abstract class AbstractFOPTest {
/**
* Returns the base directory to use for the tests.
* @return the base directory
*/
protected static File getBaseDir() {
- String basedir = System.getProperty("basedir");
- if (basedir != null) {
- return new File(basedir);
- } else {
- return new File(".");
- }
+ return new File(".");
}
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java Mon Nov 7 18:18:29 2011
@@ -42,7 +42,7 @@ import org.junit.Test;
* Basic runtime test for the old Fop class. It is used to verify that
* nothing obvious is broken after compiling.
*/
-public class BasicDriverTestCase extends AbstractFOPTestCase {
+public class BasicDriverTestCase extends AbstractFOPTest {
private FopFactory fopFactory = FopFactory.newInstance();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java Mon Nov 7 18:18:29 2011
@@ -26,7 +26,7 @@ import org.apache.fop.svg.PDFTranscoder;
* Basic runtime test for the PDF transcoder. It is used to verify that
* nothing obvious is broken after compiling.
*/
-public class BasicPDFTranscoderTestCase extends AbstractBasicTranscoderTestCase {
+public class BasicPDFTranscoderTestCase extends AbstractBasicTranscoderTest {
@Override
protected Transcoder createTranscoder() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java Mon Nov 7 18:18:29 2011
@@ -26,7 +26,7 @@ import org.apache.fop.render.ps.PSTransc
* Basic runtime test for the PS transcoder. It is used to verify that
* nothing obvious is broken after compiling.
*/
-public class BasicPSTranscoderTestCase extends AbstractBasicTranscoderTestCase {
+public class BasicPSTranscoderTestCase extends AbstractBasicTranscoderTest {
@Override
protected Transcoder createTranscoder() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java Mon Nov 7 18:18:29 2011
@@ -1,129 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayOutputStream;
-import java.io.StringReader;
-import java.security.DigestOutputStream;
-import java.security.MessageDigest;
-import java.util.Date;
-
-import javax.xml.parsers.SAXParserFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.xml.sax.InputSource;
-
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FopFactory;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.util.DigestFilter;
-
-/**
- * Framework for simple regression testing.
- * The testcase reads a control XML file which specifies a FO source,
- * a MD5 for the source to help diferentiating failures caused by causal
- * source modification from failures caused by regression, a renderer (only
- * PDF currently supported) and a MD5 for the result.
- *
- */
-public final class GenericFOPTestCase {
-
- // configure fopFactory as desired
- private FopFactory fopFactory = FopFactory.newInstance();
-
- private SAXParserFactory parserFactory;
-
- @Before
- public void setUp() throws Exception {
- parserFactory = SAXParserFactory.newInstance();
- parserFactory.setNamespaceAware(true);
- }
-
- @org.junit.Test
- public void testSimple() throws Exception {
- final String digestIn = "17bf13298796065f7775db8707133aeb";
- final String digestOut = "e2761f51152f6663911e567901596707";
- final String fo
- = "<fo:root xmlns:fo='http://www.w3.org/1999/XSL/Format'>"
- + " <fo:layout-master-set>"
- + " <fo:simple-page-master master-name='simple'"
- + " page-height='25cm' page-width='20cm'>"
- + " <fo:region-body/>"
- + " </fo:simple-page-master>"
- + " </fo:layout-master-set>"
- + " <fo:page-sequence master-reference='simple'>"
- + " <fo:flow flow-name='xsl-region-body'>"
- + " <fo:block>This is a blind text.</fo:block>"
- + " </fo:flow>"
- + " </fo:page-sequence>"
- + "</fo:root>";
- renderPDF(fo, digestIn, digestOut);
- }
-
- private String digestToString(byte[] value) {
- StringBuffer buffer = new StringBuffer(2 * value.length);
- for (int i = 0; i < value.length; i++) {
- int val = value[i];
- int hi = (val >> 4) & 0xF;
- int lo = val & 0xF;
- if (hi < 10) {
- buffer.append((char) (hi + 0x30));
- } else {
- buffer.append((char) (hi + 0x61 - 10));
- }
- if (lo < 10) {
- buffer.append((char) (lo + 0x30));
- } else {
- buffer.append((char) (lo + 0x61 - 10));
- }
- }
- return buffer.toString();
- }
-
- private void renderPDF(String fo, String digestIn, String digestOut)
- throws Exception {
- FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
- foUserAgent.setCreationDate(new Date(10000));
- MessageDigest outDigest = MessageDigest.getInstance("MD5");
- DigestOutputStream out = new DigestOutputStream(new ByteArrayOutputStream(), outDigest);
- Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, foUserAgent, out);
- InputSource source = new InputSource(new StringReader(fo));
- DigestFilter filter = new DigestFilter("MD5");
- filter.setParent(parserFactory.newSAXParser().getXMLReader());
- filter.setContentHandler(fop.getDefaultHandler());
- filter.parse(source);
- String digestInActual = digestToString(filter.getDigestValue());
- if (!digestIn.equals(digestInActual)) {
- fail("input MD5: was " + digestInActual + ", expected " + digestIn);
- }
- String digestOutActual = digestToString(outDigest.digest());
- if (!digestOut.equals(digestOutActual)) {
- fail(
- "output MD5: was "
- + digestOutActual
- + ", expected "
- + digestOut);
- }
- }
-
-}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java Mon Nov 7 18:18:29 2011
@@ -23,16 +23,16 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
-import org.apache.fop.afp.fonts.CharactersetEncoderTest;
+import org.apache.fop.afp.fonts.CharactersetEncoderTestCase;
import org.apache.fop.afp.parser.MODCAParserTestCase;
import org.apache.fop.area.ViewportTestSuite;
-import org.apache.fop.fonts.DejaVuLGCSerifTest;
+import org.apache.fop.fonts.DejaVuLGCSerifTestCase;
import org.apache.fop.fonts.truetype.GlyfTableTestCase;
import org.apache.fop.image.loader.batik.ImageLoaderTestCase;
import org.apache.fop.image.loader.batik.ImagePreloaderTestCase;
import org.apache.fop.intermediate.IFMimickingTestCase;
-import org.apache.fop.render.extensions.prepress.PageBoundariesTest;
-import org.apache.fop.render.extensions.prepress.PageScaleTest;
+import org.apache.fop.render.extensions.prepress.PageBoundariesTestCase;
+import org.apache.fop.render.extensions.prepress.PageScaleTestCase;
import org.apache.fop.render.pdf.PDFAConformanceTestCase;
import org.apache.fop.render.pdf.PDFCMapTestCase;
import org.apache.fop.render.pdf.PDFEncodingTestCase;
@@ -40,7 +40,7 @@ import org.apache.fop.render.pdf.PDFsRGB
import org.apache.fop.render.pdf.RenderPDFTestSuite;
import org.apache.fop.render.ps.PSTestSuite;
import org.apache.fop.render.rtf.RichTextFormatTestSuite;
-import org.apache.fop.traits.MinOptMaxTest;
+import org.apache.fop.traits.MinOptMaxTestCase;
/**
* Test suite for basic functionality of FOP.
@@ -53,22 +53,22 @@ import org.apache.fop.traits.MinOptMaxTe
PDFEncodingTestCase.class,
PDFCMapTestCase.class,
PDFsRGBSettingsTestCase.class,
- DejaVuLGCSerifTest.class,
+ DejaVuLGCSerifTestCase.class,
RichTextFormatTestSuite.class,
ImageLoaderTestCase.class,
ImagePreloaderTestCase.class,
IFMimickingTestCase.class,
- PageBoundariesTest.class,
- PageScaleTest.class,
+ PageBoundariesTestCase.class,
+ PageScaleTestCase.class,
org.apache.fop.afp.AFPTestSuite.class,
GlyfTableTestCase.class,
ViewportTestSuite.class,
RenderPDFTestSuite.class,
MODCAParserTestCase.class,
- CharactersetEncoderTest.class,
+ CharactersetEncoderTestCase.class,
org.apache.fop.render.afp.AFPTestSuite.class,
PSTestSuite.class,
- MinOptMaxTest.class
+ MinOptMaxTestCase.class
})
public class StandardTestSuite {
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java Mon Nov 7 18:18:29 2011
@@ -56,7 +56,7 @@ import org.w3c.dom.Document;
/**
* Tests URI resolution facilities.
*/
-public class URIResolutionTestCase extends AbstractFOPTestCase {
+public class URIResolutionTestCase extends AbstractFOPTest {
// configure fopFactory as desired
private FopFactory fopFactory = FopFactory.newInstance();
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/fonts/CharactersetEncoderTestCase.java Mon Nov 7 18:18:29 2011
@@ -33,7 +33,7 @@ import org.junit.Test;
/**
* Test {@link CharactersetEncoder}
*/
-public class CharactersetEncoderTest {
+public class CharactersetEncoderTestCase {
private CharactersetEncoder singlebyteEncoder;
private CharactersetEncoder doublebyteEncoder;
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractAFPObjectTest.java Mon Nov 7 18:18:29 2011
@@ -36,7 +36,7 @@ import org.junit.Test;
/**
* Tests the {@link AbstractAFPObject} class.
*/
-public abstract class AbstractAFPObjectTestCase<S extends AbstractAFPObject> {
+public abstract class AbstractAFPObjectTest<S extends AbstractAFPObject> {
private S sut;
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractNamedAFPObjectTest.java Mon Nov 7 18:18:29 2011
@@ -28,8 +28,8 @@ import org.junit.Test;
/**
* Tests the {@linkplain AbstractAFPObject} class.
*/
-public abstract class AbstractNamedAFPObjectTestCase<S extends AbstractNamedAFPObject>
- extends AbstractAFPObjectTestCase<S> {
+public abstract class AbstractNamedAFPObjectTest<S extends AbstractNamedAFPObject>
+ extends AbstractAFPObjectTest<S> {
@Test
public void testCopySF() {
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractStructuredObjectTest.java Mon Nov 7 18:18:29 2011
@@ -21,7 +21,7 @@ package org.apache.fop.afp.modca;
import java.io.IOException;
-public abstract class AbstractStructuredObjectTestCase<S extends AbstractStructuredObject> extends AbstractAFPObjectTestCase<S> {
+public abstract class AbstractStructuredObjectTest<S extends AbstractStructuredObject> extends AbstractAFPObjectTest<S> {
/**
* Test writeStart() - test that the contract is maintained with
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/AbstractTripletStructuredObjectTest.java Mon Nov 7 18:18:29 2011
@@ -30,18 +30,20 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+
import org.apache.fop.afp.modca.triplets.AbstractTriplet;
import org.apache.fop.afp.modca.triplets.AttributeQualifierTriplet;
import org.apache.fop.afp.modca.triplets.CommentTriplet;
import org.apache.fop.afp.modca.triplets.ObjectAreaSizeTriplet;
import org.apache.fop.afp.modca.triplets.Triplet;
-import org.junit.Before;
/**
* Test {@link AbstractTripletStructuredObject}
*/
-public abstract class AbstractTripletStructuredObjectTestCase<S extends AbstractTripletStructuredObject>
- extends AbstractStructuredObjectTestCase<AbstractTripletStructuredObject> {
+public class AbstractTripletStructuredObjectTest<S extends AbstractTripletStructuredObject>
+ extends AbstractStructuredObjectTest<AbstractTripletStructuredObject> {
private static final List<AbstractTriplet> TRIPLETS;
@@ -136,6 +138,7 @@ public abstract class AbstractTripletStr
/**
* Test addTriplets() - ensure all triplets are added.
*/
+ @Test
public void testAddTriplets() {
// Tested on empty object
List<AbstractTriplet> expectedList = TRIPLETS;
@@ -154,4 +157,4 @@ public abstract class AbstractTripletStr
emptyStructuredObject.addTriplets(null);
}
-}
\ No newline at end of file
+}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java Mon Nov 7 18:18:29 2011
@@ -32,7 +32,7 @@ import org.junit.Test;
/**
* Test {@link IncludeObject}
*/
-public class IncludeObjectTestCase extends AbstractNamedAFPObjectTestCase<IncludeObject> {
+public class IncludeObjectTestCase extends AbstractNamedAFPObjectTest<IncludeObject> {
@Before
public void setUp() throws Exception {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/BlockViewportTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/BlockViewportTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/BlockViewportTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/BlockViewportTestCase.java Mon Nov 7 18:18:29 2011
@@ -24,7 +24,7 @@ import org.junit.Test;
/**
* Tests the {@linkplain BlockViewport} class.
*/
-public class BlockViewportTestCase extends ViewportTestCase {
+public class BlockViewportTestCase extends ViewportTest {
@Test
public void testNonClip() throws Exception {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/RegionViewportTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/RegionViewportTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/RegionViewportTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/RegionViewportTestCase.java Mon Nov 7 18:18:29 2011
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Tests the {@linkplain RegionViewport} class.
*/
-public class RegionViewportTestCase extends ViewportTestCase {
+public class RegionViewportTestCase extends ViewportTest {
private RegionViewport createRegionViewport(int x, int y, int ipd, int bpd) {
Rectangle2D v = new Rectangle(x, y, ipd, bpd);
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTest.java Mon Nov 7 18:18:29 2011
@@ -29,7 +29,7 @@ import java.awt.Rectangle;
/**
* Tests implementations of the {@linkplain Viewport} interface.
*/
-public abstract class ViewportTestCase {
+public abstract class ViewportTest {
protected void checkNonClip(Viewport v) throws Exception {
assertFalse(v.hasClip());
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.java Mon Nov 7 18:18:29 2011
@@ -19,13 +19,13 @@
package org.apache.fop.area.inline;
-import org.apache.fop.area.ViewportTestCase;
+import org.apache.fop.area.ViewportTest;
import org.junit.Test;
/**
* Tests the {@linkplain InlineViewport} class.
*/
-public class InlineViewportTestCase extends ViewportTestCase {
+public class InlineViewportTestCase extends ViewportTest {
@Test
public void testNonClip() throws Exception {
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTest.java Mon Nov 7 18:18:29 2011
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Super class of several user config cases.
*/
-public abstract class BaseConstructiveUserConfigTestCase extends BaseUserConfigTestCase {
+public abstract class BaseConstructiveUserConfigTest extends BaseUserConfigTest {
/**
* Test using a standard FOP font
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTest.java Mon Nov 7 18:18:29 2011
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* Super class for several user configuration failure cases.
*/
-public abstract class BaseDestructiveUserConfigTestCase extends BaseUserConfigTestCase {
+public abstract class BaseDestructiveUserConfigTest extends BaseUserConfigTest {
/**
* Test the user configuration failure.
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTest.java Mon Nov 7 18:18:29 2011
@@ -29,23 +29,23 @@ import org.apache.avalon.framework.confi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.render.pdf.BasePDFTestCase;
+import org.apache.fop.render.pdf.BasePDFTest;
import org.xml.sax.SAXException;
/**
* Basic runtime test for FOP's font configuration. It is used to verify that
* nothing obvious is broken after compiling.
*/
-public abstract class BaseUserConfigTestCase extends BasePDFTestCase {
+public abstract class BaseUserConfigTest extends BasePDFTest {
protected DefaultConfigurationBuilder cfgBuilder = new DefaultConfigurationBuilder();
/** logging instance */
- protected Log log = LogFactory.getLog(BaseUserConfigTestCase.class);
+ protected Log log = LogFactory.getLog(BaseUserConfigTest.class);
/**
- * @see org.apache.fop.render.pdf.BasePDFTestCase#init()
+ * @see org.apache.fop.render.pdf.BasePDFTest#init()
*/
protected void init() {
// do nothing
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* this font is without a metrics-url or an embed-url
*/
-public class FontAttributesMissingTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontAttributesMissingTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontBaseBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontBaseBadTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontBaseBadTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontBaseBadTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* This font base does not exist and a relative font path is used.
*/
-public class FontBaseBadTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontBaseBadTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* this font has an embed-url that does not exist on filesystem.
*/
-public class FontEmbedUrlBadTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontEmbedUrlBadTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* this font has a malformed embed-url
*/
-public class FontEmbedUrlMalformedTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontEmbedUrlMalformedTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* this font has a metrics-url that does not exist on filesystem
*/
-public class FontMetricsUrlBadTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontMetricsUrlBadTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* this font has a malformed metrics-url
*/
-public class FontMetricsUrlMalformedTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontMetricsUrlMalformedTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* this font has a missing font triplet attribute
*/
-public class FontTripletAttributeMissingTestCase extends BaseDestructiveUserConfigTestCase {
+public class FontTripletAttributeMissingTestCase extends BaseDestructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java Mon Nov 7 18:18:29 2011
@@ -19,7 +19,7 @@
package org.apache.fop.config;
-public class FontsAutoDetectTestCase extends BaseConstructiveUserConfigTestCase {
+public class FontsAutoDetectTestCase extends BaseConstructiveUserConfigTest {
@Override
public String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java Mon Nov 7 18:18:29 2011
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.config;
-
-/**
- * this font has a metrics-url that does not exist on filesystem
- */
-public class FontsDirectoryBadTestCase extends BaseDestructiveUserConfigTestCase {
-
- @Override
- public String getUserConfigFilename() {
- return "test_fonts_directory_bad.xconf";
- }
-
- @Override
- protected String getFontFOFilePath() {
- return "test/xml/bugtests/font-dir.fo";
- }
-}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,7 @@ package org.apache.fop.config;
/**
* tests font directory on system
*/
-public class FontsDirectoryRecursiveTestCase extends BaseConstructiveUserConfigTestCase {
+public class FontsDirectoryRecursiveTestCase extends BaseConstructiveUserConfigTest {
@Override
protected String getUserConfigFilename() {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsSubstitutionTestCase.java Mon Nov 7 18:18:29 2011
@@ -36,7 +36,7 @@ import org.apache.fop.render.PrintRender
* Tests the font substitution mechanism
*/
public class FontsSubstitutionTestCase extends
- BaseConstructiveUserConfigTestCase {
+ BaseConstructiveUserConfigTest {
@Override
protected byte[] convertFO(File foFile, FOUserAgent ua, boolean dumpPdfFile)
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/UserConfigTestSuite.java Mon Nov 7 18:18:29 2011
@@ -34,7 +34,6 @@ import org.junit.runners.Suite.SuiteClas
FontMetricsUrlBadTestCase.class,
FontEmbedUrlBadTestCase.class,
FontMetricsUrlMalformedTestCase.class,
- FontMetricsUrlMalformedTestCase.class,
FontsDirectoryRecursiveTestCase.class,
FontsAutoDetectTestCase.class,
FontsSubstitutionTestCase.class,
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventChecker.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventChecker.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventChecker.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventChecker.java Mon Nov 7 18:18:29 2011
@@ -36,11 +36,9 @@ class EventChecker implements EventListe
public void processEvent(Event event) {
// Always create the message to make sure there is no error in the formatting process
- String msg = EventFormatter.format(event);
- if (event.getEventID().equals(expectedEventID)) {
+ String id = event.getEventID();
+ if (id.equals(expectedEventID)) {
eventReceived = true;
- } else {
- fail("Unexpected event: id = " + event.getEventID() + ": " + msg);
}
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/events/EventProcessingTestCase.java Mon Nov 7 18:18:29 2011
@@ -20,6 +20,7 @@
package org.apache.fop.events;
import java.io.File;
+import java.io.IOException;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
@@ -29,9 +30,16 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
+import org.junit.Test;
+import org.xml.sax.SAXException;
+
import org.apache.commons.io.output.NullOutputStream;
+
+import org.apache.xmlgraphics.util.MimeConstants;
+
import org.apache.fop.ResourceEventProducer;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.area.AreaEventProducer;
@@ -40,8 +48,6 @@ import org.apache.fop.fo.flow.table.Tabl
import org.apache.fop.fonts.FontEventProducer;
import org.apache.fop.layoutmgr.BlockLevelEventProducer;
import org.apache.fop.layoutmgr.inline.InlineLevelEventProducer;
-import org.apache.xmlgraphics.util.MimeConstants;
-import org.junit.Test;
/**
* Tests that the event notification system runs smoothly.
@@ -52,68 +58,77 @@ public class EventProcessingTestCase {
private final TransformerFactory tFactory = TransformerFactory.newInstance();
- private final File basedir;
-
- public EventProcessingTestCase() {
- String base = System.getProperty("basedir");
- if (base != null) {
- basedir = new File(base);
- } else {
- basedir = new File(".");
- }
- }
-
- private void doTest(String filename, String expectedEventID)
- throws FOPException, TransformerException {
- Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, new NullOutputStream());
+ private void doTest(String filename, String fopConf, String expectedEventID)
+ throws FOPException, TransformerException, IOException, SAXException {
EventChecker eventChecker = new EventChecker(expectedEventID);
- fop.getUserAgent().getEventBroadcaster().addEventListener(eventChecker);
+ if (fopConf != null) {
+ fopFactory.setUserConfig(fopConf);
+ }
+ FOUserAgent userAgent = fopFactory.newFOUserAgent();
+ userAgent.getEventBroadcaster().addEventListener(eventChecker);
+ Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, new NullOutputStream());
Transformer transformer = tFactory.newTransformer();
- Source src = new StreamSource(new File(basedir, filename));
+ Source src = new StreamSource(new File("test/events/" + filename));
Result res = new SAXResult(fop.getDefaultHandler());
transformer.transform(src, res);
eventChecker.end();
}
+ private void doTest(String filename, String expectedEventID) throws
+ FOPException, TransformerException, IOException, SAXException {
+ doTest(filename, null, expectedEventID);
+ }
+
@Test
- public void testArea() throws FOPException, TransformerException {
+ public void testArea() throws TransformerException, IOException, SAXException {
doTest("area.fo",
AreaEventProducer.class.getName() + ".unresolvedIDReferenceOnPage");
}
@Test
- public void testResource() throws FOPException, TransformerException {
+ public void testResource() throws FOPException, TransformerException, IOException,
+ SAXException {
doTest("resource.fo",
ResourceEventProducer.class.getName() + ".imageNotFound");
}
@Test
- public void testValidation() throws FOPException, TransformerException {
+ public void testValidation() throws FOPException, TransformerException, IOException,
+ SAXException {
doTest("validation.fo",
FOValidationEventProducer.class.getName() + ".invalidPropertyValue");
}
@Test
- public void testTable() throws FOPException, TransformerException {
+ public void testTable() throws FOPException, TransformerException, IOException, SAXException {
doTest("table.fo",
TableEventProducer.class.getName() + ".noTablePaddingWithCollapsingBorderModel");
}
@Test
- public void testBlockLevel() throws FOPException, TransformerException {
+ public void testBlockLevel() throws FOPException, TransformerException, IOException,
+ SAXException {
doTest("block-level.fo",
BlockLevelEventProducer.class.getName() + ".overconstrainedAdjustEndIndent");
}
@Test
- public void testInlineLevel() throws FOPException, TransformerException {
+ public void testInlineLevel() throws FOPException, TransformerException, IOException,
+ SAXException {
doTest("inline-level.fo",
InlineLevelEventProducer.class.getName() + ".lineOverflows");
}
@Test
- public void testFont() throws FOPException, TransformerException {
+ public void testFont() throws FOPException, TransformerException, IOException, SAXException {
doTest("font.fo",
FontEventProducer.class.getName() + ".fontSubstituted");
}
+
+ @Test
+ public void testFontWithBadDirectory() throws FOPException, TransformerException, IOException,
+ SAXException {
+ doTest("font.fo", "test/config/test_fonts_directory_bad.xconf",
+ FontEventProducer.class.getName() + ".fontDirectoryNotFound");
+ }
}
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java Mon Nov 7 18:18:29 2011
@@ -28,13 +28,13 @@ import org.apache.fop.fotreetest.FOTreeU
/**
* Superclass for testcases related to tables, factoring the common stuff.
*/
-abstract class AbstractTableTestCase extends FOTreeUnitTester {
+abstract class AbstractTableTest extends FOTreeUnitTester {
private FOTreeUnitTester.FOEventHandlerFactory tableHandlerFactory;
private TableHandler tableHandler;
- public AbstractTableTestCase() throws Exception {
+ public AbstractTableTest() throws Exception {
super();
tableHandlerFactory = new FOEventHandlerFactory() {
public FOEventHandler createFOEventHandler(FOUserAgent foUserAgent) {
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java Mon Nov 7 18:18:29 2011
@@ -35,7 +35,7 @@ import org.junit.Test;
* conditionality into account. The resolved borders are generated by the
* collapsed-conditional-borders_test-generator.py Python script.
*/
-public class CollapsedConditionalBorderTestCase extends AbstractTableTestCase {
+public class CollapsedConditionalBorderTestCase extends AbstractTableTest {
private final Integer border0pt = new Integer(0);
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org