xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r1562866 [11/13] - in /xmlgraphics/fop/branches/Temp_FopFontsForSVG: ./ examples/fo/basic/ lib/ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ src/documentation/intermediate-format-ng/ src/java/META-INF/services/ src/java/org/...
Date Thu, 30 Jan 2014 15:51:11 GMT
Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java Thu Jan 30 15:51:03 2014
@@ -24,7 +24,6 @@ import java.io.IOException;
 import org.xml.sax.SAXException;
 
 import org.apache.fop.apps.FopConfBuilder;
-import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.apps.PDFRendererConfBuilder;
 
 public class FontsAutoDetectTestCase extends BaseConstructiveUserConfigTest {

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java Thu Jan 30 15:51:03 2014
@@ -24,7 +24,6 @@ import java.io.IOException;
 import org.xml.sax.SAXException;
 
 import org.apache.fop.apps.FopConfBuilder;
-import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.apps.PDFRendererConfBuilder;
 
 /**

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/datatypes/URISpecificationTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,10 +19,10 @@
 
 package org.apache.fop.datatypes;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Tests for URISpecification.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/BasicEventTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/BasicEventTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/BasicEventTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/BasicEventTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,6 +19,8 @@
 
 package org.apache.fop.events;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -26,7 +28,6 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import org.apache.fop.events.model.EventSeverity;
-import org.junit.Test;
 
 public class BasicEventTestCase {
 

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/TestEventProducer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/TestEventProducer.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/TestEventProducer.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/events/TestEventProducer.java Thu Jan 30 15:51:03 2014
@@ -38,7 +38,10 @@ public interface TestEventProducer exten
      */
     void enjoy(Object source, String what);
 
-    public class Provider {
+    public static final class Provider {
+
+        private Provider() {
+        }
 
         public static TestEventProducer get(EventBroadcaster broadcaster) {
             return (TestEventProducer)broadcaster.getEventProducerFor(TestEventProducer.class);

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/DelegatingFOEventHandlerTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.fo;
 
-import static org.junit.Assert.assertArrayEquals;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -42,6 +40,8 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
+import static org.junit.Assert.assertArrayEquals;
+
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FODocumentParser.FOEventHandlerFactory;
 import org.apache.fop.fo.flow.BasicLink;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FODocumentParser.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FODocumentParser.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FODocumentParser.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FODocumentParser.java Thu Jan 30 15:51:03 2014
@@ -64,7 +64,7 @@ public final class FODocumentParser {
     /**
      * A factory to create custom instances of {@link FOEventHandler}.
      */
-    public static interface FOEventHandlerFactory {
+    public interface FOEventHandlerFactory {
 
         /**
          * Creates a new {@code FOEventHandler} instance parameterized with the given FO user agent.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FONodeMocks.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FONodeMocks.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FONodeMocks.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/FONodeMocks.java Thu Jan 30 15:51:03 2014
@@ -31,7 +31,6 @@ import org.apache.xmlgraphics.image.load
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
 
 import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.FopFactory;
 import org.apache.fop.events.EventBroadcaster;
 import org.apache.fop.fo.flow.table.ColumnNumberManager;
 import org.apache.fop.fo.flow.table.ColumnNumberManagerHolder;
@@ -46,7 +45,7 @@ public final class FONodeMocks {
     /**
      * Creates and returns a mock {@link FONode} configured with a mock
      * {@link FOEventHandler}. The FO event handler returns a mock {@link FOUserAgent},
-     * which in turn returns a mock {@link FopFactory}, which returns a mock
+     * which in turn returns a mock {@link org.apache.fop.apps.FopFactory}, which returns a mock
      * {@link ImageManager}.
      *
      * @return a mock FO node

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/MarkersTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/MarkersTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/MarkersTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/MarkersTestCase.java Thu Jan 30 15:51:03 2014
@@ -30,10 +30,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import org.apache.fop.fo.Constants;
-import org.apache.fop.fo.flow.Marker;
-import org.apache.fop.fo.flow.Markers;
-import org.apache.fop.fo.flow.RetrieveMarker;
-import org.apache.fop.fo.flow.RetrieveTableMarker;
 
 public class MarkersTestCase {
 

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/AbstractTableTest.java Thu Jan 30 15:51:03 2014
@@ -24,8 +24,8 @@ import java.util.Iterator;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FODocumentParser;
-import org.apache.fop.fo.FOEventHandler;
 import org.apache.fop.fo.FODocumentParser.FOEventHandlerFactory;
+import org.apache.fop.fo.FOEventHandler;
 import org.apache.fop.util.ConsoleEventListenerForTests;
 
 /**

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/CollapsedConditionalBorderTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,18 +19,20 @@
 
 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;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FONode.FONodeIterator;
 import org.apache.fop.fo.properties.CommonBorderPaddingBackground.BorderInfo;
 
+// CSOFF: LineLength
+
 /**
  * A testcase for the resolution of collapsed borders in the FO tree, taking
  * conditionality into account. The resolved borders are generated by the

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,16 +19,16 @@
 
 package org.apache.fop.fo.flow.table;
 
-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 java.util.Iterator;
 import java.util.List;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests that RowGroupBuilder returns, for each part of a table, the expected number of
  * row-groups with the expected number or rows in each.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,12 +19,12 @@
 
 package org.apache.fop.fo.flow.table;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.Iterator;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.datatypes.PercentBaseContext;
 import org.apache.fop.fo.FObj;
 

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableHandler.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableHandler.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableHandler.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/flow/table/TableHandler.java Thu Jan 30 15:51:03 2014
@@ -24,7 +24,6 @@ import java.util.List;
 
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.FOEventHandler;
-import org.apache.fop.fo.flow.table.Table;
 
 public class TableHandler extends FOEventHandler {
 

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/AllTests.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/AllTests.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/AllTests.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/AllTests.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,8 @@
 
 package org.apache.fop.fo.pagination;
 
-import org.junit.runners.Suite;
 import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * All test to be added in FOTreeTestSuite
@@ -28,6 +28,6 @@ import org.junit.runner.RunWith;
  */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({ PageSequenceMasterTestCase.class,
-        RepeatablePageMasterAlternativesTestCase.class})
+        RepeatablePageMasterAlternativesTestCase.class })
 public final class AllTests {
 }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/PageSequenceMasterTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,10 @@
 
 package org.apache.fop.fo.pagination;
 
-import static org.junit.Assert.fail;
+import org.junit.Test;
+import org.xml.sax.Locator;
 
+import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.anyObject;
@@ -33,8 +35,6 @@ import static org.mockito.Mockito.when;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.layoutmgr.BlockLevelEventProducer;
-import org.junit.Test;
-import org.xml.sax.Locator;
 
 
 /**

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternativesTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,6 +19,8 @@
 
 package org.apache.fop.fo.pagination;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Matchers.anyInt;
@@ -30,8 +32,6 @@ import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.expr.NumericProperty;
 import org.apache.fop.fo.properties.Property;
 
-import org.junit.Test;
-
 /**
  * Unit Test for RepeatablePageMasterAlternatives
  *

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/AltTextHolderTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,12 +19,12 @@
 
 package org.apache.fop.fo.properties;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import org.junit.Test;
-
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.fo.Constants;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fo/properties/CommonAccessibilityHolderTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,16 +19,16 @@
 
 package org.apache.fop.fo.properties;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FONodeMocks;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/EmbedFontInfoTestCase.java Thu Jan 30 15:51:03 2014
@@ -35,6 +35,8 @@ import static org.junit.Assert.assertTru
  */
 public class EmbedFontInfoTestCase {
 
+    public EmbedFontInfoTestCase() { }
+
     private EmbedFontInfo sut;
 
     private final URI metricsURI = URI.create("test/resources/fonts/ttf/glb12.ttf.xml");

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontManagerConfiguratorTestCase.java Thu Jan 30 15:51:03 2014
@@ -20,7 +20,6 @@
 package org.apache.fop.fonts;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 
@@ -28,13 +27,14 @@ import org.junit.Before;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FopConfBuilder;
 import org.apache.fop.apps.FopConfParser;
 import org.apache.fop.apps.FopFactory;
 
 import static org.apache.fop.apps.FopConfParserTestCase.getFopFactory;
-import static org.junit.Assert.assertEquals;
 
 /**
  * A test case for {@link FontManagerConfigurator}.
@@ -84,7 +84,7 @@ public class FontManagerConfiguratorTest
     /**
      * This test is an interesting one; it's basically testing that if a base URI pointing to a
      * directory that doesn't exist is used, an error is not thrown. The URI resolver should handle
-     * any {@link FileNotFoundException}s, not the configuration. We're NOT testing whether a font
+     * any {@link java.io.FileNotFoundException}s, not the configuration. We're NOT testing whether a font
      * can be resolved here, just that the URI resolver accepts it as its base URI.
      */
     @Test

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontsTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontsTestSuite.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontsTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/FontsTestSuite.java Thu Jan 30 15:51:03 2014
@@ -29,7 +29,7 @@ import org.junit.runners.Suite.SuiteClas
 @RunWith(Suite.class)
 @SuiteClasses({
         FontManagerConfiguratorTestCase.class,
-        EmbedFontInfo.class,
+        EmbedFontInfoTestCase.class,
         FontEventProcessingTestCase.class,
         FontManagerConfiguratorTestCase.class
 })

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/GlyfTableTestCase.java Thu Jan 30 15:51:03 2014
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertTru
  */
 public class GlyfTableTestCase {
 
-    private final static class DirData {
+    private static final class DirData {
 
         final long offset;
         final long length;
@@ -148,14 +148,15 @@ public class GlyfTableTestCase {
 
     private void setupSubsetReader(Map<Integer, Integer> glyphs) throws IOException {
         TTFSubSetFile fontFile = new TTFSubSetFile();
-        fontFile.readFont(originalFontReader, "Deja", glyphs);
+        String header = OFFontLoader.readHeader(subsetReader);
+        fontFile.readFont(originalFontReader, "Deja", header, glyphs);
         byte[] subsetFont = fontFile.getFontSubset();
         InputStream intputStream = new ByteArrayInputStream(subsetFont);
         subsetReader = new FontFileReader(intputStream);
     }
 
     private void readLoca() throws IOException {
-        DirData loca = getTableData("loca");
+        DirData loca = getTableData(OFTableName.LOCA.getName());
         int numberOfGlyphs = (int) (loca.length - 4) / 4;
         glyphOffsets = new long[numberOfGlyphs];
         subsetReader.seekSet(loca.offset);
@@ -166,7 +167,7 @@ public class GlyfTableTestCase {
     }
 
     private int[] retrieveIndicesOfComposedGlyphs() throws IOException {
-        DirData glyf = getTableData("glyf");
+        DirData glyf = getTableData(OFTableName.GLYF.getName());
         int[] composedGlyphIndices = new int[glyphOffsets.length];
 
         for (int i = 0; i < glyphOffsets.length; i++) {

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFileTestCase.java Thu Jan 30 15:51:03 2014
@@ -30,7 +30,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.fop.fonts.truetype.TTFFile.PostScriptVersion;
+import org.apache.fop.fonts.truetype.OpenFont.PostScriptVersion;
 
 /**
  * Class for testing org.apache.fop.fonts.truetype.TTFFile
@@ -55,14 +55,16 @@ public class TTFFileTestCase {
         dejavuTTFFile = new TTFFile();
         InputStream dejaStream = new FileInputStream("test/resources/fonts/ttf/DejaVuLGCSerif.ttf");
         dejavuReader = new FontFileReader(dejaStream);
-        dejavuTTFFile.readFont(dejavuReader);
+        String dejavuHeader = OFFontLoader.readHeader(dejavuReader);
+        dejavuTTFFile.readFont(dejavuReader, dejavuHeader);
         dejaStream.close();
 
         InputStream droidStream = new FileInputStream("test/resources/fonts/ttf/DroidSansMono.ttf");
 
         droidmonoTTFFile = new TTFFile();
         droidmonoReader = new FontFileReader(droidStream);
-        droidmonoTTFFile.readFont(droidmonoReader);
+        String droidmonoHeader = OFFontLoader.readHeader(droidmonoReader);
+        droidmonoTTFFile.readFont(droidmonoReader, droidmonoHeader);
         droidStream.close();
     }
 
@@ -93,8 +95,10 @@ public class TTFFileTestCase {
     @Test
     public void testCheckTTC() throws IOException {
         // DejaVu is not a TTC, thus this returns true
-        assertTrue(dejavuTTFFile.checkTTC(""));
-        assertTrue(droidmonoTTFFile.checkTTC(""));
+        String dejavuHeader = OFFontLoader.readHeader(dejavuReader);
+        assertTrue(dejavuTTFFile.checkTTC(dejavuHeader, ""));
+        String droidmonoHeader = OFFontLoader.readHeader(droidmonoReader);
+        assertTrue(droidmonoTTFFile.checkTTC(droidmonoHeader, ""));
         /*
          * Cannot reasonably test the rest of this method without an actual truetype collection
          * because all methods in FontFileReader are "final" and thus mocking isn't possible.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFFontLoaderTestCase.java Thu Jan 30 15:51:03 2014
@@ -25,16 +25,16 @@ import java.net.URI;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.fop.apps.io.InternalResourceResolver;
 import org.apache.fop.apps.io.ResourceResolverFactory;
 import org.apache.fop.fonts.EmbeddingMode;
 import org.apache.fop.fonts.EncodingMode;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 /**
- * Test case for {@link TTFFontLoader}.
+ * Test case for {@link OFFontLoader}.
  */
 public class TTFFontLoaderTestCase {
 
@@ -49,12 +49,12 @@ public class TTFFontLoaderTestCase {
         boolean embedded = false;
         boolean useKerning = true;
 
-        TTFFontLoader fontLoader = new TTFFontLoader(absoluteFilePath, fontName, embedded,
+        OFFontLoader fontLoader = new OFFontLoader(absoluteFilePath, fontName, embedded,
                 EmbeddingMode.AUTO, EncodingMode.AUTO, useKerning, useComplexScriptFeatures, resourceResolver);
         assertTrue(fontLoader.getFont().hasKerningInfo());
         useKerning = false;
 
-        fontLoader = new TTFFontLoader(absoluteFilePath, fontName, embedded, EmbeddingMode.AUTO,
+        fontLoader = new OFFontLoader(absoluteFilePath, fontName, embedded, EmbeddingMode.AUTO,
                 EncodingMode.AUTO, useKerning, useComplexScriptFeatures, resourceResolver);
         assertFalse(fontLoader.getFont().hasKerningInfo());
     }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFSubSetFileTestCase.java Thu Jan 30 15:51:03 2014
@@ -55,7 +55,8 @@ public class TTFSubSetFileTestCase exten
         for (int i = 0; i < 255; i++) {
             glyphs.put(i, i);
         }
-        ttfSubset.readFont(dejavuReader, "DejaVu", glyphs);
+        String header = OFFontLoader.readHeader(dejavuReader);
+        ttfSubset.readFont(dejavuReader, "DejaVu", header, glyphs);
         subset = ttfSubset.getFontSubset();
     }
     /**
@@ -68,7 +69,9 @@ public class TTFSubSetFileTestCase exten
     public void testReadFont3Args() throws IOException {
 
         ByteArrayInputStream byteArray = new ByteArrayInputStream(subset);
-        dejavuTTFFile.readFont(new FontFileReader(byteArray));
+        FontFileReader reader = new FontFileReader(byteArray);
+        String header = OFFontLoader.readHeader(reader);
+        dejavuTTFFile.readFont(reader, header);
         // Test a couple arbitrary values
         assertEquals(dejavuTTFFile.convertTTFUnit2PDFUnit(-1576), dejavuTTFFile.getFontBBox()[0]);
         assertEquals(dejavuTTFFile.getFullName(), "DejaVu LGC Serif");

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/truetype/TTFTableNameTestCase.java Thu Jan 30 15:51:03 2014
@@ -37,37 +37,37 @@ public class TTFTableNameTestCase {
      */
     @Test
     public void testGetName() throws IllegalAccessException {
-        assertEquals("tableDirectory", TTFTableName.TABLE_DIRECTORY.getName());
-        assertEquals("EBDT", TTFTableName.EBDT.getName());
-        assertEquals("EBLC", TTFTableName.EBLC.getName());
-        assertEquals("EBSC", TTFTableName.EBSC.getName());
-        assertEquals("FFTM", TTFTableName.FFTM.getName());
-        assertEquals("GDEF", TTFTableName.GDEF.getName());
-        assertEquals("GPOS", TTFTableName.GPOS.getName());
-        assertEquals("GSUB", TTFTableName.GSUB.getName());
-        assertEquals("LTSH", TTFTableName.LTSH.getName());
-        assertEquals("OS/2", TTFTableName.OS2.getName());
-        assertEquals("PCLT", TTFTableName.PCLT.getName());
-        assertEquals("VDMX", TTFTableName.VDMX.getName());
-        assertEquals("cmap", TTFTableName.CMAP.getName());
-        assertEquals("cvt ", TTFTableName.CVT.getName());
-        assertEquals("fpgm", TTFTableName.FPGM.getName());
-        assertEquals("gasp", TTFTableName.GASP.getName());
-        assertEquals("glyf", TTFTableName.GLYF.getName());
-        assertEquals("hdmx", TTFTableName.HDMX.getName());
-        assertEquals("head", TTFTableName.HEAD.getName());
-        assertEquals("hhea", TTFTableName.HHEA.getName());
-        assertEquals("hmtx", TTFTableName.HMTX.getName());
-        assertEquals("kern", TTFTableName.KERN.getName());
-        assertEquals("loca", TTFTableName.LOCA.getName());
-        assertEquals("maxp", TTFTableName.MAXP.getName());
-        assertEquals("name", TTFTableName.NAME.getName());
-        assertEquals("post", TTFTableName.POST.getName());
-        assertEquals("prep", TTFTableName.PREP.getName());
-        assertEquals("vhea", TTFTableName.VHEA.getName());
-        assertEquals("vmtx", TTFTableName.VMTX.getName());
+        assertEquals("tableDirectory", OFTableName.TABLE_DIRECTORY.getName());
+        assertEquals("EBDT", OFTableName.EBDT.getName());
+        assertEquals("EBLC", OFTableName.EBLC.getName());
+        assertEquals("EBSC", OFTableName.EBSC.getName());
+        assertEquals("FFTM", OFTableName.FFTM.getName());
+        assertEquals("GDEF", OFTableName.GDEF.getName());
+        assertEquals("GPOS", OFTableName.GPOS.getName());
+        assertEquals("GSUB", OFTableName.GSUB.getName());
+        assertEquals("LTSH", OFTableName.LTSH.getName());
+        assertEquals("OS/2", OFTableName.OS2.getName());
+        assertEquals("PCLT", OFTableName.PCLT.getName());
+        assertEquals("VDMX", OFTableName.VDMX.getName());
+        assertEquals("cmap", OFTableName.CMAP.getName());
+        assertEquals("cvt ", OFTableName.CVT.getName());
+        assertEquals("fpgm", OFTableName.FPGM.getName());
+        assertEquals("gasp", OFTableName.GASP.getName());
+        assertEquals("glyf", OFTableName.GLYF.getName());
+        assertEquals("hdmx", OFTableName.HDMX.getName());
+        assertEquals("head", OFTableName.HEAD.getName());
+        assertEquals("hhea", OFTableName.HHEA.getName());
+        assertEquals("hmtx", OFTableName.HMTX.getName());
+        assertEquals("kern", OFTableName.KERN.getName());
+        assertEquals("loca", OFTableName.LOCA.getName());
+        assertEquals("maxp", OFTableName.MAXP.getName());
+        assertEquals("name", OFTableName.NAME.getName());
+        assertEquals("post", OFTableName.POST.getName());
+        assertEquals("prep", OFTableName.PREP.getName());
+        assertEquals("vhea", OFTableName.VHEA.getName());
+        assertEquals("vmtx", OFTableName.VMTX.getName());
         // make sure it works with other table names
-        TTFTableName test = TTFTableName.getValue("test");
+        OFTableName test = OFTableName.getValue("test");
         assertEquals("test", test.getName());
     }
 
@@ -78,34 +78,34 @@ public class TTFTableNameTestCase {
      */
     @Test
     public void testGetValue() throws IllegalAccessException {
-        assertEquals(TTFTableName.EBDT, TTFTableName.getValue("EBDT"));
-        assertEquals(TTFTableName.EBLC, TTFTableName.getValue("EBLC"));
-        assertEquals(TTFTableName.EBSC, TTFTableName.getValue("EBSC"));
-        assertEquals(TTFTableName.FFTM, TTFTableName.getValue("FFTM"));
-        assertEquals(TTFTableName.LTSH, TTFTableName.getValue("LTSH"));
-        assertEquals(TTFTableName.OS2, TTFTableName.getValue("OS/2"));
-        assertEquals(TTFTableName.PCLT, TTFTableName.getValue("PCLT"));
-        assertEquals(TTFTableName.VDMX, TTFTableName.getValue("VDMX"));
-        assertEquals(TTFTableName.CMAP, TTFTableName.getValue("cmap"));
-        assertEquals(TTFTableName.CVT, TTFTableName.getValue("cvt "));
-        assertEquals(TTFTableName.FPGM, TTFTableName.getValue("fpgm"));
-        assertEquals(TTFTableName.GASP, TTFTableName.getValue("gasp"));
-        assertEquals(TTFTableName.GLYF, TTFTableName.getValue("glyf"));
-        assertEquals(TTFTableName.HDMX, TTFTableName.getValue("hdmx"));
-        assertEquals(TTFTableName.HEAD, TTFTableName.getValue("head"));
-        assertEquals(TTFTableName.HHEA, TTFTableName.getValue("hhea"));
-        assertEquals(TTFTableName.HMTX, TTFTableName.getValue("hmtx"));
-        assertEquals(TTFTableName.KERN, TTFTableName.getValue("kern"));
-        assertEquals(TTFTableName.LOCA, TTFTableName.getValue("loca"));
-        assertEquals(TTFTableName.MAXP, TTFTableName.getValue("maxp"));
-        assertEquals(TTFTableName.NAME, TTFTableName.getValue("name"));
-        assertEquals(TTFTableName.POST, TTFTableName.getValue("post"));
-        assertEquals(TTFTableName.PREP, TTFTableName.getValue("prep"));
-        assertEquals(TTFTableName.VHEA, TTFTableName.getValue("vhea"));
-        assertEquals(TTFTableName.VMTX, TTFTableName.getValue("vmtx"));
+        assertEquals(OFTableName.EBDT, OFTableName.getValue("EBDT"));
+        assertEquals(OFTableName.EBLC, OFTableName.getValue("EBLC"));
+        assertEquals(OFTableName.EBSC, OFTableName.getValue("EBSC"));
+        assertEquals(OFTableName.FFTM, OFTableName.getValue("FFTM"));
+        assertEquals(OFTableName.LTSH, OFTableName.getValue("LTSH"));
+        assertEquals(OFTableName.OS2, OFTableName.getValue("OS/2"));
+        assertEquals(OFTableName.PCLT, OFTableName.getValue("PCLT"));
+        assertEquals(OFTableName.VDMX, OFTableName.getValue("VDMX"));
+        assertEquals(OFTableName.CMAP, OFTableName.getValue("cmap"));
+        assertEquals(OFTableName.CVT, OFTableName.getValue("cvt "));
+        assertEquals(OFTableName.FPGM, OFTableName.getValue("fpgm"));
+        assertEquals(OFTableName.GASP, OFTableName.getValue("gasp"));
+        assertEquals(OFTableName.GLYF, OFTableName.getValue("glyf"));
+        assertEquals(OFTableName.HDMX, OFTableName.getValue("hdmx"));
+        assertEquals(OFTableName.HEAD, OFTableName.getValue("head"));
+        assertEquals(OFTableName.HHEA, OFTableName.getValue("hhea"));
+        assertEquals(OFTableName.HMTX, OFTableName.getValue("hmtx"));
+        assertEquals(OFTableName.KERN, OFTableName.getValue("kern"));
+        assertEquals(OFTableName.LOCA, OFTableName.getValue("loca"));
+        assertEquals(OFTableName.MAXP, OFTableName.getValue("maxp"));
+        assertEquals(OFTableName.NAME, OFTableName.getValue("name"));
+        assertEquals(OFTableName.POST, OFTableName.getValue("post"));
+        assertEquals(OFTableName.PREP, OFTableName.getValue("prep"));
+        assertEquals(OFTableName.VHEA, OFTableName.getValue("vhea"));
+        assertEquals(OFTableName.VMTX, OFTableName.getValue("vmtx"));
         // Test that we can store a random table name and it will not fail or throw an error.
-        TTFTableName test = TTFTableName.getValue("random");
-        assertTrue(test instanceof TTFTableName);
+        OFTableName test = OFTableName.getValue("random");
+        assertTrue(test instanceof OFTableName);
     }
 
     /**
@@ -115,10 +115,10 @@ public class TTFTableNameTestCase {
      */
     @Test
     public void testHashCode() throws IllegalAccessException {
-        TTFTableName a = TTFTableName.getValue("testObject");
-        TTFTableName b = TTFTableName.getValue("testObject");
+        OFTableName a = OFTableName.getValue("testObject");
+        OFTableName b = OFTableName.getValue("testObject");
         assertTrue(a.hashCode() == b.hashCode());
-        TTFTableName c = TTFTableName.getValue("fail");
+        OFTableName c = OFTableName.getValue("fail");
         assertFalse(a.hashCode() == c.hashCode());
     }
 
@@ -134,15 +134,15 @@ public class TTFTableNameTestCase {
     @Test
     public void testEquals() throws IllegalAccessException {
         // Reflexivity
-        TTFTableName a = TTFTableName.getValue("test");
+        OFTableName a = OFTableName.getValue("test");
         assertTrue(a.equals(a));
         // Symmetry
-        TTFTableName b = TTFTableName.getValue("test");
+        OFTableName b = OFTableName.getValue("test");
         assertTrue(a.equals(b));
         assertTrue(b.equals(a));
         // Transitivity (tested with symmetry)
         // Consistency (test that a == b is true and that a == c fails)
-        TTFTableName c = TTFTableName.getValue("fail");
+        OFTableName c = OFTableName.getValue("fail");
         for (int i = 0; i < 100; i++) {
             assertTrue(a.equals(b));
             assertFalse(a.equals(c));

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/AdobeStandardEncodingTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.fonts.type1;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -30,6 +28,8 @@ import java.io.InputStreamReader;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Test case for {@link AdobeStandardEncoding}.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fonts/type1/CharMetricsHandlerTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,10 +19,6 @@
 
 package org.apache.fop.fonts.type1;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 import java.awt.Rectangle;
 import java.io.IOException;
 import java.util.HashMap;
@@ -31,6 +27,10 @@ import java.util.Stack;
 
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.apache.fop.fonts.NamedCharacter;
 import org.apache.fop.fonts.type1.AFMParser.ValueHandler;
 

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/AssertElement.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/AssertElement.java Thu Jan 30 15:51:03 2014
@@ -20,6 +20,9 @@
 package org.apache.fop.fotreetest.ext;
 
 
+import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
+
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOPropertyMapping;
@@ -32,9 +35,6 @@ import org.apache.fop.fo.properties.Prop
 import org.apache.fop.fo.properties.SpaceProperty;
 import org.apache.fop.fotreetest.ResultCollector;
 
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
 /**
  * Defines the assert element for the FOP Test extension.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,8 @@
 
 package org.apache.fop.fotreetest.ext;
 
-import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.fo.FONode;
 
 /**
  * This class provides the element mapping for FOP.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,10 +19,6 @@
 
 package org.apache.fop.image.loader.batik;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-
 import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
 import java.io.File;
@@ -30,6 +26,10 @@ import java.io.File;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.xmlgraphics.image.loader.Image;
 import org.apache.xmlgraphics.image.loader.ImageFlavor;
 import org.apache.xmlgraphics.image.loader.ImageInfo;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,15 +19,15 @@
 
 package org.apache.fop.image.loader.batik;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.io.File;
 import java.io.IOException;
 
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 import org.apache.xmlgraphics.image.loader.ImageException;
 import org.apache.xmlgraphics.image.loader.ImageInfo;
 import org.apache.xmlgraphics.image.loader.ImageManager;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AbstractIFTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AbstractIFTest.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AbstractIFTest.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AbstractIFTest.java Thu Jan 30 15:51:03 2014
@@ -34,7 +34,6 @@ import javax.xml.validation.SchemaFactor
 import javax.xml.validation.Validator;
 
 import org.w3c.dom.Document;
-
 import org.xml.sax.ErrorHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java Thu Jan 30 15:51:03 2014
@@ -27,6 +27,6 @@ import org.junit.runners.Suite.SuiteClas
  * JUnit test suite for the area tree XML format
  */
 @RunWith(Suite.class)
-@SuiteClasses({ AreaTreeParserTestCase.class })
+@SuiteClasses(AreaTreeParserTestCase.class)
 public class AreaTreeXMLFormatTestSuite {
 }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.intermediate;
 
-import static org.junit.Assert.fail;
-
 import java.io.File;
 
 import javax.xml.transform.ErrorListener;
@@ -34,6 +32,8 @@ import javax.xml.transform.stream.Stream
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.fail;
+
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java Thu Jan 30 15:51:03 2014
@@ -27,6 +27,6 @@ import org.junit.runners.Suite.SuiteClas
  * A test suite for testing the Intermediate Format output.
  */
 @RunWith(Suite.class)
-@SuiteClasses({ IFTestCase.class })
+@SuiteClasses(IFTestCase.class)
 public final class IntermediateFormatTestSuite {
 }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java Thu Jan 30 15:51:03 2014
@@ -27,6 +27,6 @@ import org.junit.runners.Suite.SuiteClas
  * JUnit test suite for the intermediate format
  */
 @RunWith(Suite.class)
-@SuiteClasses({ IFParserTestCase.class })
+@SuiteClasses(IFParserTestCase.class)
 public final class LayoutIFTestSuite {
 }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/ElementListCheck.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/ElementListCheck.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/ElementListCheck.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/ElementListCheck.java Thu Jan 30 15:51:03 2014
@@ -22,16 +22,17 @@ package org.apache.fop.layoutengine;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.fop.layoutmgr.KnuthBox;
-import org.apache.fop.layoutmgr.KnuthElement;
-import org.apache.fop.layoutmgr.KnuthGlue;
-import org.apache.fop.layoutmgr.KnuthPenalty;
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
+import org.apache.fop.layoutmgr.KnuthBox;
+import org.apache.fop.layoutmgr.KnuthElement;
+import org.apache.fop.layoutmgr.KnuthGlue;
+import org.apache.fop.layoutmgr.KnuthPenalty;
+
 /**
  * Check implementation that checks a Knuth element list.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java Thu Jan 30 15:51:03 2014
@@ -21,8 +21,12 @@ package org.apache.fop.layoutengine;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.Source;
@@ -41,10 +45,16 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.apache.fop.DebugHelper;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
@@ -53,6 +63,8 @@ import org.apache.fop.apps.FormattingRes
 import org.apache.fop.area.AreaTreeModel;
 import org.apache.fop.area.AreaTreeParser;
 import org.apache.fop.area.RenderPagesModel;
+import org.apache.fop.events.Event;
+import org.apache.fop.events.EventListener;
 import org.apache.fop.events.model.EventSeverity;
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.intermediate.IFTester;
@@ -131,6 +143,8 @@ public class LayoutEngineTestCase {
 
         Fop fop;
         FopFactory effFactory;
+        EventsChecker eventsChecker = new EventsChecker(
+                new ConsoleEventListenerForTests(testFile.getName(), EventSeverity.WARN));
         try {
             Document testDoc = testAssistant.loadTestCase(testFile);
             effFactory = testAssistant.getFopFactory(testDoc);
@@ -146,8 +160,7 @@ public class LayoutEngineTestCase {
 
             //Setup FOP for area tree rendering
             FOUserAgent ua = effFactory.newFOUserAgent();
-            ua.getEventBroadcaster().addEventListener(
-                    new ConsoleEventListenerForTests(testFile.getName(), EventSeverity.WARN));
+            ua.getEventBroadcaster().addEventListener(eventsChecker);
 
             XMLRenderer atrenderer = new XMLRenderer(ua);
             atrenderer.setContentHandler(athandler);
@@ -167,7 +180,60 @@ public class LayoutEngineTestCase {
         }
         FormattingResults results = fop.getResults();
         LayoutResult result = new LayoutResult(doc, elCollector, results);
-        checkAll(effFactory, testFile, result);
+        checkAll(effFactory, testFile, result, eventsChecker);
+    }
+
+    private static class EventsChecker implements EventListener {
+
+        private final List<Event> events = new ArrayList<Event>();
+
+        private final EventListener defaultListener;
+
+        /**
+         * @param fallbackListener the listener to which this class will pass through
+         * events that are not being checked
+         */
+        public EventsChecker(EventListener fallbackListener) {
+            this.defaultListener = fallbackListener;
+        }
+
+        public void processEvent(Event event) {
+            events.add(event);
+        }
+
+        public void checkEvent(String expectedKey, Map<String, String> expectedParams) {
+            boolean eventFound = false;
+            for (Iterator<Event> iter = events.iterator(); !eventFound && iter.hasNext();) {
+                Event event = iter.next();
+                if (event.getEventKey().equals(expectedKey)) {
+                    eventFound = true;
+                    iter.remove();
+                    checkParameters(event, expectedParams);
+                }
+            }
+            if (!eventFound) {
+                fail("Event did not occur but was expected to: " + expectedKey + expectedParams);
+            }
+        }
+
+        private void checkParameters(Event event, Map<String, String> expectedParams) {
+            Map<String, Object> actualParams = event.getParams();
+            for (Map.Entry<String, String> expectedParam : expectedParams.entrySet()) {
+                assertTrue("Event \"" + event.getEventKey()
+                        + "\" is missing parameter \"" + expectedParam.getKey() + '"',
+                        actualParams.containsKey(expectedParam.getKey()));
+                assertEquals("Event \"" + event.getEventKey()
+                        + "\" has wrong value for parameter \"" + expectedParam.getKey() + "\";",
+                        actualParams.get(expectedParam.getKey()).toString(),
+                        expectedParam.getValue());
+            }
+        }
+
+        public void emitUncheckedEvents() {
+            for (Event event : events) {
+                defaultListener.processEvent(event);
+            }
+        }
     }
 
     /**
@@ -177,8 +243,8 @@ public class LayoutEngineTestCase {
      * @param result The layout results
      * @throws TransformerException if a problem occurs in XSLT/JAXP
      */
-    protected void checkAll(FopFactory fopFactory, File testFile, LayoutResult result)
-            throws TransformerException {
+    protected void checkAll(FopFactory fopFactory, File testFile, LayoutResult result,
+            EventsChecker eventsChecker) throws TransformerException {
         Element testRoot = testAssistant.getTestRoot(testFile);
 
         NodeList nodes;
@@ -196,6 +262,13 @@ public class LayoutEngineTestCase {
             Document ifDocument = createIF(fopFactory, testFile, result.getAreaTree());
             ifTester.doIFChecks(testFile.getName(), ifChecks, ifDocument);
         }
+
+        nodes = testRoot.getElementsByTagName("event-checks");
+        if (nodes.getLength() > 0) {
+            Element eventChecks = (Element) nodes.item(0);
+            doEventChecks(eventChecks, eventsChecker);
+        }
+        eventsChecker.emitUncheckedEvents();
     }
 
     private Document createIF(FopFactory fopFactory, File testFile, Document areaTreeXML)
@@ -254,4 +327,28 @@ public class LayoutEngineTestCase {
         }
     }
 
+    private void doEventChecks(Element eventChecks, EventsChecker eventsChecker) {
+        NodeList events = eventChecks.getElementsByTagName("event");
+        for (int i = 0; i < events.getLength(); i++) {
+            Element event = (Element) events.item(i);
+            NamedNodeMap attributes = event.getAttributes();
+            Map<String, String> params = new HashMap<String, String>();
+            String key = null;
+            for (int j = 0; j < attributes.getLength(); j++) {
+                Node attribute = attributes.item(j);
+                String name = attribute.getNodeName();
+                String value = attribute.getNodeValue();
+                if ("key".equals(name)) {
+                    key = value;
+                } else {
+                    params.put(name, value);
+                }
+            }
+            if (key == null) {
+                throw new RuntimeException("An event element must have a \"key\" attribute");
+            }
+            eventsChecker.checkEvent(key, params);
+        }
+    }
+
 }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java Thu Jan 30 15:51:03 2014
@@ -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({ LayoutEngineTestCase.class })
+@SuiteClasses(LayoutEngineTestCase.class)
 public class LayoutEngineTestSuite {
 }

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutResult.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutResult.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutResult.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutengine/LayoutResult.java Thu Jan 30 15:51:03 2014
@@ -19,9 +19,10 @@
 
 package org.apache.fop.layoutengine;
 
-import org.apache.fop.apps.FormattingResults;
 import org.w3c.dom.Document;
 
+import org.apache.fop.apps.FormattingResults;
+
 /**
  * This class holds references to all the results from the FOP processing run.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java Thu Jan 30 15:51:03 2014
@@ -23,6 +23,10 @@ import java.awt.Color;
 
 import org.junit.Test;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import org.apache.fop.fo.flow.table.PrimaryGridUnit;
 import org.apache.fop.fo.flow.table.Table;
 import org.apache.fop.fo.flow.table.TableCell;
@@ -37,10 +41,6 @@ import org.apache.fop.layoutmgr.PageSequ
 import org.apache.fop.layoutmgr.PositionIterator;
 import org.apache.fop.layoutmgr.RetrieveTableMarkerLayoutManager;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 public class TableCellLayoutManagerTestCase {
 
     // this test aims to check that the first call to addAreas() calls

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/logging/LoggingElementListObserver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/logging/LoggingElementListObserver.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/logging/LoggingElementListObserver.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/logging/LoggingElementListObserver.java Thu Jan 30 15:51:03 2014
@@ -24,9 +24,10 @@ import java.util.ListIterator;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
+import org.apache.fop.layoutmgr.ElementListObserver.Observer;
 import org.apache.fop.layoutmgr.ElementListUtils;
 import org.apache.fop.layoutmgr.ListElement;
-import org.apache.fop.layoutmgr.ElementListObserver.Observer;
 
 /**
  * <p>Logs all observed element lists.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/memory/MemoryEater.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/memory/MemoryEater.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/memory/MemoryEater.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/memory/MemoryEater.java Thu Jan 30 15:51:03 2014
@@ -45,7 +45,7 @@ import org.apache.fop.apps.MimeConstants
 /**
  * Debug tool to create and process large FO files by replicating them a specified number of times.
  */
-public class MemoryEater {
+public final class MemoryEater {
 
     private SAXTransformerFactory tFactory
             = (SAXTransformerFactory)SAXTransformerFactory.newInstance();
@@ -53,7 +53,7 @@ public class MemoryEater {
 
     private Stats stats;
 
-    public MemoryEater() throws TransformerConfigurationException, MalformedURLException {
+    private MemoryEater() throws TransformerConfigurationException, MalformedURLException {
         File xsltFile = new File("test/xsl/fo-replicator.xsl");
         Source xslt = new StreamSource(xsltFile);
         replicatorTemplates = tFactory.newTemplates(xslt);

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java Thu Jan 30 15:51:03 2014
@@ -23,10 +23,11 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
-import static org.junit.Assert.assertEquals;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 /**
  * Test case for {@link AbstractPDFStream}.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,10 +19,6 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -33,6 +29,10 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests the {@link FileIDGenerator} class.
  */
@@ -96,7 +96,7 @@ public class FileIDGeneratorTestCase {
         assertTrue(Arrays.equals(originalFileID, updatedFileID));
     }
 
-    private static interface TestGetter {
+    private interface TestGetter {
         FileIDGenerator getSut() throws Exception;
     }
 

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,15 +19,15 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.List;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.fop.pdf.xref.CompressedObjectReference;
 
 public class ObjectStreamManagerTestCase {

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
@@ -29,6 +27,8 @@ import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class ObjectStreamTestCase {
 
     private static final String OBJECT_CONTENT = "<<\n  /Foo True\n  /Bar False\n>>\n";

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFAModeTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFAModeTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFAModeTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFAModeTestCase.java Thu Jan 30 15:51:03 2014
@@ -97,7 +97,7 @@ public class PDFAModeTestCase {
     }
 
     @Test
-    public void checkPDFA_1a() {
+    public void checkPDFA1a() {
         new PDFAModeChecker(PDFAMode.PDFA_1A)
                 .isEnabled()
                 .isPart1()
@@ -106,7 +106,7 @@ public class PDFAModeTestCase {
     }
 
     @Test
-    public void checkPDFA_1b() {
+    public void checkPDFA1b() {
         new PDFAModeChecker(PDFAMode.PDFA_1B)
                 .isEnabled()
                 .isPart1()
@@ -115,7 +115,7 @@ public class PDFAModeTestCase {
     }
 
     @Test
-    public void checkPDFA_2a() {
+    public void checkPDFA2a() {
         new PDFAModeChecker(PDFAMode.PDFA_2A)
                 .isEnabled()
                 .isNotPart1()
@@ -124,7 +124,7 @@ public class PDFAModeTestCase {
     }
 
     @Test
-    public void checkPDFA_2b() {
+    public void checkPDFA2b() {
         new PDFAModeChecker(PDFAMode.PDFA_2B)
                 .isEnabled()
                 .isNotPart1()
@@ -133,7 +133,7 @@ public class PDFAModeTestCase {
     }
 
     @Test
-    public void checkPDFA_2u() {
+    public void checkPDFA2u() {
         new PDFAModeChecker(PDFAMode.PDFA_2U)
                 .isEnabled()
                 .isNotPart1()

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFArrayTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFArrayTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFArrayTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,17 +19,17 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Test case for {@link PDFArray}.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDestsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDestsTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDestsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDestsTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,20 +19,20 @@
 
 package org.apache.fop.pdf;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.Before;
+import org.junit.Test;
+
 /**
  * Test case for {@link PDFDests}.
  */
 public class PDFDestsTestCase extends PDFObjectTestCase {
 
     private PDFDests dests = new PDFDests();
-    private String expectedString = "<< /Names [(number) 10 (name) /Test#20name] >>\n";
+    private String expectedString = "<< /Names [(number) 10 (name) /Test#20name] >>";
 
     @Before
     public void setUp() {

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,17 +19,18 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.io.output.CountingOutputStream;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.output.CountingOutputStream;
+
 
 /**
  * Test case for {@link PDFDictionary}.
@@ -47,7 +48,7 @@ public class PDFDictionaryTestCase exten
                                   + "  /array [1 (two) 20]\n"
                                   + "  /number 20\n"
                                   + "  /null null\n"
-                                  + ">>\n";
+                                  + ">>";
 
     @Before
     public void setUp() {

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java Thu Jan 30 15:51:03 2014
@@ -24,8 +24,6 @@ import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.Graphics2D;
 
-import junit.framework.Assert;
-
 import org.junit.Test;
 
 import org.apache.commons.io.output.ByteArrayOutputStream;
@@ -34,6 +32,8 @@ import org.apache.xmlgraphics.util.UnitC
 
 import org.apache.fop.svg.PDFDocumentGraphics2D;
 
+import junit.framework.Assert;
+
 /**
  * Tests for {@link PDFDocumentGraphics2D}.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,12 +19,12 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test case for {@link PDFDocument}

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,11 +19,11 @@ package org.apache.fop.pdf;
 
 import org.junit.Test;
 
-import org.apache.fop.fonts.CodePointMapping;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
+import org.apache.fop.fonts.CodePointMapping;
+
 public class PDFEncodingTestCase {
 
     /**

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java Thu Jan 30 15:51:03 2014
@@ -19,10 +19,6 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -43,6 +39,10 @@ import javax.crypto.spec.SecretKeySpec;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * Tests the {@link PDFEncryptionJCE} class.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,10 +19,10 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertFalse;
-
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+
 public class PDFFilterListTestCase {
 
     @Test

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNameTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNameTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNameTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNameTestCase.java Thu Jan 30 15:51:03 2014
@@ -22,11 +22,13 @@ package org.apache.fop.pdf;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.apache.commons.io.output.CountingOutputStream;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.fail;
+
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import org.apache.commons.io.output.CountingOutputStream;
 
 /**
  * Test class for {@link PDFName}.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNullTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNullTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNullTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNullTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,12 +19,12 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 import org.junit.Test;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test case for {@link PDFNull}.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumberTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumberTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumberTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumberTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,13 +19,13 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
  * This test tests PDFNumber's doubleOut() methods.

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,11 +19,11 @@
 
 package org.apache.fop.pdf;
 
+import java.io.IOException;
+
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.IOException;
-
 /**
  * Test case for {@link PDFNumsArray}.
  */

Modified: xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFObjectTestCase.java?rev=1562866&r1=1562865&r2=1562866&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFObjectTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_FopFontsForSVG/test/java/org/apache/fop/pdf/PDFObjectTestCase.java Thu Jan 30 15:51:03 2014
@@ -19,17 +19,17 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 /**
  * Tests the PDFObject class.
  */



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org


Mime
View raw message