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/10/04 12:09:07 UTC
svn commit: r1178747 [1/3] - in /xmlgraphics/fop/trunk: ./
test/java/org/apache/fop/ test/java/org/apache/fop/afp/
test/java/org/apache/fop/afp/fonts/ test/java/org/apache/fop/afp/modca/
test/java/org/apache/fop/afp/parser/ test/java/org/apache/fop/are...
Author: vhennebert
Date: Tue Oct 4 10:09:01 2011
New Revision: 1178747
URL: http://svn.apache.org/viewvc?rev=1178747&view=rev
Log:
Bugzilla #51928: Upgraded all tests to JUnit 4
Patch by Mehdi Houshmand, applied with minor cosmetics and error fixes
Added:
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestUtils.java (with props)
Modified:
xmlgraphics/fop/trunk/build.xml
xmlgraphics/fop/trunk/status.xml
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/BasicDriverTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.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/BasicTranscoderTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.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/UtilityCodeTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPTestSuite.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/AbstractTripletStructuredObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/modca/IncludeObjectTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.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/ViewportTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/area/inline/InlineViewportTestCase.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/config/FOURIResolverTestCase.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/datatypes/URISpecificationTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/events/BasicEventTestCase.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/ErrorCheckTestCase.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/fonts/DejaVuLGCSerifTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
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/FOTreeUnitTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFMimickingTestCase.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/intermediate/IntermediateFormatTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/ResultCheck.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFFactoryTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/pdf/PDFObjectTestCase.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/AFPTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.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/pdf/PDFAConformanceTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFRendererConfiguratorTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/RenderPDFTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/PSTestSuite.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.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/BorderPropsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTest.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/AdvancedMessageFormatTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/BitmapImageUtilTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ColorUtilTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/PDFNumberTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/XMLResourceBundleTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/util/XMLUtilTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/visual/BatchDiffer.java
Modified: xmlgraphics/fop/trunk/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/build.xml?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/build.xml (original)
+++ xmlgraphics/fop/trunk/build.xml Tue Oct 4 10:09:01 2011
@@ -252,7 +252,7 @@ list of possible build targets.
<echo message="${jce.message}"/>
<available property="jdk14.present" classname="java.lang.CharSequence"/>
<fail message="${Name} requires at least Java 1.4!" unless="jdk14.present"/>
- <available property="junit.present" classname="junit.framework.TestCase" classpathref="libs-tools-build-classpath"/>
+ <available property="junit.present" classname="org.junit.Test" classpathref="libs-tools-build-classpath"/>
<condition property="junit.message" value="JUnit Support PRESENT">
<equals arg1="${junit.present}" arg2="true"/>
</condition>
Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Tue Oct 4 10:09:01 2011
@@ -60,6 +60,9 @@
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="51928" due-to="Mehdi Houshmand">
+ Upgraded all tests to JUnit 4.
+ </action>
<action context="Fonts" dev="PH" type="fix" fixes-bug="48696">
Bugfix for color model in IOCA IDE structure parameter for 4- and 8-bit grayscale images.
Revision 4.
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.InputStream;
@@ -26,6 +28,7 @@ import org.apache.batik.transcoder.Trans
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.junit.Test;
/**
* Basic runtime test for FOP's transcoders. It is used to verify that
@@ -34,13 +37,6 @@ import org.apache.commons.io.output.Byte
public abstract class AbstractBasicTranscoderTestCase extends AbstractFOPTestCase {
/**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public AbstractBasicTranscoderTestCase(String name) {
- super(name);
- }
-
- /**
* Creates the transcoder to test.
* @return the newly instantiated transcoder
*/
@@ -51,6 +47,7 @@ public abstract class AbstractBasicTrans
* Without special configuration stuff.
* @throws Exception if a problem occurs
*/
+ @Test
public void testGenericPDFTranscoder() throws Exception {
//Create transcoder
Transcoder transcoder = createTranscoder();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/AbstractFOPTestCase.java Tue Oct 4 10:09:01 2011
@@ -21,25 +21,16 @@ package org.apache.fop;
import java.io.File;
-import junit.framework.TestCase;
-
/**
* Abstract base test class for FOP's tests.
*/
-public abstract class AbstractFOPTestCase extends TestCase {
-
- /**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public AbstractFOPTestCase(String name) {
- super(name);
- }
+public abstract class AbstractFOPTestCase {
/**
* Returns the base directory to use for the tests.
* @return the base directory
*/
- protected File getBaseDir() {
+ protected static File getBaseDir() {
String basedir = System.getProperty("basedir");
if (basedir != null) {
return new File(basedir);
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=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import javax.xml.transform.Result;
@@ -34,6 +36,7 @@ import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.cli.InputHandler;
+import org.junit.Test;
/**
* Basic runtime test for the old Fop class. It is used to verify that
@@ -44,16 +47,10 @@ public class BasicDriverTestCase extends
private FopFactory fopFactory = FopFactory.newInstance();
/**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public BasicDriverTestCase(String name) {
- super(name);
- }
-
- /**
* Tests Fop with JAXP and OutputStream generating PDF.
* @throws Exception if anything fails
*/
+ @Test
public void testFO2PDFWithJAXP() throws Exception {
FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
File foFile = new File(getBaseDir(), "test/xml/bugtests/block.fo");
@@ -73,6 +70,7 @@ public class BasicDriverTestCase extends
* Tests Fop with JAXP and OutputStream generating PostScript.
* @throws Exception if anything fails
*/
+ @Test
public void testFO2PSWithJAXP() throws Exception {
FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
File foFile = new File(getBaseDir(), "test/xml/bugtests/block.fo");
@@ -92,6 +90,7 @@ public class BasicDriverTestCase extends
* Tests Fop with JAXP and OutputStream generating RTF.
* @throws Exception if anything fails
*/
+ @Test
public void testFO2RTFWithJAXP() throws Exception {
FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
File foFile = new File(getBaseDir(), "test/xml/bugtests/block.fo");
@@ -111,6 +110,7 @@ public class BasicDriverTestCase extends
* Tests Fop with XsltInputHandler and OutputStream.
* @throws Exception if anything fails
*/
+ @Test
public void testFO2PDFWithXSLTInputHandler() throws Exception {
FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
File xmlFile = new File(getBaseDir(), "test/xml/1.xml");
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicDriverTestSuite.java Tue Oct 4 10:09:01 2011
@@ -19,24 +19,14 @@
package org.apache.fop;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/**
* Test suite for basic functionality of FOP's Driver API.
*/
+@RunWith(Suite.class)
+@SuiteClasses({ BasicDriverTestCase.class })
public class BasicDriverTestSuite {
-
- /**
- * Builds the test suite
- * @return the test suite
- */
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Basic functionality test suite for FOP's Driver API");
- //$JUnit-BEGIN$
- suite.addTest(new TestSuite(BasicDriverTestCase.class));
- //$JUnit-END$
- return suite;
- }
}
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=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java Tue Oct 4 10:09:01 2011
@@ -28,16 +28,7 @@ import org.apache.fop.svg.PDFTranscoder;
*/
public class BasicPDFTranscoderTestCase extends AbstractBasicTranscoderTestCase {
- /**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public BasicPDFTranscoderTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.AbstractBasicTranscoderTestCase#createTranscoder()
- */
+ @Override
protected Transcoder createTranscoder() {
return new PDFTranscoder();
}
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=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicPSTranscoderTestCase.java Tue Oct 4 10:09:01 2011
@@ -28,16 +28,7 @@ import org.apache.fop.render.ps.PSTransc
*/
public class BasicPSTranscoderTestCase extends AbstractBasicTranscoderTestCase {
- /**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public BasicPSTranscoderTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.AbstractBasicTranscoderTestCase#createTranscoder()
- */
+ @Override
protected Transcoder createTranscoder() {
return new PSTranscoder();
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicTranscoderTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicTranscoderTestSuite.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicTranscoderTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/BasicTranscoderTestSuite.java Tue Oct 4 10:09:01 2011
@@ -19,25 +19,17 @@
package org.apache.fop;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/**
* Test suite for basic functionality of FOP's transcoders.
*/
+@RunWith(Suite.class)
+@SuiteClasses({
+ BasicPDFTranscoderTestCase.class,
+ BasicPSTranscoderTestCase.class
+})
public class BasicTranscoderTestSuite {
-
- /**
- * Builds the test suite
- * @return the test suite
- */
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Basic functionality test suite for FOP's transcoders");
- //$JUnit-BEGIN$
- suite.addTest(new TestSuite(BasicPDFTranscoderTestCase.class));
- suite.addTest(new TestSuite(BasicPSTranscoderTestCase.class));
- //$JUnit-END$
- return suite;
- }
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/DigestFilterTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop;
+import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.io.StringReader;
import java.security.NoSuchAlgorithmException;
@@ -26,9 +28,9 @@ import java.security.NoSuchAlgorithmExce
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.TestCase;
-
import org.apache.fop.util.DigestFilter;
+import org.junit.Before;
+import org.junit.Test;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -37,12 +39,12 @@ import org.xml.sax.XMLReader;
* Test case for digesting SAX filter.
*
*/
-public class DigestFilterTestCase extends TestCase {
+public class DigestFilterTestCase {
private SAXParserFactory parserFactory;
- /** @see junit.framework.TestCase#setUp() */
- protected void setUp() {
+ @Before
+ public void setUp() {
parserFactory = SAXParserFactory.newInstance();
parserFactory.setNamespaceAware(true);
}
@@ -95,6 +97,7 @@ public class DigestFilterTestCase extend
return digestFilter.getDigestValue();
}
+ @Test
public final void testLineFeed()
throws
NoSuchAlgorithmException,
@@ -111,6 +114,7 @@ public class DigestFilterTestCase extend
compareDigest(lfDigest, crlfDigest));
}
+ @Test
public final void testAttributeOrder()
throws
NoSuchAlgorithmException,
@@ -134,6 +138,7 @@ public class DigestFilterTestCase extend
compareDigest(sortDigest, reverseDigest));
}
+ @Test
public final void testNamespacePrefix()
throws
NoSuchAlgorithmException,
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=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/GenericFOPTestCase.java Tue Oct 4 10:09:01 2011
@@ -18,6 +18,7 @@
/* $Id$ */
package org.apache.fop;
+import static org.junit.Assert.fail;
import java.io.ByteArrayOutputStream;
import java.io.StringReader;
@@ -27,10 +28,8 @@ import java.util.Date;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
+import org.junit.Before;
+import org.junit.Test;
import org.xml.sax.InputSource;
import org.apache.fop.apps.FOUserAgent;
@@ -47,33 +46,20 @@ import org.apache.fop.util.DigestFilter;
* PDF currently supported) and a MD5 for the result.
*
*/
-public final class GenericFOPTestCase extends TestCase {
+public final class GenericFOPTestCase {
// configure fopFactory as desired
private FopFactory fopFactory = FopFactory.newInstance();
- protected SAXParserFactory parserFactory;
-
- public static Test suite() {
- TestSuite suite = new TestSuite(GenericFOPTestCase.class);
- suite.setName("Fop regression tests");
- return suite;
- }
-
- /**
- * Constructor for FopTest.
- * @param name the name of the test suite
- */
- public GenericFOPTestCase(String name) {
- super(name);
- }
+ private SAXParserFactory parserFactory;
- /** @see junit.framework.TestCase#setUp() */
- protected void setUp() throws Exception {
+ @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";
@@ -119,8 +105,7 @@ public final class GenericFOPTestCase ex
FOUserAgent foUserAgent = fopFactory.newFOUserAgent();
foUserAgent.setCreationDate(new Date(10000));
MessageDigest outDigest = MessageDigest.getInstance("MD5");
- DigestOutputStream out
- = new DigestOutputStream(new ByteArrayOutputStream(), outDigest);
+ 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");
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/KnuthAlgorithmTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop;
+import static org.junit.Assert.assertEquals;
+
import java.util.List;
import org.apache.fop.layoutmgr.BlockKnuthSequence;
@@ -28,17 +30,16 @@ import org.apache.fop.layoutmgr.KnuthBox
import org.apache.fop.layoutmgr.KnuthGlue;
import org.apache.fop.layoutmgr.KnuthPenalty;
import org.apache.fop.layoutmgr.KnuthSequence;
-
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests the Knuth algorithm implementation.
*/
-public class KnuthAlgorithmTestCase extends TestCase {
+public class KnuthAlgorithmTestCase {
- /** @see junit.framework.TestCase#setUp() */
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() {
DebugHelper.registerStandardElementListObservers();
}
@@ -67,6 +68,7 @@ public class KnuthAlgorithmTestCase exte
* possibility.
* @throws Exception if an error occurs
*/
+ @Test
public void test1() throws Exception {
MyBreakingAlgorithm algo = new MyBreakingAlgorithm(0, 0, true, true, 0);
algo.setConstantLineWidth(30000);
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=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/StandardTestSuite.java Tue Oct 4 10:09:01 2011
@@ -19,8 +19,9 @@
package org.apache.fop;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+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.parser.MODCAParserTestCase;
@@ -36,6 +37,7 @@ import org.apache.fop.render.pdf.PDFACon
import org.apache.fop.render.pdf.PDFCMapTestCase;
import org.apache.fop.render.pdf.PDFEncodingTestCase;
import org.apache.fop.render.pdf.PDFsRGBSettingsTestCase;
+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;
@@ -43,37 +45,30 @@ import org.apache.fop.traits.MinOptMaxTe
/**
* Test suite for basic functionality of FOP.
*/
+@RunWith(Suite.class)
+@SuiteClasses({
+ BasicDriverTestSuite.class,
+ UtilityCodeTestSuite.class,
+ PDFAConformanceTestCase.class,
+ PDFEncodingTestCase.class,
+ PDFCMapTestCase.class,
+ PDFsRGBSettingsTestCase.class,
+ DejaVuLGCSerifTest.class,
+ RichTextFormatTestSuite.class,
+ ImageLoaderTestCase.class,
+ ImagePreloaderTestCase.class,
+ IFMimickingTestCase.class,
+ PageBoundariesTest.class,
+ PageScaleTest.class,
+ org.apache.fop.afp.AFPTestSuite.class,
+ GlyfTableTestCase.class,
+ ViewportTestSuite.class,
+ RenderPDFTestSuite.class,
+ MODCAParserTestCase.class,
+ CharactersetEncoderTest.class,
+ org.apache.fop.render.afp.AFPTestSuite.class,
+ PSTestSuite.class,
+ MinOptMaxTest.class
+})
public class StandardTestSuite {
-
- /**
- * Builds the test suite
- * @return the test suite
- */
- public static Test suite() {
- TestSuite suite = new TestSuite("Basic functionality test suite for FOP");
- //$JUnit-BEGIN$
- suite.addTest(BasicDriverTestSuite.suite());
- suite.addTest(UtilityCodeTestSuite.suite());
- suite.addTest(org.apache.fop.afp.AFPTestSuite.suite());
- suite.addTest(new TestSuite(PDFAConformanceTestCase.class));
- suite.addTest(new TestSuite(PDFEncodingTestCase.class));
- suite.addTest(new TestSuite(PDFCMapTestCase.class));
- suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
- suite.addTest(new TestSuite(DejaVuLGCSerifTest.class));
- suite.addTest(new TestSuite(MODCAParserTestCase.class));
- suite.addTest(new TestSuite(CharactersetEncoderTest.class));
- suite.addTest(org.apache.fop.render.afp.AFPTestSuite.suite());
- suite.addTest(PSTestSuite.suite());
- suite.addTest(new TestSuite(GlyfTableTestCase.class));
- suite.addTest(RichTextFormatTestSuite.suite());
- suite.addTest(new TestSuite(ImageLoaderTestCase.class));
- suite.addTest(new TestSuite(ImagePreloaderTestCase.class));
- suite.addTest(new TestSuite(IFMimickingTestCase.class));
- suite.addTest(new TestSuite(PageBoundariesTest.class));
- suite.addTest(new TestSuite(PageScaleTest.class));
- suite.addTest(new TestSuite(MinOptMaxTest.class));
- suite.addTest(ViewportTestSuite.suite());
- //$JUnit-END$
- return suite;
- }
}
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=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,9 @@
package org.apache.fop;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.OutputStream;
@@ -36,19 +39,19 @@ import javax.xml.transform.sax.Transform
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.w3c.dom.Document;
-
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.xpath.XPathAPI;
-import org.apache.xpath.objects.XObject;
-
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.apps.MimeConstants;
import org.apache.fop.render.xml.XMLRenderer;
+import org.apache.xpath.XPathAPI;
+import org.apache.xpath.objects.XObject;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
/**
* Tests URI resolution facilities.
@@ -61,11 +64,10 @@ public class URIResolutionTestCase exten
private SAXTransformerFactory tfactory
= (SAXTransformerFactory)SAXTransformerFactory.newInstance();
- private File backupDir = new File(getBaseDir(), "build/test-results");
+ private final static File backupDir = new File(getBaseDir(), "build/test-results");
- /** @see junit.framework.TestCase#TestCase(String) */
- public URIResolutionTestCase(String name) {
- super(name);
+ @BeforeClass
+ public static void makeDirs() {
backupDir.mkdirs();
}
@@ -73,6 +75,7 @@ public class URIResolutionTestCase exten
* Test custom URI resolution with a hand-written URIResolver.
* @throws Exception if anything fails
*/
+ @Test
public void testFO1a() throws Exception {
innerTestFO1(false);
}
@@ -81,6 +84,7 @@ public class URIResolutionTestCase exten
* Test custom URI resolution with a hand-written URIResolver.
* @throws Exception if anything fails
*/
+ @Test
public void testFO1b() throws Exception {
innerTestFO1(true);
}
@@ -112,7 +116,8 @@ public class URIResolutionTestCase exten
* Test custom URI resolution with a hand-written URIResolver.
* @throws Exception if anything fails
*/
- public void DISABLEDtestFO2() throws Exception {
+ @Test
+ public void testFO2() throws Exception {
//TODO This will only work when we can do URI resolution inside Batik!
File foFile = new File(getBaseDir(), "test/xml/uri-resolution2.fo");
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/UtilityCodeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/UtilityCodeTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/UtilityCodeTestSuite.java Tue Oct 4 10:09:01 2011
@@ -19,8 +19,9 @@
package org.apache.fop;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
import org.apache.fop.events.BasicEventTestCase;
import org.apache.fop.pdf.FileIDGeneratorTestCase;
@@ -37,29 +38,20 @@ import org.apache.fop.util.XMLResourceBu
/**
* Test suite for FOP's utility classes.
*/
+@RunWith(Suite.class)
+@SuiteClasses({
+ PDFNumberTestCase.class,
+ PDFObjectTestCase.class,
+ ColorUtilTestCase.class,
+ BorderPropsTestCase.class,
+ ElementListUtilsTestCase.class,
+ BasicEventTestCase.class,
+ XMLResourceBundleTestCase.class,
+ URIResolutionTestCase.class,
+ FileIDGeneratorTestCase.class,
+ PDFFactoryTestCase.class,
+ PDFEncryptionJCETestCase.class,
+ BitmapImageUtilTestCase.class
+})
public class UtilityCodeTestSuite {
-
- /**
- * Builds the test suite
- * @return the test suite
- */
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test suite for FOP's utility classes");
- //$JUnit-BEGIN$
- suite.addTest(new TestSuite(PDFNumberTestCase.class));
- suite.addTest(new TestSuite(PDFObjectTestCase.class));
- suite.addTest(FileIDGeneratorTestCase.suite());
- suite.addTest(new TestSuite(PDFFactoryTestCase.class));
- suite.addTest(new TestSuite(ColorUtilTestCase.class));
- suite.addTest(new TestSuite(BorderPropsTestCase.class));
- suite.addTest(new TestSuite(ElementListUtilsTestCase.class));
- suite.addTest(new TestSuite(BasicEventTestCase.class));
- suite.addTest(new TestSuite(XMLResourceBundleTestCase.class));
- suite.addTest(new TestSuite(URIResolutionTestCase.class));
- suite.addTest(new TestSuite(BitmapImageUtilTestCase.class));
- suite.addTest(new TestSuite(PDFEncryptionJCETestCase.class));
- //$JUnit-END$
- return suite;
- }
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPResourceUtilTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,20 +19,20 @@
package org.apache.fop.afp;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.util.Arrays;
-import junit.framework.TestCase;
-
import org.apache.commons.io.IOUtils;
-
import org.apache.fop.afp.util.AFPResourceUtil;
+import org.junit.Test;
/**
* Tests the {@link AFPResourceUtil} class.
*/
-public class AFPResourceUtilTestCase extends TestCase {
+public class AFPResourceUtilTestCase {
private static final String RESOURCE_FILENAME = "expected_resource.afp";
@@ -44,6 +44,7 @@ public class AFPResourceUtilTestCase ex
* Tests copyResourceFile()
* @throws Exception -
*/
+ @Test
public void testCopyResourceFile() throws Exception {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -74,6 +75,7 @@ public class AFPResourceUtilTestCase ex
* Tests copyNamedResource()
* @throws Exception -
*/
+ @Test
public void testCopyNamedResource() throws Exception {
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPTestSuite.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/AFPTestSuite.java Tue Oct 4 10:09:01 2011
@@ -19,27 +19,18 @@
package org.apache.fop.afp;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.apache.fop.afp.modca.AbstractStructuredObjectTestCase;
-import org.apache.fop.afp.modca.AbstractTripletStructuredObjectTestCase;
import org.apache.fop.afp.modca.IncludeObjectTestCase;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/**
* Test suite for FOP's AFP classes.
*/
+@RunWith(Suite.class)
+@SuiteClasses({
+ IncludeObjectTestCase.class,
+ AFPResourceUtilTestCase.class
+})
public class AFPTestSuite {
- /**
- * Builds the test suite
- * @return the test suite
- */
- public static Test suite() {
- TestSuite suite = new TestSuite("Test suite for FOP's AFP classes");
- //$JUnit-BEGIN$
- suite.addTest(new TestSuite(IncludeObjectTestCase.class));
- suite.addTest(new TestSuite(AFPResourceUtilTestCase.class));
- //$JUnit-END$
- return suite;
- }
}
Modified: 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/CharactersetEncoderTest.java?rev=1178747&r1=1178746&r2=1178747&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/CharactersetEncoderTest.java Tue Oct 4 10:09:01 2011
@@ -19,19 +19,25 @@
package org.apache.fop.afp.fonts;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.CharacterCodingException;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test {@link CharactersetEncoder}
*/
-public class CharactersetEncoderTest extends TestCase {
+public class CharactersetEncoderTest {
private CharactersetEncoder singlebyteEncoder;
private CharactersetEncoder doublebyteEncoder;
+ @Before
public void setUp() {
singlebyteEncoder = CharactersetEncoder.newInstance("cp500", false);
doublebyteEncoder = CharactersetEncoder.newInstance("cp937", true);
@@ -71,6 +77,7 @@ public class CharactersetEncoderTest ext
/**
* Tests canEncode() - tests that canEncode() responds properly to various input characters.
*/
+ @Test
public void testCanEncode() {
// Both SBCS and DBCS should support Latin characters
for (char c = '!'; c < '~'; c++) {
@@ -86,6 +93,7 @@ public class CharactersetEncoderTest ext
assertFalse(doublebyteEncoder.canEncode('\u00BB'));
}
+ @Test
public void testEncode() throws CharacterCodingException, IOException {
CharactersetEncoder.EncodedChars encChars;// = doublebyteEncoder.encode(testCJKText);
ByteArrayOutputStream bOut = new ByteArrayOutputStream();
Modified: 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/AbstractAFPObjectTestCase.java?rev=1178747&r1=1178746&r2=1178747&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/AbstractAFPObjectTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,10 @@
package org.apache.fop.afp.modca;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -26,15 +30,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.fop.afp.Streamable;
+import org.junit.Test;
/**
* Tests the {@link AbstractAFPObject} class.
*/
-public abstract class AbstractAFPObjectTestCase<S extends AbstractAFPObject>
- extends TestCase {
+public abstract class AbstractAFPObjectTestCase<S extends AbstractAFPObject> {
private S sut;
@@ -61,7 +63,7 @@ public abstract class AbstractAFPObject
0x00 // Reserved
};
-
+ @Test
public void testCopySFStatic() {
byte[] actual = new byte[9];
Arrays.fill(actual, (byte)-1);
@@ -85,6 +87,7 @@ public abstract class AbstractAFPObject
assertTrue(Arrays.equals(actual, expected2));
}
+ @Test
public void testCopySF() {
byte[] expected = new byte[9];
S.copySF(expected, (byte) 0xD3, (byte)0, (byte)0);
@@ -112,6 +115,7 @@ public abstract class AbstractAFPObject
/**
*
*/
+ @Test
public void testwriteObjects() {
final byte[][] expected = {{(byte)0, (byte)1}, {(byte)2, (byte)3}, {(byte)4, (byte)5}};
@@ -144,6 +148,7 @@ public abstract class AbstractAFPObject
/**
*
*/
+ @Test
public void testTruncate() {
String expected = "abc";
assertTrue(AbstractAFPObject.truncate(expected, 4) == expected);
@@ -161,6 +166,7 @@ public abstract class AbstractAFPObject
/**
*
*/
+ @Test
public void testWriteChunksToStream() throws IOException {
final byte[] data = new byte[256];
int counter = 0;
Modified: 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/AbstractNamedAFPObjectTestCase.java?rev=1178747&r1=1178746&r2=1178747&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/AbstractNamedAFPObjectTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,14 +19,18 @@
package org.apache.fop.afp.modca;
+import static org.junit.Assert.assertTrue;
+
import java.util.Arrays;
+import org.junit.Test;
+
/**
* Tests the {@linkplain AbstractAFPObject} class.
*/
public abstract class AbstractNamedAFPObjectTestCase<S extends AbstractNamedAFPObject>
extends AbstractAFPObjectTestCase<S> {
-
+ @Test
public void testCopySF() {
final S sut = getSut();
Modified: 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/AbstractTripletStructuredObjectTestCase.java?rev=1178747&r1=1178746&r2=1178747&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/AbstractTripletStructuredObjectTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,10 @@
package org.apache.fop.afp.modca;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
@@ -31,6 +35,7 @@ import org.apache.fop.afp.modca.triplets
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}
@@ -55,10 +60,8 @@ public abstract class AbstractTripletStr
private AbstractTripletStructuredObject emptyStructuredObject
= new AbstractTripletStructuredObject() { };
- @Override
+ @Before
public void setUp() throws Exception {
- super.setUp();
-
AbstractTripletStructuredObject sut = getSut();
for (AbstractTriplet triplet : TRIPLETS) {
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,27 +19,31 @@
package org.apache.fop.afp.modca;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Arrays;
import org.apache.fop.afp.util.BinaryUtils;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test {@link IncludeObject}
*/
public class IncludeObjectTestCase extends AbstractNamedAFPObjectTestCase<IncludeObject> {
- @Override
+ @Before
public void setUp() throws Exception {
setSut(new IncludeObject("8__chars"));
- super.setUp();
}
/**
* Test writeToStream()
* @throws IOException -
*/
+ @Test
public void testWriteToStream() throws IOException {
final IncludeObject sut = getSut();
@@ -53,6 +57,7 @@ public class IncludeObjectTestCase exten
* handed with a 180 x-axis
* @throws IOException -
*/
+ @Test
public void testWriteToStreamForOrientation() throws IOException {
final IncludeObject sut = getSut();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/afp/parser/MODCAParserTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,18 +19,23 @@
package org.apache.fop.afp.parser;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.EOFException;
import java.io.InputStream;
import java.util.Arrays;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* MODCAParser and MODCAParser.UnparsedStructuredField Unit tests
*/
-public class MODCAParserTestCase extends TestCase {
+public class MODCAParserTestCase {
/** The carriage control character (0x5A) used to indicate the start of a structured field. */
public static final byte CARRIAGE_CONTROL_CHAR = (byte)0x5A;
@@ -47,6 +52,7 @@ public class MODCAParserTestCase extends
*
* @throws Exception *
*/
+ @Test
public void testReadNextStructuredField1() throws Exception {
// carriage control (0x5A) delimits structured fields,
@@ -87,6 +93,7 @@ public class MODCAParserTestCase extends
*
* @throws Exception *
*/
+ @Test
public void testReadNextStructuredField2() throws Exception {
// no extension data
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,12 +19,14 @@
package org.apache.fop.area;
+import org.junit.Test;
/**
* Tests the {@linkplain BlockViewport} class.
*/
public class BlockViewportTestCase extends ViewportTestCase {
+ @Test
public void testNonClip() throws Exception {
BlockViewport bv = new BlockViewport();
bv.setIPD(100);
@@ -32,6 +34,7 @@ public class BlockViewportTestCase exten
checkNonClip(bv);
}
+ @Test
public void testClip() throws Exception {
BlockViewport bv = new BlockViewport();
int ipd = 100;
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -22,6 +22,8 @@ package org.apache.fop.area;
import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
+import org.junit.Test;
+
/**
* Tests the {@linkplain RegionViewport} class.
*/
@@ -35,11 +37,13 @@ public class RegionViewportTestCase exte
return viewport;
}
+ @Test
public void testNonClip() throws Exception {
RegionViewport viewport = createRegionViewport(10, 10, 100, 20);
checkNonClip(viewport);
}
+ @Test
public void testClip() throws Exception {
int ipd = 150;
int bpd = 20;
Modified: 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/ViewportTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,14 +19,17 @@
package org.apache.fop.area;
-import java.awt.Rectangle;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import java.awt.Rectangle;
/**
* Tests implementations of the {@linkplain Viewport} interface.
*/
-public abstract class ViewportTestCase extends TestCase {
+public abstract class ViewportTestCase {
protected void checkNonClip(Viewport v) throws Exception {
assertFalse(v.hasClip());
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/area/ViewportTestSuite.java Tue Oct 4 10:09:01 2011
@@ -19,29 +19,19 @@
package org.apache.fop.area;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import org.apache.fop.area.inline.InlineViewportTestCase;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/**
* A suite of all the tests relating to the {@linkplain Viewport} interface.
*/
+@RunWith(Suite.class)
+@SuiteClasses({
+ RegionViewportTestCase.class,
+ BlockViewportTestCase.class,
+ InlineViewportTestCase.class
+})
public final class ViewportTestSuite {
-
- private ViewportTestSuite() { }
-
- /**
- * Returns the suite of {@linkplain Viewport} implementation tests.
- *
- * @return the tests
- */
- public static Test suite() {
- TestSuite suite = new TestSuite("Tests for viewport-areas");
- suite.addTestSuite(RegionViewportTestCase.class);
- suite.addTestSuite(BlockViewportTestCase.class);
- suite.addTestSuite(InlineViewportTestCase.class);
- return suite;
- }
-
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -20,12 +20,14 @@
package org.apache.fop.area.inline;
import org.apache.fop.area.ViewportTestCase;
+import org.junit.Test;
/**
* Tests the {@linkplain InlineViewport} class.
*/
public class InlineViewportTestCase extends ViewportTestCase {
+ @Test
public void testNonClip() throws Exception {
InlineViewport v = new InlineViewport(null);
v.setIPD(50);
@@ -33,6 +35,7 @@ public class InlineViewportTestCase exte
checkNonClip(v);
}
+ @Test
public void testClip() throws Exception {
InlineViewport v = new InlineViewport(null);
int ipd = 50;
Modified: 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/BaseConstructiveUserConfigTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,19 +19,20 @@
package org.apache.fop.config;
-public abstract class BaseConstructiveUserConfigTestCase extends BaseUserConfigTestCase {
+import static org.junit.Assert.fail;
- /**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public BaseConstructiveUserConfigTestCase(String name) {
- super(name);
- }
+import org.junit.Test;
+
+/**
+ * Super class of several user config cases.
+ */
+public abstract class BaseConstructiveUserConfigTestCase extends BaseUserConfigTestCase {
/**
* Test using a standard FOP font
* @throws Exception checkstyle wants a comment here, even a silly one
*/
+ @Test
public void testUserConfig() throws Exception {
try {
initConfig();
Modified: 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/BaseDestructiveUserConfigTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,18 +19,21 @@
package org.apache.fop.config;
+import static org.junit.Assert.fail;
+
import org.apache.fop.apps.FOPException;
+import org.junit.Test;
+/**
+ * Super class for several user configuration failure cases.
+ */
public abstract class BaseDestructiveUserConfigTestCase extends BaseUserConfigTestCase {
/**
- * @see junit.framework.TestCase#TestCase(String)
+ * Test the user configuration failure.
*/
- public BaseDestructiveUserConfigTestCase(String name) {
- super(name);
- }
-
- public void testUserConfig() throws Exception {
+ @Test
+ public void testUserConfig() {
try {
initConfig();
convertFO();
Modified: 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/BaseUserConfigTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Tue Oct 4 10:09:01 2011
@@ -23,16 +23,14 @@ import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
-import org.xml.sax.SAXException;
-
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
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.xml.sax.SAXException;
/**
* Basic runtime test for FOP's font configuration. It is used to verify that
@@ -47,13 +45,6 @@ public abstract class BaseUserConfigTest
/**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public BaseUserConfigTestCase(String name) {
- super(name);
- }
-
- /**
* @see org.apache.fop.render.pdf.BasePDFTestCase#init()
*/
protected void init() {
@@ -102,8 +93,8 @@ public abstract class BaseUserConfigTest
*/
protected abstract String getUserConfigFilename();
- /*
- * @see junit.framework.TestCase#getName()
+ /**
+ * The name of this test.
*/
public String getName() {
return getUserConfigFilename();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FOURIResolverTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,21 +19,23 @@
package org.apache.fop.config;
-import java.net.MalformedURLException;
+import static org.junit.Assert.fail;
-import junit.framework.TestCase;
+import java.net.MalformedURLException;
import org.apache.fop.apps.FOURIResolver;
+import org.junit.Test;
/**
* This tests some aspects of the {@link FOURIResolver} class.
*/
-public class FOURIResolverTestCase extends TestCase {
+public class FOURIResolverTestCase {
/**
* Checks the {@link FOURIResolver#checkBaseURL(String)} method.
* @throws Exception if an error occurs
*/
+ @Test
public void testCheckBaseURI() throws Exception {
FOURIResolver resolver = new FOURIResolver(true);
System.out.println(resolver.checkBaseURL("./test/config"));
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,18 +19,12 @@
package org.apache.fop.config;
-/*
+/**
* this font is without a metrics-url or an embed-url
*/
public class FontAttributesMissingTestCase extends BaseDestructiveUserConfigTestCase {
- public FontAttributesMissingTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_font_attributes_missing.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,16 +19,12 @@
package org.apache.fop.config;
-/*
+/**
* This font base does not exist and a relative font path is used.
*/
public class FontBaseBadTestCase extends BaseDestructiveUserConfigTestCase {
- public FontBaseBadTestCase(String name) {
- super(name);
- }
-
- /** {@inheritDoc} */
+ @Override
public String getUserConfigFilename() {
return "test_fontbase_bad.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -24,13 +24,7 @@ package org.apache.fop.config;
*/
public class FontEmbedUrlBadTestCase extends BaseDestructiveUserConfigTestCase {
- public FontEmbedUrlBadTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_font_embedurl_bad.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -24,13 +24,7 @@ package org.apache.fop.config;
*/
public class FontEmbedUrlMalformedTestCase extends BaseDestructiveUserConfigTestCase {
- public FontEmbedUrlMalformedTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_font_embedurl_malformed.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,21 +19,12 @@
package org.apache.fop.config;
-/*
+/**
* this font has a metrics-url that does not exist on filesystem
*/
public class FontMetricsUrlBadTestCase extends BaseDestructiveUserConfigTestCase {
- /**
- * @see junit.framework.TestCase#TestCase(String)
- */
- public FontMetricsUrlBadTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_font_metricsurl_bad.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,18 +19,12 @@
package org.apache.fop.config;
-/*
+/**
* this font has a malformed metrics-url
*/
public class FontMetricsUrlMalformedTestCase extends BaseDestructiveUserConfigTestCase {
- public FontMetricsUrlMalformedTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_font_metricsurl_malformed.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,18 +19,12 @@
package org.apache.fop.config;
-/*
+/**
* this font has a missing font triplet attribute
*/
public class FontTripletAttributeMissingTestCase extends BaseDestructiveUserConfigTestCase {
- public FontTripletAttributeMissingTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_font_tripletattribute_missing.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -21,13 +21,7 @@ package org.apache.fop.config;
public class FontsAutoDetectTestCase extends BaseConstructiveUserConfigTestCase {
- public FontsAutoDetectTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_fonts_autodetect.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,23 +19,17 @@
package org.apache.fop.config;
-/*
+/**
* this font has a metrics-url that does not exist on filesystem
*/
public class FontsDirectoryBadTestCase extends BaseDestructiveUserConfigTestCase {
- public FontsDirectoryBadTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
public String getUserConfigFilename() {
return "test_fonts_directory_bad.xconf";
}
- /** get test FOP config File */
+ @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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -24,13 +24,7 @@ package org.apache.fop.config;
*/
public class FontsDirectoryRecursiveTestCase extends BaseConstructiveUserConfigTestCase {
- public FontsDirectoryRecursiveTestCase(String name) {
- super(name);
- }
-
- /**
- * @see org.apache.fop.config.BaseUserConfigTestCase#getUserConfigFilename()
- */
+ @Override
protected String getUserConfigFilename() {
return "test_fonts_directory_recursive.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -38,17 +38,7 @@ import org.apache.fop.render.PrintRender
public class FontsSubstitutionTestCase extends
BaseConstructiveUserConfigTestCase {
- /**
- * Main constructor
- * @param name test case name
- */
- public FontsSubstitutionTestCase(String name) {
- super(name);
- }
-
- /**
- * {@inheritDoc}
- */
+ @Override
protected byte[] convertFO(File foFile, FOUserAgent ua, boolean dumpPdfFile)
throws Exception {
PrintRenderer renderer = (PrintRenderer) ua.getRendererFactory()
@@ -72,9 +62,7 @@ public class FontsSubstitutionTestCase e
return null;
}
- /**
- * {@inheritDoc}
- */
+ @Override
public String getUserConfigFilename() {
return "test_fonts_substitution.xconf";
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,35 +19,26 @@
package org.apache.fop.config;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
/**
* Test suite for font configuration.
*/
+@RunWith(Suite.class)
+@SuiteClasses({
+ FontBaseBadTestCase.class,
+ FontAttributesMissingTestCase.class,
+ FontTripletAttributeMissingTestCase.class,
+ FontMetricsUrlBadTestCase.class,
+ FontEmbedUrlBadTestCase.class,
+ FontMetricsUrlMalformedTestCase.class,
+ FontMetricsUrlMalformedTestCase.class,
+ FontsDirectoryRecursiveTestCase.class,
+ FontsAutoDetectTestCase.class,
+ FontsSubstitutionTestCase.class,
+ FOURIResolverTestCase.class
+})
public class UserConfigTestSuite {
-
- /**
- * Builds the test suite
- * @return the test suite
- */
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Basic functionality test suite for user configuration");
- //$JUnit-BEGIN$
- suite.addTest(new TestSuite(FontBaseBadTestCase.class));
- suite.addTest(new TestSuite(FontAttributesMissingTestCase.class));
- suite.addTest(new TestSuite(FontTripletAttributeMissingTestCase.class));
- suite.addTest(new TestSuite(FontMetricsUrlBadTestCase.class));
- suite.addTest(new TestSuite(FontEmbedUrlBadTestCase.class));
- suite.addTest(new TestSuite(FontMetricsUrlMalformedTestCase.class));
- suite.addTest(new TestSuite(FontEmbedUrlMalformedTestCase.class));
- suite.addTest(new TestSuite(FontsDirectoryRecursiveTestCase.class));
- suite.addTest(new TestSuite(FontsAutoDetectTestCase.class));
- suite.addTest(new TestSuite(FontsSubstitutionTestCase.class));
- suite.addTest(new TestSuite(FOURIResolverTestCase.class));
- //$JUnit-END$
- return suite;
- }
-
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,13 +19,16 @@
package org.apache.fop.datatypes;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
/**
* Tests for URISpecification.
*/
-public class URISpecificationTestCase extends TestCase {
+public class URISpecificationTestCase {
+ @Test
public void testGetURL() throws Exception {
String actual;
@@ -42,6 +45,7 @@ public class URISpecificationTestCase ex
assertEquals("http://localhost/test", actual);
}
+ @Test
public void testEscapeURI() throws Exception {
String actual;
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/events/BasicEventTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/events/BasicEventTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/events/BasicEventTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/events/BasicEventTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,12 +19,18 @@
package org.apache.fop.events;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.fop.events.model.EventSeverity;
+import org.junit.Test;
-public class BasicEventTestCase extends TestCase {
+public class BasicEventTestCase {
+ @Test
public void testBasics() throws Exception {
MyEventListener listener = new MyEventListener();
@@ -54,6 +60,7 @@ public class BasicEventTestCase extends
broadcaster.broadcastEvent(ev);
}
+ @Test
public void testEventProducer() throws Exception {
MyEventListener listener = new MyEventListener();
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,12 +19,12 @@
package org.apache.fop.events;
-import junit.framework.Assert;
+import static org.junit.Assert.fail;
/**
* Class that checks that an expected event is produced, and only this one.
*/
-class EventChecker extends Assert implements EventListener {
+class EventChecker implements EventListener {
private final String expectedEventID;
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -29,14 +29,7 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
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.Fop;
@@ -47,11 +40,13 @@ 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.
*/
-public class EventProcessingTestCase extends TestCase {
+public class EventProcessingTestCase {
private final FopFactory fopFactory = FopFactory.newInstance();
@@ -59,8 +54,7 @@ public class EventProcessingTestCase ext
private final File basedir;
- public EventProcessingTestCase(String name) {
- super(name);
+ public EventProcessingTestCase() {
String base = System.getProperty("basedir");
if (base != null) {
basedir = new File(base);
@@ -81,45 +75,45 @@ public class EventProcessingTestCase ext
eventChecker.end();
}
+ @Test
public void testArea() throws FOPException, TransformerException {
doTest("area.fo",
AreaEventProducer.class.getName() + ".unresolvedIDReferenceOnPage");
}
+ @Test
public void testResource() throws FOPException, TransformerException {
doTest("resource.fo",
ResourceEventProducer.class.getName() + ".imageNotFound");
}
+ @Test
public void testValidation() throws FOPException, TransformerException {
doTest("validation.fo",
FOValidationEventProducer.class.getName() + ".invalidPropertyValue");
}
+ @Test
public void testTable() throws FOPException, TransformerException {
doTest("table.fo",
TableEventProducer.class.getName() + ".noTablePaddingWithCollapsingBorderModel");
}
+ @Test
public void testBlockLevel() throws FOPException, TransformerException {
doTest("block-level.fo",
BlockLevelEventProducer.class.getName() + ".overconstrainedAdjustEndIndent");
}
+ @Test
public void testInlineLevel() throws FOPException, TransformerException {
doTest("inline-level.fo",
InlineLevelEventProducer.class.getName() + ".lineOverflows");
}
+ @Test
public void testFont() throws FOPException, TransformerException {
doTest("font.fo",
FontEventProducer.class.getName() + ".fontSubstituted");
}
-
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(EventProcessingTestCase.class);
- return suite;
- }
}
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=1178747&r1=1178746&r2=1178747&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 Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop.fo.flow.table;
+import static org.junit.Assert.assertEquals;
+
import java.awt.Color;
import java.util.Iterator;
import java.util.List;
@@ -26,6 +28,7 @@ import java.util.List;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.FONode.FONodeIterator;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground.BorderInfo;
+import org.junit.Test;
/**
* A testcase for the resolution of collapsed borders in the FO tree, taking
@@ -130,6 +133,7 @@ public class CollapsedConditionalBorderT
(Color) resolvedBorder[1]);
}
+ @Test
public void testCollapsedConditionalBorders() throws Exception {
setUp("table/collapsed-conditional-borders.fo");
int tableNum = 0;
@@ -154,6 +158,7 @@ public class CollapsedConditionalBorderT
} while (tableIterator.hasNext());
}
+ @Test
public void testCollapsedConditionalBordersHeaderFooter() throws Exception {
setUp("table/collapsed-conditional-borders_header-footer.fo");
int tableNum = 0;
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop.fo.flow.table;
+import static org.junit.Assert.fail;
+
import org.apache.fop.fo.ValidationException;
/**
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java?rev=1178747&r1=1178746&r2=1178747&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java Tue Oct 4 10:09:01 2011
@@ -19,6 +19,8 @@
package org.apache.fop.fo.flow.table;
+import org.junit.Test;
+
/**
* Testcase checking that cells spanning further than their parent element aren't
* accepted.
@@ -29,18 +31,22 @@ public class IllegalRowSpanTestCase exte
super();
}
+ @Test
public void testBody1() throws Exception {
launchTest("table/illegal-row-span_body_1.fo");
}
+ @Test
public void testBody2() throws Exception {
launchTest("table/illegal-row-span_body_2.fo");
}
+ @Test
public void testHeader() throws Exception {
launchTest("table/illegal-row-span_header.fo");
}
+ @Test
public void testFooter() throws Exception {
launchTest("table/illegal-row-span_footer.fo");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org