svn commit: r1853575 - /xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/

Thu, 14 Feb 2019 05:49:44 -0800 

Author: ssteiner
Date: Thu Feb 14 13:49:23 2019
New Revision: 1853575

URL: http://svn.apache.org/viewvc?rev=1853575&view=rev
Log:
Use modern junit

Modified:
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java
    
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/DocumentRootModifierTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -21,6 +21,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.pdfbox.cos.COSDictionary;
@@ -38,7 +39,7 @@ import org.apache.fop.pdf.PDFStructTreeR
 import org.apache.fop.render.pdf.pdfbox.DocumentRootModifier;
 import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
 
-import junit.framework.Assert;
+
 
 public class DocumentRootModifierTestCase {
     private static final String CLASSMAP = "test/resources/classMap.pdf";

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -32,6 +32,7 @@ import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import static org.mockito.Matchers.any;
@@ -84,7 +85,7 @@ import org.apache.fop.render.ps.PSDocume
 import org.apache.fop.render.ps.PSImageFormResource;
 import org.apache.fop.render.ps.PSRenderingUtil;
 
-import junit.framework.Assert;
+
 
 public class PDFBoxAdapterTestCase {
     protected static final String CFF1 = "test/resources/2fonts.pdf";

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -25,6 +25,7 @@ import java.awt.geom.Rectangle2D;
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -41,7 +42,7 @@ import org.apache.fop.render.pdf.pdfbox.
 import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
 import org.apache.fop.render.pdf.pdfbox.PSPDFGraphics2D;
 
-import junit.framework.Assert;
+
 
 public class PDFRotateTestCase {
 
@@ -61,7 +62,7 @@ public class PDFRotateTestCase {
         GraphicContext gc = new GraphicContext();
         g2d.setGraphicContext(gc);
         ig.getGraphics2DImagePainter().paint(g2d, rect);
-        Assert.assertEquals(g2d.getTransform().getShearX(), 
0.16339869281045735);
+        Assert.assertEquals(g2d.getTransform().getShearX(), 
0.16339869281045735, 0);
     }
 
     @Test
@@ -70,7 +71,7 @@ public class PDFRotateTestCase {
         Assert.assertEquals(getTransform(270), new AffineTransform(0, -1, -1, 
0, 842, 595));
         AffineTransform at = getTransform(180);
         Assert.assertEquals((int)at.getTranslateX(), 842);
-        Assert.assertEquals(at.getTranslateY(), 0.0);
+        Assert.assertEquals(at.getTranslateY(), 0.0, 0);
     }
 
     private AffineTransform getTransform(int angle) throws IOException {

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PageParentTreeFinderTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -20,6 +20,7 @@ package org.apache.fop.render.pdf;
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.pdfbox.cos.COSArray;
@@ -35,7 +36,7 @@ import org.apache.pdfbox.pdmodel.common.
 
 import org.apache.fop.render.pdf.pdfbox.PageParentTreeFinder;
 
-import junit.framework.Assert;
+
 
 public class PageParentTreeFinderTestCase {
     private static final String LINK = "test/resources/linkTagged.pdf";

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PreloaderPDFTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -27,6 +27,7 @@ import java.io.InputStream;
 import javax.imageio.ImageIO;
 import javax.imageio.stream.MemoryCacheImageInputStream;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -41,7 +42,7 @@ import org.apache.fop.render.pdf.pdfbox.
 import org.apache.fop.render.pdf.pdfbox.PreloaderImageRawData;
 import org.apache.fop.render.pdf.pdfbox.PreloaderPDF;
 
-import junit.framework.Assert;
+
 
 public class PreloaderPDFTestCase {
 

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -49,7 +50,7 @@ import org.apache.fop.render.pdf.pdfbox.
 import org.apache.fop.render.pdf.pdfbox.PageParentTreeFinder;
 import org.apache.fop.render.pdf.pdfbox.StructureTreeMerger;
 
-import junit.framework.Assert;
+
 
 public class StructureTreeMergerTestCase {
     private static final String LINK = "test/resources/linkTagged.pdf";

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/StructureTreeMergerUtilTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -19,6 +19,7 @@ package org.apache.fop.render.pdf;
 
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.pdfbox.cos.COSDictionary;
@@ -26,7 +27,7 @@ import org.apache.pdfbox.cos.COSName;
 
 import org.apache.fop.render.pdf.pdfbox.StructureTreeMergerUtil;
 
-import junit.framework.Assert;
+
 
 public class StructureTreeMergerUtilTestCase {
 

Modified: 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java?rev=1853575&r1=1853574&r2=1853575&view=diff
==============================================================================
--- 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java
 (original)
+++ 
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/TaggedPDFConductorTestCase.java
 Thu Feb 14 13:49:23 2019
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -40,7 +41,7 @@ import org.apache.fop.pdf.PDFStructElem;
 import org.apache.fop.render.pdf.pdfbox.PDFBoxAdapter;
 import org.apache.fop.render.pdf.pdfbox.TaggedPDFConductor;
 
-import junit.framework.Assert;
+
 
 public class TaggedPDFConductorTestCase {
     private static final String LINK = "test/resources/linkTagged.pdf";



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

Reply via email to