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 2014/01/13 21:39:41 UTC

svn commit: r1557840 [8/9] - in /xmlgraphics/fop/branches/Temp_InlineContainer: ./ examples/fo/basic/ lib/ src/codegen/unicode/java/org/apache/fop/complexscripts/bidi/ src/documentation/intermediate-format-ng/ src/java/org/apache/fop/ src/java/org/apac...

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/AssertElement.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/AssertElement.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImageLoaderTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/image/loader/batik/ImagePreloaderTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/intermediate/AbstractIFTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/AbstractIFTest.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/AbstractIFTest.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/AbstractIFTest.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/AreaTreeXMLFormatTestSuite.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/IFMimickingTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/intermediate/LayoutIFTestSuite.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/layoutengine/ElementListCheck.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/ElementListCheck.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/ElementListCheck.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/ElementListCheck.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutResult.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutResult.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutResult.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutengine/LayoutResult.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/layoutmgr/table/TableCellLayoutManagerTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/logging/LoggingElementListObserver.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/logging/LoggingElementListObserver.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/logging/LoggingElementListObserver.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/logging/LoggingElementListObserver.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/memory/MemoryEater.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/memory/MemoryEater.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/memory/MemoryEater.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/memory/MemoryEater.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/AbstractPDFStreamTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/FileIDGeneratorTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamManagerTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/ObjectStreamTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFAModeTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFAModeTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFAModeTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFAModeTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFArrayTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFArrayTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFArrayTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFArrayTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFDestsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDestsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDestsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDestsTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDictionaryTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentGraphics2DTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFDocumentTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFEncodingTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFEncryptionJCETestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFFilterListTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFNameTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNameTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNameTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNameTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFNullTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNullTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNullTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNullTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFNumberTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNumberTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNumberTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNumberTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFNumsArrayTestCase.java Mon Jan 13 20:39:34 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_InlineContainer/test/java/org/apache/fop/pdf/PDFObjectTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFObjectTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFObjectTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFObjectTestCase.java Mon Jan 13 20:39:34 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.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFPageLabelsTestCase.java Mon Jan 13 20:39:34 2014
@@ -37,11 +37,11 @@ public class PDFPageLabelsTestCase {
         int index = 0;
         StringBuilder expected = new StringBuilder();
         expected.append("[");
-        expected.append(index + " << /S /r >>\n");
+        expected.append(index + " << /S /r >>");
         pageLabels.addPageLabel(index++, "i");
         pageLabels.addPageLabel(index++, "ii");
         pageLabels.addPageLabel(index++, "iii");
-        expected.append(" " + index + " << /S /D >>\n");
+        expected.append(" " + index + " << /S /D >>");
         pageLabels.addPageLabel(index++, "1");
         pageLabels.addPageLabel(index++, "2");
         pageLabels.addPageLabel(index++, "3");
@@ -52,33 +52,33 @@ public class PDFPageLabelsTestCase {
         pageLabels.addPageLabel(index++, "8");
         pageLabels.addPageLabel(index++, "9");
         pageLabels.addPageLabel(index++, "10");
-        expected.append(" " + index + " << /S /A >>\n");
+        expected.append(" " + index + " << /S /A >>");
         pageLabels.addPageLabel(index++, "A");
         pageLabels.addPageLabel(index++, "B");
-        expected.append(" " + index + " << /S /R /St 100 >>\n");
+        expected.append(" " + index + " << /S /R /St 100 >>");
         pageLabels.addPageLabel(index++, "C");
-        expected.append(" " + index + " << /S /R /St 500 >>\n");
+        expected.append(" " + index + " << /S /R /St 500 >>");
         pageLabels.addPageLabel(index++, "D");
-        expected.append(" " + index + " << /S /A /St 5 >>\n");
+        expected.append(" " + index + " << /S /A /St 5 >>");
         pageLabels.addPageLabel(index++, "E");
         pageLabels.addPageLabel(index++, "F");
         pageLabels.addPageLabel(index++, "G");
-        expected.append(" " + index + " << /P (aa) >>\n");
+        expected.append(" " + index + " << /P (aa) >>");
         pageLabels.addPageLabel(index++, "aa");
-        expected.append(" " + index + " << /P (ab) >>\n");
+        expected.append(" " + index + " << /P (ab) >>");
         pageLabels.addPageLabel(index++, "ab");
-        expected.append(" " + index + " << /P (ac) >>\n");
+        expected.append(" " + index + " << /P (ac) >>");
         pageLabels.addPageLabel(index++, "ac");
-        expected.append(" " + index + " << /S /a >>\n");
+        expected.append(" " + index + " << /S /a >>");
         pageLabels.addPageLabel(index++, "a");
         pageLabels.addPageLabel(index++, "b");
-        expected.append(" " + index + " << /S /R /St 2 >>\n");
+        expected.append(" " + index + " << /S /R /St 2 >>");
         pageLabels.addPageLabel(index++, "II");
-        expected.append(" " + index + " << /S /R /St 12 >>\n");
+        expected.append(" " + index + " << /S /R /St 12 >>");
         pageLabels.addPageLabel(index++, "XII");
-        expected.append(" " + index + " <<\n  /P (00)\n  /S /D\n  /St 9\n>>\n");
+        expected.append(" " + index + " <<\n  /P (00)\n  /S /D\n  /St 9\n>>");
         pageLabels.addPageLabel(index++, "009");
-        expected.append(" " + index + " <<\n  /P (0)\n  /S /D\n  /St 10\n>>\n");
+        expected.append(" " + index + " <<\n  /P (0)\n  /S /D\n  /St 10\n>>");
         pageLabels.addPageLabel(index++, "010");
         pageLabels.addPageLabel(index++, "011");
         expected.append("]");

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFRectangleTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,14 +19,14 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
 /**
  * Test case for {@link PDFRectangle}.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFReferenceTestCase.java Mon Jan 13 20:39:34 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 PDFReference}.

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFStreamTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFStreamTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFStreamTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/PDFStreamTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,17 +19,17 @@
 
 package org.apache.fop.pdf;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class PDFStreamTestCase {
 
     private PDFStream stream;
@@ -118,7 +118,7 @@ public class PDFStreamTestCase {
 
     private byte[] createSampleStreamData() throws IOException {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        stream.write("stream\n".getBytes("US-ASCII"));
+        stream.write("\nstream\n".getBytes("US-ASCII"));
         stream.write(createSampleData());
         stream.write("\nendstream".getBytes("US-ASCII"));
         return stream.toByteArray();

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/TableHeaderScopeTestCase.java Mon Jan 13 20:39:34 2014
@@ -109,14 +109,14 @@ public class TableHeaderScopeTestCase {
     }
 
     private PDFDictionary scopeAttribute(Scope scope) {
-        return argThat(new isScopeAttribute(scope));
+        return argThat(new IsScopeAttribute(scope));
     }
 
-    private static class isScopeAttribute extends ArgumentMatcher<PDFDictionary> {
+    private static class IsScopeAttribute extends ArgumentMatcher<PDFDictionary> {
 
         private final Scope expectedScope;
 
-        public isScopeAttribute(Scope expectedScope) {
+        public IsScopeAttribute(Scope expectedScope) {
             this.expectedScope = expectedScope;
         }
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionControllerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionControllerTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionControllerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionControllerTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,13 +19,13 @@
 
 package org.apache.fop.pdf;
 
+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.junit.Before;
-import org.junit.Test;
-
 
 /**
  * A test class for {@link VersionController}.

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/VersionTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,11 +19,11 @@
 
 package org.apache.fop.pdf;
 
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.junit.Test;
-
 /**
  * This is a test case for ({@link Version}.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CompressedObjectReferenceTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,14 +19,14 @@
 
 package org.apache.fop.pdf.xref;
 
-import static org.junit.Assert.assertArrayEquals;
-
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
+
 public class CompressedObjectReferenceTestCase extends ObjectReferenceTest {
 
     @Test

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceObjectTest.java Mon Jan 13 20:39:34 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.pdf.xref;
 
-import static org.junit.Assert.assertArrayEquals;
-
 import java.io.ByteArrayOutputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -32,6 +30,8 @@ import java.util.Map;
 
 import org.junit.Before;
 
+import static org.junit.Assert.assertArrayEquals;
+
 import org.apache.fop.pdf.PDFDocument;
 import org.apache.fop.pdf.PDFInfo;
 import org.apache.fop.pdf.PDFPages;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/CrossReferenceTableTestCase.java Mon Jan 13 20:39:34 2014
@@ -73,7 +73,7 @@ public class CrossReferenceTableTestCase
                 .append("  /Info 2 0 R\n")
                 .append("  /ID [<0123456789ABCDEF> <0123456789ABCDEF>]\n")
                 .append("  /Size ").append(Integer.toString(offsets.size() + 1)).append('\n')
-                .append(">>\n");
+                .append(">>");
         return getBytes(expected);
     }
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/pdf/xref/UncompressedObjectReferenceTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,8 +19,6 @@
 
 package org.apache.fop.pdf.xref;
 
-import static org.junit.Assert.assertArrayEquals;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,6 +26,8 @@ import java.util.List;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertArrayEquals;
+
 public class UncompressedObjectReferenceTestCase extends ObjectReferenceTest {
 
     @Test

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/AbstractRenderingTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/AbstractRenderingTest.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/AbstractRenderingTest.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/AbstractRenderingTest.java Mon Jan 13 20:39:34 2014
@@ -33,6 +33,7 @@ import javax.xml.transform.stream.Stream
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.Fop;
 import org.apache.fop.apps.FopFactory;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RawPNGTestUtil.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RawPNGTestUtil.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RawPNGTestUtil.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RawPNGTestUtil.java Mon Jan 13 20:39:34 2014
@@ -28,9 +28,9 @@ import org.apache.xmlgraphics.image.load
 
 public final class RawPNGTestUtil {
 
-    private static int NUM_ROWS = 32;
-    private static int NUM_COLUMNS = 32;
-    private static int DPI = 72;
+    private static final int NUM_ROWS = 32;
+    private static final int NUM_COLUMNS = 32;
+    private static final int DPI = 72;
 
     private RawPNGTestUtil() {
 
@@ -83,7 +83,7 @@ public final class RawPNGTestUtil {
     }
 
     /**
-     * 
+     *
      * @return a default ImageSize
      */
     public static ImageSize getImageSize() {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RendererFactoryTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RendererFactoryTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RendererFactoryTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/RendererFactoryTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,13 +19,13 @@
 
 package org.apache.fop.render;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import org.apache.commons.io.output.NullOutputStream;
 
 import org.apache.fop.apps.FOPException;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPBorderPainterTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,12 +19,15 @@
 
 package org.apache.fop.render.afp;
 
-import static org.junit.Assert.assertTrue;
-
 import java.awt.Color;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertTrue;
+
 import org.apache.fop.afp.AFPBorderPainter;
 import org.apache.fop.afp.AFPLineDataInfo;
 import org.apache.fop.afp.AFPPaintingState;
@@ -32,8 +35,6 @@ import org.apache.fop.afp.BorderPainting
 import org.apache.fop.afp.DataStream;
 import org.apache.fop.afp.Factory;
 import org.apache.fop.fo.Constants;
-import org.junit.Before;
-import org.junit.Test;
 
 public class AFPBorderPainterTestCase {
     private ByteArrayOutputStream outStream;
@@ -63,12 +64,12 @@ public class AFPBorderPainterTestCase {
         ds.endDocument();
         assertTrue(line.getX1() == 4999 && line.getX2() == 8332);
     }
-    
+
     class MyDataStream extends DataStream {
         public MyDataStream(Factory factory, AFPPaintingState paintingState, OutputStream outputStream) {
             super(factory, paintingState, outputStream);
         }
-        
+
         public void createLine(AFPLineDataInfo lineDataInfo) {
             line = lineDataInfo;
         }

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfigParserTestCase.java Mon Jan 13 20:39:34 2014
@@ -25,6 +25,10 @@ import java.util.Map;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import org.apache.fop.afp.AFPConstants;
 import org.apache.fop.apps.AFPRendererConfBuilder;
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
@@ -33,9 +37,6 @@ import org.apache.fop.render.afp.AFPRend
 
 import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_COLOR;
 import static org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions.MODE_GRAYSCALE;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 
 public class AFPRendererConfigParserTestCase
         extends AbstractRendererConfigParserTester<AFPRendererConfBuilder, AFPRendererConfig> {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/AFPRendererConfiguratorTestCase.java Mon Jan 13 20:39:34 2014
@@ -24,6 +24,9 @@ import java.util.Map;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.verify;
+
 import org.apache.fop.afp.AFPResourceLevel;
 import org.apache.fop.afp.AFPResourceLevel.ResourceType;
 import org.apache.fop.afp.AFPResourceLevelDefaults;
@@ -33,9 +36,6 @@ import org.apache.fop.apps.MimeConstants
 import org.apache.fop.render.afp.AFPRendererConfig.AFPRendererConfigParser;
 import org.apache.fop.render.afp.AFPRendererConfig.ImagesModeOptions;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.verify;
-
 public class AFPRendererConfiguratorTestCase extends
         AbstractRendererConfiguratorTest<AFPRendererConfigurator, AFPRendererConfBuilder> {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/NoOperationTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/NoOperationTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/afp/NoOperationTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,20 +19,22 @@
 
 package org.apache.fop.render.afp;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import org.apache.commons.io.IOUtils;
+
 import org.apache.fop.afp.AFPConstants;
 import org.apache.fop.afp.parser.MODCAParser;
 import org.apache.fop.afp.parser.UnparsedStructuredField;
 import org.apache.fop.apps.FOUserAgent;
-import org.junit.Test;
 
 /**
  * Tests generation of afp:no-operation (NOPs).

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfigParserTester.java Mon Jan 13 20:39:34 2014
@@ -24,6 +24,11 @@ import java.awt.image.BufferedImage;
 
 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;
+
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
 import org.apache.fop.apps.BitmapRendererConfBuilder;
 import org.apache.fop.render.bitmap.BitmapRendererConfig.BitmapRendererConfigParser;
@@ -36,10 +41,6 @@ import static org.apache.fop.render.bitm
 import static org.apache.fop.render.bitmap.BitmapRendererOption.JAVA2D_TRANSPARENT_PAGE_BACKGROUND;
 import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_QUALITY;
 import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_SPEED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 
 public class AbstractBitmapRendererConfigParserTester
         extends AbstractRendererConfigParserTester<BitmapRendererConfBuilder, BitmapRendererConfig> {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/AbstractBitmapRendererConfiguratorTest.java Mon Jan 13 20:39:34 2014
@@ -23,6 +23,11 @@ import java.awt.image.BufferedImage;
 
 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.mockito.Mockito.when;
+
 import org.apache.fop.apps.AbstractRendererConfiguratorTest;
 import org.apache.fop.apps.BitmapRendererConfBuilder;
 import org.apache.fop.render.intermediate.IFDocumentHandler;
@@ -35,10 +40,6 @@ import static org.apache.fop.render.bitm
 import static org.apache.fop.render.bitmap.BitmapRendererOption.COLOR_MODE_RGBA;
 import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_QUALITY;
 import static org.apache.fop.render.bitmap.BitmapRendererOption.RENDERING_SPEED;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
 
 public abstract class AbstractBitmapRendererConfiguratorTest extends
         AbstractRendererConfiguratorTest<BitmapRendererConfigurator, BitmapRendererConfBuilder> {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfigParserTestCase.java Mon Jan 13 20:39:34 2014
@@ -21,16 +21,16 @@ package org.apache.fop.render.bitmap;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.xmlgraphics.image.writer.Endianness;
 
 import org.apache.fop.apps.FopConfBuilder;
 import org.apache.fop.apps.TIFFRendererConfBuilder;
 import org.apache.fop.render.bitmap.TIFFRendererConfig.TIFFRendererConfigParser;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 public class TIFFRendererConfigParserTestCase
 extends AbstractBitmapRendererConfigParserTester {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/bitmap/TIFFRendererConfiguratorTestCase.java Mon Jan 13 20:39:34 2014
@@ -23,6 +23,10 @@ import java.awt.image.BufferedImage;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.xmlgraphics.image.writer.Endianness;
 
 import org.apache.fop.apps.FopConfBuilder;
@@ -32,9 +36,6 @@ import org.apache.fop.render.bitmap.TIFF
 
 import static org.apache.fop.render.bitmap.TIFFCompressionValue.CCITT_T4;
 import static org.apache.fop.render.bitmap.TIFFCompressionValue.CCITT_T6;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
 
 public class TIFFRendererConfiguratorTestCase extends AbstractBitmapRendererConfiguratorTest {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageBoundariesTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,15 +19,15 @@
 
 package org.apache.fop.render.extensions.prepress;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
 import java.awt.Dimension;
 import java.awt.Rectangle;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 /**
  * Tests for the fox:bleed, fox:crop-offset, fox:crop-box extension properties.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/extensions/prepress/PageScaleTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,14 +19,14 @@
 
 package org.apache.fop.render.extensions.prepress;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
 import java.awt.geom.Point2D;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 /**
  * Tests for the fox:scale extension property.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/AbstractIFPainterTestCase.java Mon Jan 13 20:39:34 2014
@@ -26,15 +26,15 @@ import org.junit.Before;
 import org.junit.Test;
 import org.w3c.dom.Document;
 
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import org.apache.fop.fonts.FontInfo;
 import org.apache.fop.fonts.FontTriplet;
 import org.apache.fop.render.RenderingContext;
 import org.apache.fop.traits.BorderProps;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 public class AbstractIFPainterTestCase {
 
     private AbstractIFPainter<?> sut;
@@ -51,7 +51,7 @@ public class AbstractIFPainterTestCase {
             public void endViewport() throws IFException {
             }
 
-            public void startGroup(AffineTransform transform) throws IFException {
+            public void startGroup(AffineTransform transform, String layer) throws IFException {
             }
 
             public void endGroup() throws IFException {

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/ArcToBezierCurveTransformerTestCase.java Mon Jan 13 20:39:34 2014
@@ -76,4 +76,4 @@ public class ArcToBezierCurveTransformer
             fail("Angle " + angle + " is in (0, " + Math.PI / 2 + ")");
         }
     }
-}
\ No newline at end of file
+}

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java Mon Jan 13 20:39:34 2014
@@ -575,4 +575,4 @@ public class BorderPainterTestCase {
     }
 
 
-}
\ No newline at end of file
+}

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/IFStructureTreeBuilderTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,14 +19,6 @@
 
 package org.apache.fop.render.intermediate;
 
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentMatcher;
@@ -36,6 +28,14 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.fo.extensions.InternalElementMapping;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/intermediate/SAXEventRecorderTestCase.java Mon Jan 13 20:39:34 2014
@@ -20,10 +20,6 @@
 package org.apache.fop.render.intermediate;
 
 
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InOrder;
@@ -32,6 +28,10 @@ import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.AttributesImpl;
 
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 import org.apache.fop.render.intermediate.IFStructureTreeBuilder.SAXEventRecorder;
 import org.apache.fop.util.XMLUtil;
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/java2d/Java2DRendererConfigParserTestcase.java Mon Jan 13 20:39:34 2014
@@ -21,17 +21,14 @@ package org.apache.fop.render.java2d;
 
 import org.junit.Test;
 
-import org.apache.avalon.framework.configuration.Configuration;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.Java2DRendererConfBuilder;
 import org.apache.fop.render.java2d.Java2DRendererConfig.Java2DRendererConfigParser;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
 public class Java2DRendererConfigParserTestcase
         extends AbstractRendererConfigParserTester<Java2DRendererConfBuilder, Java2DRendererConfig> {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfigParserTestCase.java Mon Jan 13 20:39:34 2014
@@ -21,13 +21,13 @@ package org.apache.fop.render.pcl;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 import org.apache.fop.apps.AbstractRendererConfigParserTester;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.MimeConstants;
 import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
 
-import static org.junit.Assert.assertEquals;
-
 public class PCLRendererConfigParserTestCase
         extends AbstractRendererConfigParserTester<PCLRendererConfBuilder, PCLRendererConfig> {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pcl/PCLRendererConfiguratorTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,16 +19,16 @@ package org.apache.fop.render.pcl;
 
 import org.junit.Test;
 
-import org.apache.fop.apps.AbstractRendererConfiguratorTest;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.MimeConstants;
-import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.when;
 
+import org.apache.fop.apps.AbstractRendererConfiguratorTest;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.MimeConstants;
+import org.apache.fop.render.pcl.PCLRendererConfig.PCLRendererConfigParser;
+
 public class PCLRendererConfiguratorTestCase extends
         AbstractRendererConfiguratorTest<PCLRendererConfigurator, PCLRendererConfBuilder> {
 

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java Mon Jan 13 20:39:34 2014
@@ -25,11 +25,11 @@ import java.io.IOException;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
+import static org.junit.Assert.fail;
+
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.pdf.PDFConformanceException;
 
-import static org.junit.Assert.fail;
-
 /**
  * Tests PDF/A-1 functionality.
  */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,15 +19,14 @@
 
 package org.apache.fop.render.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
 import java.util.Calendar;
 import java.util.TimeZone;
 
-import org.apache.fop.pdf.PDFDocument;
-import org.apache.fop.pdf.PDFInfo;
-import org.apache.fop.pdf.PDFMetadata;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
 import org.apache.xmlgraphics.xmp.Metadata;
 import org.apache.xmlgraphics.xmp.schemas.DublinCoreAdapter;
 import org.apache.xmlgraphics.xmp.schemas.DublinCoreSchema;
@@ -35,7 +34,10 @@ import org.apache.xmlgraphics.xmp.schema
 import org.apache.xmlgraphics.xmp.schemas.XMPBasicSchema;
 import org.apache.xmlgraphics.xmp.schemas.pdf.AdobePDFAdapter;
 import org.apache.xmlgraphics.xmp.schemas.pdf.AdobePDFSchema;
-import org.junit.Test;
+
+import org.apache.fop.pdf.PDFDocument;
+import org.apache.fop.pdf.PDFInfo;
+import org.apache.fop.pdf.PDFMetadata;
 
 /**
  * Test case for PDF/A metadata handling.

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,13 +19,14 @@
 
 package org.apache.fop.render.pdf;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.StringWriter;
 
-import org.apache.fop.pdf.CMapBuilder;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
+import org.apache.fop.pdf.CMapBuilder;
+
 /** Simple sanity test of the PDFCmap class */
 public class PDFCMapTestCase {
     private static final String EOL = "\n";
@@ -60,8 +61,7 @@ public class PDFCMapTestCase {
             + "end" + EOL
             + "end" + EOL
             + "%%EndResource" + EOL
-            + "%%EOF" + EOL
-        ;
+            + "%%EOF" + EOL;
 
         final StringWriter w = new StringWriter();
         final CMapBuilder builder = new CMapBuilder(w, "test");

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java Mon Jan 13 20:39:34 2014
@@ -19,9 +19,6 @@
 
 package org.apache.fop.render.pdf;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.StringTokenizer;
@@ -30,6 +27,9 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.xml.sax.SAXException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.apache.fop.apps.FOUserAgent;
 
 /** Test that characters are correctly encoded in a generated PDF file */

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFGraphicsPainterTestCase.java Mon Jan 13 20:39:34 2014
@@ -24,12 +24,12 @@ import java.io.IOException;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.fop.pdf.PDFNumber;
-
 import static org.mockito.Matchers.endsWith;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
+import org.apache.fop.pdf.PDFNumber;
+
 public class PDFGraphicsPainterTestCase {
 
     private PDFGraphicsPainter sut;

Modified: xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java?rev=1557840&r1=1557839&r2=1557840&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_InlineContainer/test/java/org/apache/fop/render/pdf/PDFPainterTestCase.java Mon Jan 13 20:39:34 2014
@@ -24,17 +24,17 @@ import java.awt.Rectangle;
 
 import org.junit.Test;
 
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.fo.Constants;
-import org.apache.fop.render.intermediate.IFContext;
-import org.apache.fop.traits.BorderProps;
-
 import static org.mockito.Matchers.endsWith;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.fo.Constants;
+import org.apache.fop.render.intermediate.IFContext;
+import org.apache.fop.traits.BorderProps;
+
 public class PDFPainterTestCase {
 
     @Test



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