moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

IDE warnings, slightly more tests and fix test to not leave a modified file behind

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1844894 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2018-10-26 10:58:37 +00:00
parent 232616f44d
commit b0f5c2ca7b
2 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
View File

@ -83,9 +83,7 @@ public final class TestOPCComplianceCoreProperties {
try {
InputStream is = OpenXML4JTestDataSamples.openComplianceSampleStream("OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx");
pkg = OPCPackage.open(is);
} catch (InvalidFormatException e) {
throw new RuntimeException(e);
} catch (IOException e) {
} catch (InvalidFormatException | IOException e) {
throw new RuntimeException(e);
}
pkg.revert();
@ -151,9 +149,7 @@ public final class TestOPCComplianceCoreProperties {
OPCPackage pkg;
try {
pkg = OPCPackage.open(is);
} catch (InvalidFormatException e) {
throw new RuntimeException(e);
} catch (IOException e) {
} catch (InvalidFormatException | IOException e) {
throw new RuntimeException(e);
}
URI partUri = createURI("/docProps/core2.xml");

46
src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
View File

@ -31,6 +31,7 @@ import java.io.InputStream;
import org.apache.poi.EmptyFileException;
import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.openxml4j.opc.OPCPackage;
@ -109,6 +110,13 @@ public final class TestWorkbookFactory {
assertTrue(wb instanceof HSSFWorkbook);
assertCloseDoesNotModifyFile(xls, wb);
wb = WorkbookFactory.create(
new POIFSFileSystem(HSSFTestDataSamples.openSampleFileStream(xls)).getRoot()
);
assertNotNull(wb);
assertTrue(wb instanceof HSSFWorkbook);
assertCloseDoesNotModifyFile(xls, wb);
// Package -> xssf
wb = XSSFWorkbookFactory.create(
OPCPackage.open(
@ -403,15 +411,15 @@ public final class TestWorkbookFactory {
assertTrue(altXLS.exists());
assertTrue(altXLSX.exists());
try (Workbook wb = WorkbookFactory.create(altXLS)) {
assertNotNull(wb);
assertTrue(wb instanceof HSSFWorkbook);
}
Workbook wb = WorkbookFactory.create(altXLS);
assertNotNull(wb);
assertTrue(wb instanceof HSSFWorkbook);
closeOrRevert(wb);
try (Workbook wb = WorkbookFactory.create(altXLSX)) {
assertNotNull(wb);
assertTrue(wb instanceof XSSFWorkbook);
}
wb = WorkbookFactory.create(altXLSX);
assertNotNull(wb);
assertTrue(wb instanceof XSSFWorkbook);
closeOrRevert(wb);
}
private static class TestFile extends File {
@ -425,12 +433,24 @@ public final class TestWorkbookFactory {
*/
@Test
public void testCreateEmpty() throws Exception {
try (Workbook wb = WorkbookFactory.create(false)) {
assertTrue(wb instanceof HSSFWorkbook);
}
Workbook wb = WorkbookFactory.create(false);
assertTrue(wb instanceof HSSFWorkbook);
closeOrRevert(wb);
try (Workbook wb = WorkbookFactory.create(true)) {
assertTrue(wb instanceof XSSFWorkbook);
wb = WorkbookFactory.create(true);
assertTrue(wb instanceof XSSFWorkbook);
closeOrRevert(wb);
}
@Test
public void testInvalidFormatException() {
String filename = "OPCCompliance_DerivedPartNameFAIL.docx";
try {
WorkbookFactory.create(POIDataSamples.getOpenXML4JInstance().openResourceAsStream(filename));
fail("Expecting an Exception for this document");
} catch (IOException e) {
// expected here
}
}
}