From 5971083683b58f4c5ce7e854b8ae62709dc15df3 Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Tue, 20 Jun 2017 07:05:08 +0000 Subject: [PATCH] rename createXls and createXlsx helper functions: these are specifically for testing text rotation. Made the file creation compatible on Windows and Mac/Linux using POI TempFile instead of a hard-coded filename. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1799307 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/usermodel/TestXSSFBugs.java | 50 +++++++------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index 3b45fdc53..38f1151f6 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -2885,51 +2885,37 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { wb.close(); } - private void createXls() throws IOException { - Workbook workbook = new HSSFWorkbook(); - FileOutputStream fileOut = new FileOutputStream("/tmp/rotated.xls"); - Sheet sheet1 = workbook.createSheet(); - Row row1 = sheet1.createRow((short) 0); + /** + * helper function for {@link #test58043()} + * Side-effects: closes the provided workbook! + * + * @param workbook the workbook to save for manual checking + * @param outputFile the output file location to save the workbook to + */ + private void saveRotatedTextExample(Workbook workbook, File outputFile) throws IOException { + Sheet sheet = workbook.createSheet(); + Row row = sheet.createRow((short) 0); - Cell cell1 = row1.createCell(0); + Cell cell = row.createCell(0); - cell1.setCellValue("Successful rotated text."); + cell.setCellValue("Unsuccessful rotated text."); CellStyle style = workbook.createCellStyle(); style.setRotation((short) -90); - cell1.setCellStyle(style); + cell.setCellStyle(style); - workbook.write(fileOut); - fileOut.close(); - workbook.close(); - } - - private void createXlsx() throws IOException { - Workbook workbook = new XSSFWorkbook(); - FileOutputStream fileOut = new FileOutputStream("/tmp/rotated.xlsx"); - Sheet sheet1 = workbook.createSheet(); - Row row1 = sheet1.createRow((short) 0); - - Cell cell1 = row1.createCell(0); - - cell1.setCellValue("Unsuccessful rotated text."); - - CellStyle style = workbook.createCellStyle(); - style.setRotation((short) -90); - - cell1.setCellStyle(style); - - workbook.write(fileOut); - fileOut.close(); + OutputStream fos = new FileOutputStream(outputFile); + workbook.write(fos); + fos.close(); workbook.close(); } @Ignore("Creates files for checking results manually, actual values are tested in Test*CellStyle") @Test public void test58043() throws IOException { - createXls(); - createXlsx(); + saveRotatedTextExample(new HSSFWorkbook(), TempFile.createTempFile("rotated", ".xls")); + saveRotatedTextExample(new XSSFWorkbook(), TempFile.createTempFile("rotated", ".xlsx")); } @Test