svn commit: r1765740 - /poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java

[on...@apache.org]

Author: onealj
Date: Thu Oct 20 02:24:17 2016
New Revision: 1765740

URL: http://svn.apache.org/viewvc?rev=1765740&view=rev
Log:
upgrade to junit4

Modified:
    poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java

Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java?rev=1765740&r1=1765739&r2=1765740&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/TestReWriteSanity.java Thu Oct 20 02:24:17 2016
@@ -18,15 +18,24 @@
 package org.apache.poi.hslf;
 
 
-import junit.framework.TestCase;
+import static org.apache.poi.POITestCase.assertContains;
+import static org.junit.Assert.assertEquals;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.apache.poi.hslf.record.*;
-import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
-import org.apache.poi.poifs.filesystem.*;
 import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.record.CurrentUserAtom;
+import org.apache.poi.hslf.record.PersistPtrHolder;
+import org.apache.poi.hslf.record.Record;
+import org.apache.poi.hslf.record.UserEditAtom;
+import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests that HSLFSlideShow writes the powerpoint bit of data back out
@@ -34,18 +43,26 @@ import org.apache.poi.POIDataSamples;
  *
  * @author Nick Burch (nick at torchbox dot com)
  */
-public final class TestReWriteSanity extends TestCase {
+public final class TestReWriteSanity {
 	// HSLFSlideShow primed on the test data
-	private final HSLFSlideShowImpl ss;
+	private HSLFSlideShowImpl ss;
 	// POIFS primed on the test data
-	private final POIFSFileSystem pfs;
+	private POIFSFileSystem pfs;
 
-    public TestReWriteSanity() throws Exception {
+	@Before
+    public void setUp() throws Exception {
         POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
 		pfs = new POIFSFileSystem(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
 		ss = new HSLFSlideShowImpl(pfs);
     }
+	
+	@After
+	public void tearDown() throws Exception {
+	    pfs.close();
+	    ss.close();
+	}
 
+    @Test
 	public void testUserEditAtomsRight() throws Exception {
 		// Write out to a byte array
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -87,8 +104,8 @@ public final class TestReWriteSanity ext
 				int luPos = uea.getLastUserEditAtomOffset();
 				int ppPos = uea.getPersistPointersOffset();
 
-				assertTrue(pp.containsKey(Integer.valueOf(ppPos)));
-				assertTrue(ue.containsKey(Integer.valueOf(luPos)));
+				assertContains(ue, Integer.valueOf(luPos));
+				assertContains(pp, Integer.valueOf(ppPos));
 			}
 		}
 



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