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 [2/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...
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java (from r1198758, 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/ErrorCheckTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java&r1=1198758&r2=1198853&rev=1198853&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/ErrorCheckTest.java Mon Nov 7 18:18:29 2011
@@ -26,9 +26,9 @@ import org.apache.fop.fo.ValidationExcep
/**
* Abstract class for testing erroneous files, checking that a ValidationException is thrown.
*/
-abstract class ErrorCheckTestCase extends AbstractTableTestCase {
+abstract class ErrorCheckTest extends AbstractTableTest {
- public ErrorCheckTestCase() throws Exception {
+ public ErrorCheckTest() throws Exception {
super();
}
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=1198853&r1=1198852&r2=1198853&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 Mon Nov 7 18:18:29 2011
@@ -25,7 +25,7 @@ import org.junit.Test;
* Testcase checking that cells spanning further than their parent element aren't
* accepted.
*/
-public class IllegalRowSpanTestCase extends ErrorCheckTestCase {
+public class IllegalRowSpanTestCase extends ErrorCheckTest {
public IllegalRowSpanTestCase() throws Exception {
super();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java Mon Nov 7 18:18:29 2011
@@ -33,7 +33,7 @@ import org.junit.Test;
* Tests that RowGroupBuilder returns, for each part of a table, the expected number of
* row-groups with the expected number or rows in each.
*/
-public class RowGroupBuilderTestCase extends AbstractTableTestCase {
+public class RowGroupBuilderTestCase extends AbstractTableTest {
public RowGroupBuilderTestCase() throws Exception {
super();
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java Mon Nov 7 18:18:29 2011
@@ -28,7 +28,7 @@ import org.apache.fop.fo.FObj;
import org.junit.Test;
-public class TableColumnColumnNumberTestCase extends AbstractTableTestCase {
+public class TableColumnColumnNumberTestCase extends AbstractTableTest {
/**
* A percentBaseContext that mimics the behaviour of TableLM for computing the widths
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java Mon Nov 7 18:18:29 2011
@@ -21,7 +21,7 @@ package org.apache.fop.fo.flow.table;
import org.junit.Test;
-public class TooManyColumnsTestCase extends ErrorCheckTestCase {
+public class TooManyColumnsTestCase extends ErrorCheckTest {
public TooManyColumnsTestCase() throws Exception {
super();
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/DejaVuLGCSerifTestCase.java Mon Nov 7 18:18:29 2011
@@ -29,14 +29,14 @@ import org.junit.Test;
/**
*
*/
-public class DejaVuLGCSerifTest {
+public class DejaVuLGCSerifTestCase {
private FontResolver fontResolver = FontManager.createMinimalFontResolver();
private CustomFont font;
/**
* sets up the testcase by loading the DejaVu Font.
- *
+ *
* @throws Exception
* if the test fails.
*/
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fonts/EncodingModeTestCase.java Mon Nov 7 18:18:29 2011
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEqu
import org.junit.Test;
-public class EncodingModeTest {
+public class EncodingModeTestCase {
@Test
public void testGetName() {
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTester.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestCase.java Mon Nov 7 18:18:29 2011
@@ -49,7 +49,7 @@ import org.apache.fop.util.ConsoleEventL
* Test driver class for FO tree tests.
*/
@RunWith(Parameterized.class)
-public class FOTreeTester {
+public class FOTreeTestCase {
@BeforeClass
public static void registerElementListObservers() {
@@ -84,7 +84,7 @@ public class FOTreeTester {
*
* @param testFile the FO file to test
*/
- public FOTreeTester(File testFile) {
+ public FOTreeTestCase(File testFile) {
fopFactory.addElementMapping(new TestElementMapping());
this.testFile = testFile;
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java Mon Nov 7 18:18:29 2011
@@ -19,20 +19,25 @@
package org.apache.fop.fotreetest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
import org.apache.fop.fo.flow.table.CollapsedConditionalBorderTestCase;
import org.apache.fop.fo.flow.table.IllegalRowSpanTestCase;
import org.apache.fop.fo.flow.table.RowGroupBuilderTestCase;
import org.apache.fop.fo.flow.table.TableColumnColumnNumberTestCase;
import org.apache.fop.fo.flow.table.TooManyColumnsTestCase;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
/**
* JUnit test suit for running layout engine test under JUnit control.
*/
@RunWith(Suite.class)
-@Suite.SuiteClasses({ TooManyColumnsTestCase.class, IllegalRowSpanTestCase.class,
- RowGroupBuilderTestCase.class, TableColumnColumnNumberTestCase.class,
- CollapsedConditionalBorderTestCase.class, FOTreeTester.class })
+@Suite.SuiteClasses({
+ TooManyColumnsTestCase.class,
+ IllegalRowSpanTestCase.class,
+ RowGroupBuilderTestCase.class,
+ TableColumnColumnNumberTestCase.class,
+ CollapsedConditionalBorderTestCase.class,
+ FOTreeTestCase.class })
public final class FOTreeTestSuite {
}
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIFTest.java Mon Nov 7 18:18:29 2011
@@ -48,7 +48,7 @@ import org.apache.fop.render.intermediat
/**
* A common super-class for intermediate format test cases.
*/
-abstract class AbstractIFTestCase extends AbstractIntermediateTestCase {
+abstract class AbstractIFTest extends AbstractIntermediateTest {
private static final Schema IF_SCHEMA;
@@ -89,7 +89,7 @@ abstract class AbstractIFTestCase extend
* @param testFile the file containing the document and the tests
* @throws IOException if an I/O error occurs while loading the test case
*/
- public AbstractIFTestCase(File testFile) throws IOException {
+ public AbstractIFTest(File testFile) throws IOException {
super(testFile);
}
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AbstractIntermediateTest.java Mon Nov 7 18:18:29 2011
@@ -51,7 +51,7 @@ import org.apache.fop.util.ConsoleEventL
/**
* Abstract base class for intermediate format tests.
*/
-public abstract class AbstractIntermediateTestCase {
+public abstract class AbstractIntermediateTest {
/** the test environment */
protected static TestAssistant testAssistant = new TestAssistant();
@@ -76,7 +76,7 @@ public abstract class AbstractIntermedia
* @param testFile the test file to run
* @throws IOException if an I/O error occurs while loading the test case
*/
- public AbstractIntermediateTestCase(File testFile)
+ public AbstractIntermediateTest(File testFile)
throws IOException {
this.testFile = testFile;
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java Mon Nov 7 18:18:29 2011
@@ -53,7 +53,7 @@ import org.w3c.dom.Document;
* Tests the area tree parser.
*/
@RunWith(Parameterized.class)
-public class AreaTreeParserTestCase extends AbstractIntermediateTestCase {
+public class AreaTreeParserTestCase extends AbstractIntermediateTest {
/**
* Creates the parameters for this test.
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFParserTestCase.java Mon Nov 7 18:18:29 2011
@@ -46,7 +46,7 @@ import org.apache.fop.render.intermediat
* Tests the intermediate format parser.
*/
@RunWith(Parameterized.class)
-public class IFParserTestCase extends AbstractIFTestCase {
+public class IFParserTestCase extends AbstractIFTest {
/**
* Gets the parameters for this test
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/IFTestCase.java Mon Nov 7 18:18:29 2011
@@ -43,7 +43,7 @@ import org.w3c.dom.NodeList;
* Test case for the IF output.
*/
@RunWith(Parameterized.class)
-public class IFTestCase extends AbstractIFTestCase {
+public class IFTestCase extends AbstractIFTest {
/**
* Gets the files for this test.
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java Mon Nov 7 18:18:29 2011
@@ -70,7 +70,7 @@ import org.apache.fop.util.DelegatingCon
* files.
*/
@RunWith(Parameterized.class)
-public class LayoutEngineTester {
+public class LayoutEngineTestCase {
private static File areaTreeBackupDir;
@BeforeClass
@@ -108,7 +108,7 @@ public class LayoutEngineTester {
*
* @param testFile the test file
*/
- public LayoutEngineTester(File testFile) {
+ public LayoutEngineTestCase(File testFile) {
this.ifTester = new IFTester(tfactory, areaTreeBackupDir);
this.testFile = testFile;
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java Mon Nov 7 18:18:29 2011
@@ -27,6 +27,6 @@ import org.junit.runners.Suite.SuiteClas
* JUnit test suit for running layout engine test under JUnit control.
*/
@RunWith(Suite.class)
-@SuiteClasses({ LayoutEngineTester.class })
+@SuiteClasses({ LayoutEngineTestCase.class })
public class LayoutEngineTestSuite {
}
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/AbstractRenderingTest.java Mon Nov 7 18:18:29 2011
@@ -41,7 +41,7 @@ import org.apache.fop.apps.MimeConstants
/**
* Abstract base class for rendering (output) verification tests.
*/
-public abstract class AbstractRenderingTestCase {
+public abstract class AbstractRenderingTest {
private static final Map<String, String> MIME_MAP = new java.util.HashMap<String, String>();
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/RendererFactoryTestCase.java Mon Nov 7 18:18:29 2011
@@ -22,7 +22,10 @@ package org.apache.fop.render;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.Test;
+
import org.apache.commons.io.output.NullOutputStream;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.FopFactory;
@@ -34,12 +37,11 @@ import org.apache.fop.render.intermediat
import org.apache.fop.render.intermediate.IFRenderer;
import org.apache.fop.render.pdf.PDFDocumentHandler;
import org.apache.fop.render.rtf.RTFHandler;
-import org.junit.Test;
/**
* Tests for {@link RendererFactory}.
*/
-public class RendererFactoryTest {
+public class RendererFactoryTestCase {
@Test
public void testDocumentHandlerLevel() throws Exception {
@@ -51,7 +53,6 @@ public class RendererFactoryTest {
ua = fopFactory.newFOUserAgent();
handler = factory.createDocumentHandler(ua, MimeConstants.MIME_PDF);
- assertTrue(handler instanceof PDFDocumentHandler);
ua = fopFactory.newFOUserAgent();
overrideHandler = new PDFDocumentHandler();
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/AbstractAFPTest.java Mon Nov 7 18:18:29 2011
@@ -23,12 +23,12 @@ import java.io.File;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.render.AbstractRenderingTestCase;
+import org.apache.fop.render.AbstractRenderingTest;
/**
* Abstract base class for AFP verification tests.
*/
-abstract class AbstractAFPTestCase extends AbstractRenderingTestCase {
+abstract class AbstractAFPTest extends AbstractRenderingTest {
/**
* Renders a test file.
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/afp/NoOperationTestCase.java Mon Nov 7 18:18:29 2011
@@ -37,7 +37,7 @@ import org.junit.Test;
/**
* Tests generation of afp:no-operation (NOPs).
*/
-public class NoOperationTestCase extends AbstractAFPTestCase {
+public class NoOperationTestCase extends AbstractAFPTest {
/**
* Tests afp:no-operation.
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java Mon Nov 7 18:18:29 2011
@@ -31,7 +31,7 @@ import org.junit.Test;
/**
* Tests for the fox:bleed, fox:crop-offset, fox:crop-box extension properties.
*/
-public class PageBoundariesTest {
+public class PageBoundariesTestCase {
private static final Dimension TEST_AREA_SIZE = new Dimension(20000, 15000);
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java Mon Nov 7 18:18:29 2011
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
* Tests for the fox:scale extension property.
*/
-public class PageScaleTest {
+public class PageScaleTestCase {
/** 1 value is used for both x and y. */
@Test
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/BasePDFTest.java Mon Nov 7 18:18:29 2011
@@ -30,7 +30,7 @@ import javax.xml.transform.stream.Stream
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
-import org.apache.fop.AbstractFOPTestCase;
+import org.apache.fop.AbstractFOPTest;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
@@ -40,7 +40,7 @@ import org.xml.sax.SAXException;
/**
* Base class for automated tests that create PDF files
*/
-public class BasePDFTestCase extends AbstractFOPTestCase {
+public class BasePDFTest extends AbstractFOPTest {
/** the FopFactory */
protected final FopFactory fopFactory = FopFactory.newInstance();
@@ -51,7 +51,7 @@ public class BasePDFTestCase extends Abs
/**
* Main constructor
*/
- protected BasePDFTestCase() {
+ protected BasePDFTest() {
init();
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java Mon Nov 7 18:18:29 2011
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
* Tests PDF/A-1 functionality.
*/
-public class PDFAConformanceTestCase extends BasePDFTestCase {
+public class PDFAConformanceTestCase extends BasePDFTest {
private File foBaseDir = new File("test/xml/pdf-a");
private boolean dumpPDF = Boolean.getBoolean("PDFAConformanceTestCase.dumpPDF");
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java Mon Nov 7 18:18:29 2011
@@ -31,7 +31,7 @@ import org.junit.Ignore;
import org.junit.Test;
/** Test that characters are correctly encoded in a generated PDF file */
-public class PDFEncodingTestCase extends BasePDFTestCase {
+public class PDFEncodingTestCase extends BasePDFTest {
private File foBaseDir = new File("test/xml/pdf-encoding");
private final boolean dumpPDF = Boolean.getBoolean("PDFEncodingTestCase.dumpPDF");
static final String INPUT_FILE = "test/xml/pdf-encoding/pdf-encoding-test.xconf";
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFsRGBSettingsTestCase.java Mon Nov 7 18:18:29 2011
@@ -29,7 +29,7 @@ import org.junit.Test;
/**
* Tests the disables-srgb-colorspace setting.
*/
-public class PDFsRGBSettingsTestCase extends BasePDFTestCase {
+public class PDFsRGBSettingsTestCase extends BasePDFTest {
private File foBaseDir = new File("test/xml/pdf-a");
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/AbstractPostScriptTest.java Mon Nov 7 18:18:29 2011
@@ -33,12 +33,12 @@ import org.apache.xmlgraphics.ps.dsc.eve
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.render.AbstractRenderingTestCase;
+import org.apache.fop.render.AbstractRenderingTest;
/**
* Abstract base class for PostScript verification tests.
*/
-public abstract class AbstractPostScriptTestCase extends AbstractRenderingTestCase {
+public abstract class AbstractPostScriptTest extends AbstractRenderingTest {
/**
* Renders a test file.
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ImageHandlingTestCase.java Mon Nov 7 18:18:29 2011
@@ -25,9 +25,10 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import org.junit.Test;
+
import org.apache.commons.io.IOUtils;
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.render.intermediate.IFContext;
+
import org.apache.xmlgraphics.ps.DSCConstants;
import org.apache.xmlgraphics.ps.PSResource;
import org.apache.xmlgraphics.ps.dsc.DSCException;
@@ -36,12 +37,14 @@ import org.apache.xmlgraphics.ps.dsc.eve
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentPages;
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentTitle;
import org.apache.xmlgraphics.ps.dsc.events.DSCEvent;
-import org.junit.Test;
+
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.render.intermediate.IFContext;
/**
* Tests the image handling in PostScript output.
*/
-public class ImageHandlingTestCase extends AbstractPostScriptTestCase {
+public class ImageHandlingTestCase extends AbstractPostScriptTest {
/**
* Tests JPEG handling.
@@ -71,7 +74,8 @@ public class ImageHandlingTestCase exten
ua.setDocumentHandlerOverride(handler);
// Prepare output file
- File outputFile = renderFile(ua, "ps-jpeg-image.fo", "-if-l" + psUtil.getLanguageLevel());
+ File outputFile = renderFile(ua, "ps-jpeg-image.fo",
+ "-if-l" + psUtil.getLanguageLevel());
verifyPostScriptFile(outputFile, psUtil.getLanguageLevel());
}
Modified: xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java?rev=1198853&r1=1198852&r2=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/render/ps/ResourceOptimizationTestCase.java Mon Nov 7 18:18:29 2011
@@ -31,9 +31,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
+import org.junit.Test;
+
import org.apache.commons.io.IOUtils;
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.render.intermediate.IFContext;
+
import org.apache.xmlgraphics.ps.DSCConstants;
import org.apache.xmlgraphics.ps.PSResource;
import org.apache.xmlgraphics.ps.dsc.DSCException;
@@ -49,13 +50,15 @@ import org.apache.xmlgraphics.ps.dsc.eve
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentIncludeResource;
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentPage;
import org.apache.xmlgraphics.ps.dsc.events.DSCCommentPages;
-import org.junit.Test;
+
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.render.intermediate.IFContext;
/**
* Tests the PostScript resource optimization (selective de-duplication of
* images that are used multiple times).
*/
-public class ResourceOptimizationTestCase extends AbstractPostScriptTestCase {
+public class ResourceOptimizationTestCase extends AbstractPostScriptTest {
/**
* Tests resource optimization.
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakStatusTestCase.java Mon Nov 7 18:18:29 2011
@@ -27,7 +27,7 @@ import org.junit.Test;
/**
* JUnit test case for the LineBreakStatus class
*/
-public class LineBreakStatusTest {
+public class LineBreakStatusTestCase {
/*
* These symbols are used to indicate the break action returned
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/text/linebreak/LineBreakUtilsTestCase.java Mon Nov 7 18:18:29 2011
@@ -28,7 +28,7 @@ import org.junit.Test;
*
*
*/
-public class LineBreakUtilsTest {
+public class LineBreakUtilsTestCase {
@Test
public void testLineBreakProperty() {
@@ -61,7 +61,7 @@ public class LineBreakUtilsTest {
LineBreakUtils.getLineBreakPairProperty(
LineBreakUtils.LINE_BREAK_PROPERTY_AL,
LineBreakUtils.LINE_BREAK_PROPERTY_OP),
- LineBreakUtils.DIRECT_BREAK);
+ LineBreakUtils.INDIRECT_BREAK);
assertEquals(
LineBreakUtils.getLineBreakPairProperty(
LineBreakUtils.LINE_BREAK_PROPERTY_LF,
Copied: xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTestCase.java (from r1198758, xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTest.java)
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTestCase.java?p2=xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTestCase.java&p1=xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTest.java&r1=1198758&r2=1198853&rev=1198853&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTest.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/traits/MinOptMaxTestCase.java Mon Nov 7 18:18:29 2011
@@ -27,9 +27,9 @@ import static org.junit.Assert.fail;
import org.junit.Test;
/**
- * Tests the {@link MinOptMaxTest} class.
+ * Tests the {@link MinOptMax} class.
*/
-public class MinOptMaxTest {
+public class MinOptMaxTestCase {
/**
* Tests that the constant <code>MinOptMax.ZERO</code> is really zero.
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org