From 2f92dafd21360e253cdc1ca8f114b1d063c36827 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Thu, 14 Feb 2019 13:49:31 +0000 Subject: Use modern junit git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1853576 13f79535-47bb-0310-9956-ffa450edef68 --- fop-core/src/test/java/org/apache/fop/pdf/PDFAttachmentTestCase.java | 3 ++- fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java | 3 ++- .../test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java | 3 ++- fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java | 4 ++-- .../src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java | 3 ++- .../src/test/java/org/apache/fop/render/pcl/PCLPainterTestCase.java | 3 ++- 6 files changed, 12 insertions(+), 7 deletions(-) (limited to 'fop-core') diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFAttachmentTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFAttachmentTestCase.java index db7048670..f1e7423a0 100644 --- a/fop-core/src/test/java/org/apache/fop/pdf/PDFAttachmentTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFAttachmentTestCase.java @@ -25,6 +25,7 @@ import java.io.File; import javax.xml.transform.stream.StreamResult; +import org.junit.Assert; import org.junit.Test; import org.apache.fop.apps.FOUserAgent; @@ -37,7 +38,7 @@ import org.apache.fop.render.intermediate.extensions.URIAction; import org.apache.fop.render.pdf.PDFDocumentHandler; import org.apache.fop.render.pdf.extensions.PDFEmbeddedFileAttachment; -import junit.framework.Assert; + public class PDFAttachmentTestCase { private FOUserAgent ua = FopFactory.newInstance(new File(".").toURI()).newFOUserAgent(); diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java index 4ee98b665..023463630 100644 --- a/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFPagePieceTestCase.java @@ -25,6 +25,7 @@ import java.util.Arrays; import javax.xml.transform.stream.StreamResult; +import org.junit.Assert; import org.junit.Test; import static org.mockito.Mockito.mock; @@ -40,7 +41,7 @@ import org.apache.fop.render.pdf.extensions.PDFDictionaryAttachment; import org.apache.fop.render.pdf.extensions.PDFDictionaryExtension; import org.apache.fop.render.pdf.extensions.PDFDictionaryType; -import junit.framework.Assert; + public class PDFPagePieceTestCase { @Test diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java index 802474cab..6a59bc503 100644 --- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPImageHandlerTestCase.java @@ -21,12 +21,13 @@ package org.apache.fop.render.afp; import java.awt.Rectangle; +import org.junit.Assert; import org.junit.Test; import org.apache.fop.afp.AFPObjectAreaInfo; import org.apache.fop.afp.AFPPaintingState; -import junit.framework.Assert; + public class AFPImageHandlerTestCase { diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java index 9f0f92322..12c2f55cc 100644 --- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java +++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPParser.java @@ -24,11 +24,11 @@ import java.io.InputStream; import java.util.HashMap; import java.util.Map; +import org.junit.Assert; + import org.apache.fop.afp.AFPConstants; import org.apache.fop.afp.ptoca.PtocaBuilder; -import junit.framework.Assert; - public class AFPParser { private boolean readText; public AFPParser(boolean readText) { diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java index 333a23983..0caf83df8 100644 --- a/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/render/afp/AFPTrueTypeTestCase.java @@ -36,6 +36,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXResult; import javax.xml.transform.stream.StreamSource; +import org.junit.Assert; import org.junit.Test; import org.xml.sax.SAXException; @@ -65,7 +66,7 @@ import org.apache.fop.fonts.FontTriplet; import org.apache.fop.fonts.MultiByteFont; import org.apache.fop.render.intermediate.IFException; -import junit.framework.Assert; + public class AFPTrueTypeTestCase { private String font; diff --git a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLPainterTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLPainterTestCase.java index 326c93b16..f69ab491a 100644 --- a/fop-core/src/test/java/org/apache/fop/render/pcl/PCLPainterTestCase.java +++ b/fop-core/src/test/java/org/apache/fop/render/pcl/PCLPainterTestCase.java @@ -30,6 +30,7 @@ import java.net.URISyntaxException; import javax.xml.transform.stream.StreamResult; +import org.junit.Assert; import org.junit.Test; import org.apache.fop.apps.FOUserAgent; @@ -42,7 +43,7 @@ import org.apache.fop.render.intermediate.IFContext; import org.apache.fop.render.intermediate.IFException; import org.apache.fop.render.java2d.CustomFontMetricsMapper; -import junit.framework.Assert; + public class PCLPainterTestCase { private FOUserAgent ua = FopFactory.newInstance(new File(".").toURI()).newFOUserAgent(); -- cgit v1.2.3