svn commit: r1711909 - in /poi/trunk/src: ooxml/testcases/org/apache/poi/xssf/streaming/ ooxml/testcases/org/apache/poi/xssf/usermodel/ testcases/org/apache/poi/hssf/usermodel/ testcases/org/apache/poi/ss/usermodel/

[on...@apache.org]

Author: onealj
Date: Mon Nov  2 08:55:45 2015
New Revision: 1711909

URL: http://svn.apache.org/viewvc?rev=1711909&view=rev
Log:
upgrade spreadsheet Hyperlink unit tests from junit3 to junit4

Modified:
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
    poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
    poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java?rev=1711909&r1=1711908&r2=1711909&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSXSSFHyperlink.java Mon Nov  2 08:55:45 2015
@@ -19,6 +19,8 @@
 
 package org.apache.poi.xssf.streaming;
 
+import org.junit.After;
+
 import org.apache.poi.ss.usermodel.BaseTestHyperlink;
 import org.apache.poi.xssf.SXSSFITestDataProvider;
 
@@ -34,7 +36,7 @@ public class TestSXSSFHyperlink extends
     }
 
 
-    @Override
+    @After
     public void tearDown(){
         SXSSFITestDataProvider.instance.cleanup();
     }

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java?rev=1711909&r1=1711908&r2=1711909&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFHyperlink.java Mon Nov  2 08:55:45 2015
@@ -19,6 +19,10 @@ package org.apache.poi.xssf.usermodel;
 
 import java.io.IOException;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import org.apache.poi.openxml4j.opc.PackageRelationship;
 import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
 import org.apache.poi.ss.usermodel.BaseTestHyperlink;

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java?rev=1711909&r1=1711908&r2=1711909&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFHyperlink.java Mon Nov  2 08:55:45 2015
@@ -17,12 +17,18 @@
 
 package org.apache.poi.hssf.usermodel;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import org.junit.Test;
+
 import java.io.IOException;
 
 import org.apache.poi.hssf.HSSFITestDataProvider;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.ss.usermodel.BaseTestHyperlink;
 
+
 /**
  * Tests HSSFHyperlink.
  *
@@ -36,6 +42,7 @@ public final class TestHSSFHyperlink ext
     /**
      * Test that we can read hyperlinks.
      */
+    @Test
     public void testRead() {
 
         HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("HyperlinksOnManySheets.xls");

Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java?rev=1711909&r1=1711908&r2=1711909&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestHyperlink.java Mon Nov  2 08:55:45 2015
@@ -17,7 +17,8 @@
 
 package org.apache.poi.ss.usermodel;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
 
 import org.apache.poi.ss.ITestDataProvider;
 
@@ -26,7 +27,7 @@ import org.apache.poi.ss.ITestDataProvid
  *
  * @author Yegor Kozlov
  */
-public abstract class BaseTestHyperlink extends TestCase {
+public abstract class BaseTestHyperlink {
 
     private final ITestDataProvider _testDataProvider;
 
@@ -34,6 +35,7 @@ public abstract class BaseTestHyperlink
         _testDataProvider = testDataProvider;
     }
 
+    @Test
     public final void testBasicTypes(){
         Workbook wb = _testDataProvider.createWorkbook();
         CreationHelper createHelper = wb.getCreationHelper();



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