poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cen...@apache.org
Subject svn commit: r1765876 - in /poi/trunk/src: integrationtest/org/apache/poi/TestAllFiles.java testcases/org/apache/poi/hssf/dev/TestReSave.java
Date Thu, 20 Oct 2016 20:31:57 GMT
Author: centic
Date: Thu Oct 20 20:31:57 2016
New Revision: 1765876

URL: http://svn.apache.org/viewvc?rev=1765876&view=rev
Log:
Exclude new BIFF5 file in some unit tests

Modified:
    poi/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java
    poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java

Modified: poi/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java?rev=1765876&r1=1765875&r2=1765876&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java (original)
+++ poi/trunk/src/integrationtest/org/apache/poi/TestAllFiles.java Thu Oct 20 20:31:57 2016
@@ -189,6 +189,7 @@ public class TestAllFiles {
         OLD_FILES.add("document/word95err.doc");
         OLD_FILES.add("hpsf/TestMickey.doc");
         OLD_FILES.add("document/52117.doc");
+        OLD_FILES.add("spreadsheet/60284.xls");
     }
 
     private static final Set<String> EXPECTED_FAILURES = new HashSet<String>();

Modified: poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java?rev=1765876&r1=1765875&r2=1765876&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/dev/TestReSave.java Thu Oct 20 20:31:57 2016
@@ -16,13 +16,6 @@
 ==================================================================== */
 package org.apache.poi.hssf.dev;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.poi.EncryptedDocumentException;
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.hssf.OldExcelFormatException;
@@ -32,6 +25,11 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.File;
+import java.io.PrintStream;
+
+import static org.junit.Assert.assertTrue;
+
 public class TestReSave extends BaseXLSIteratingTest {
     @BeforeClass
     public static void setup() {
@@ -76,7 +74,7 @@ public class TestReSave extends BaseXLSI
     			ReSave.main(new String[] { "-bos", reSavedFile.getAbsolutePath() });
 			} finally {
 				// clean up the re-saved file
-				reSavedFile.delete();
+				assertTrue(!reSavedFile.exists() || reSavedFile.delete());
 			}
 
 		} finally {
@@ -92,10 +90,6 @@ public class TestReSave extends BaseXLSI
             dataDirName = "test-data";
         }
 
-        List<String> failed = new ArrayList<String>();
         runOneFile(new File(dataDirName + "/spreadsheet", "49931.xls"));
-
-        assertTrue("Expected to have no failed except the ones excluded, but had: " + failed,

-                failed.isEmpty());
     }
 }



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


Mime
View raw message