commit 9d93e319e0b853e8b75eff61cc8d90d45b90fa99
author Simon Steiner <ssteiner@apache.org> Tue Jul 18 09:17:38 2017 +0000
committer Simon Steiner <ssteiner@apache.org> Tue Jul 18 09:17:38 2017 +0000
tree 6d3e7101af676a1f6fc69101c93bee17f21df495
parent cbff06cce99504687d2be29a5bb811f26435414e

Cleanup test

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1802257 13f79535-47bb-0310-9956-ffa450edef68

test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java

diff --git a/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java b/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
index 2e16941..89905fd 100644
--- a/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/StructureTreeMergerTestCase.java
@@ -23,6 +23,7 @@
 import java.util.HashMap;
 import java.util.List;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import org.apache.pdfbox.cos.COSArray;
@@ -60,7 +61,6 @@
 
     @Test
     public void testCopyStructure() throws IOException {
-        setUp();
         PDDocument doc = PDDocument.load(new File(LINK));
         PDPage srcPage = doc.getPage(0);
         PageParentTreeFinder finder = new PageParentTreeFinder(srcPage);
@@ -80,7 +80,6 @@
 
     @Test
     public void testNullEntriesInParentTree() throws IOException {
-        setUp();
         PDDocument doc = PDDocument.load(new File(LINK));
         PDPage srcPage = doc.getPage(0);
         PageParentTreeFinder finder = new PageParentTreeFinder(srcPage);
@@ -98,7 +97,6 @@
 
     @Test
     public void testOBJRCorrectPosition() throws IOException {
-        setUp();
         PDDocument doc = PDDocument.load(new File(MissingOBJR));
         PDPage srcPage = doc.getPage(0);
         PageParentTreeFinder finder = new PageParentTreeFinder(srcPage);
@@ -156,7 +154,8 @@
         }
     }
 
-    private void setUp() {
+    @Before
+    public void setUp() {
         Rectangle2D r = new Rectangle2D.Double();
         pdfDoc = new PDFDocument(" ");
         pdfPage = new PDFPage(new PDFResources(pdfDoc), 0, r, r, r, r);
@@ -174,7 +173,6 @@
 
     @Test
     public void testCheckNullCOSObject() throws IOException {
-        setUp();
         PDDocument doc = PDDocument.load(new File(BrokenLink));
         PDPage srcPage = doc.getPage(0);
         PageParentTreeFinder finder = new PageParentTreeFinder(srcPage);
@@ -202,7 +200,6 @@
     public void testDirectDescedants() throws IOException {
         PDFStructElem elem = new PDFStructElem();
         elem.setObjectNumber(100);
-        setUp();
         adapter = new PDFBoxAdapter(pdfPage, new HashMap(), new HashMap<Integer, PDFArray>());
         PDFLogicalStructureHandler handler = setUpPDFLogicalStructureHandler();
         PDPage srcPage = new PDPage();