diff options
8 files changed, 92 insertions, 50 deletions
diff --git a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java b/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java index 8c203e69b9..57837d13cd 100644 --- a/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java +++ b/src/ooxml/testcases/org/apache/poi/util/tests/TestTempFileThreaded.java @@ -157,7 +157,7 @@ public class TestTempFileThreaded { files.get(threadNum).add(file); if (iter % 30 == 0) { - System.out.println("thread: " + threadNum + ", iter: " + iter + ": " + file); + // System.out.println("thread: " + threadNum + ", iter: " + iter + ": " + file); } } } diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java index 7717c5062f..043a8e1209 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java @@ -20,6 +20,7 @@ package org.apache.poi.xslf.usermodel; import static java.util.Arrays.asList; +import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeFalse; import java.io.File; @@ -98,10 +99,17 @@ public class TestPPTX2PNG { } private String[] getArgs(String format) throws IOException { + File tmpDir = new File("build/tmp/"); + + // fix maven build errors + if (!tmpDir.exists()) { + assertTrue(tmpDir.mkdirs()); + } + final List<String> args = new ArrayList<>(asList( "-format", format, // png,gif,jpg,svg,pdf or null for test "-slide", "-1", // -1 for all - "-outdir", new File("build/tmp/").getCanonicalPath(), + "-outdir", tmpDir.getCanonicalPath(), "-outpat", "${basename}-${slideno}-${ext}.${format}", // "-dump", new File("build/tmp/", pptFile+".json").getCanonicalPath(), "-dump", "null", diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java index 6937aad832..88ba9a576e 100644 --- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java +++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java @@ -306,11 +306,18 @@ public class TestXSLFSimpleShape { @Test public void testArrayStoreException() throws Exception { + File tmpDir = new File("build/tmp/"); + + // fix maven build errors + if (!tmpDir.exists()) { + assertTrue(tmpDir.mkdirs()); + } + File file = POIDataSamples.getSlideShowInstance().getFile("aascu.org_workarea_downloadasset.aspx_id=5864.pptx"); String[] args = { "-format", "null", // png,gif,jpg,svg or null for test "-slide", "-1", // -1 for all - "-outdir", new File("build/tmp/").getCanonicalPath(), + "-outdir", tmpDir.getCanonicalPath(), "-quiet", "-fixside", "long", "-scale", "800", diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java index 37f57baa3c..1041b94fa8 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheetShiftRowsAndColumns.java @@ -17,13 +17,8 @@ package org.apache.poi.xssf.usermodel; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.util.CellAddress; -import org.apache.poi.ss.util.CellRangeAddress; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.io.FileOutputStream; @@ -31,8 +26,13 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Locale; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.util.CellAddress; +import org.apache.poi.ss.util.CellRangeAddress; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell; public class TestXSSFSheetShiftRowsAndColumns { private static final File resultDir = new File("build/custom-reports-test"); @@ -81,8 +81,6 @@ public class TestXSSFSheetShiftRowsAndColumns { */ final CellRangeAddress range = new CellRangeAddress(FIRST_MERGE_ROW,LAST_MERGE_ROW,FIRST_MERGE_COL,LAST_MERGE_COL); sheet.addMergedRegion(range); - System.out.println(String.format(Locale.US, "\n%s: mergeArea=%s", procName,range)); - writeFile(procName); } @@ -94,12 +92,10 @@ public class TestXSSFSheetShiftRowsAndColumns { public void cleanup() throws IOException { final String procName = "TestXSSFSheetRemoveTable.cleanup"; if (workbook == null) { - System.out.println(String.format(Locale.ROOT,"%s: workbook==null",procName)); return; } if(fileName == null) { - System.out.println(String.format(Locale.ROOT, "%s: fileName==null",procName)); return; } @@ -112,7 +108,6 @@ public class TestXSSFSheetShiftRowsAndColumns { final File file = new File(resultDir,fileName); try (OutputStream fileOut = new FileOutputStream(file)) { workbook.write(fileOut); - System.out.println(String.format(Locale.ROOT, "%s: test file written to %s",procName,file.getAbsolutePath())); } } @@ -126,8 +121,6 @@ public class TestXSSFSheetShiftRowsAndColumns { testCellAddresses(procName,0,0); testMergeRegion(procName,0,0); - - System.out.println(String.format(Locale.US, "%s: finished without error", procName)); } @Test @@ -138,7 +131,6 @@ public class TestXSSFSheetShiftRowsAndColumns { sheet.shiftRows(INSERT_ROW, numRows-1, nRowsToShift); testCellAddresses(procName,nRowsToShift,0); - System.out.println(String.format(Locale.US, "%s: finished without error", procName)); } @Test @@ -149,7 +141,6 @@ public class TestXSSFSheetShiftRowsAndColumns { sheet.shiftRows(INSERT_ROW, numRows-1, nRowsToShift); testMergeRegion(procName,nRowsToShift,0); - System.out.println(String.format(Locale.US, "%s: finished without error", procName)); } @Test @@ -160,7 +151,6 @@ public class TestXSSFSheetShiftRowsAndColumns { sheet.shiftColumns(INSERT_COLUMN, numCols-1, nShift); testCellAddresses(procName,0,nShift); - System.out.println(String.format(Locale.US, "%s: finished without error", procName)); } @Test @@ -171,7 +161,6 @@ public class TestXSSFSheetShiftRowsAndColumns { sheet.shiftColumns(INSERT_COLUMN, numCols-1, nShift); testMergeRegion(procName,0, nShift); - System.out.println(String.format(Locale.US, "%s: finished without error", procName)); } /** @@ -183,24 +172,18 @@ public class TestXSSFSheetShiftRowsAndColumns { for(int nRow = 0;nRow<nNumRows;++nRow) { final XSSFRow row = sheet.getRow(nRow); if(row == null) { - System.out.println(String.format(Locale.US, "%s: Row %d is empty", procName,nRow)); continue; } for(int nCol = 0;nCol<nNumCols;++nCol) { final String address = new CellAddress(nRow,nCol).formatAsString(); final XSSFCell cell = row.getCell(nCol); if(cell == null) { - System.out.println(String.format(Locale.US, "%s: Cell %s is empty", procName,address)); continue; } final CTCell ctCell = cell.getCTCell(); final Object cellAddress = cell.getAddress().formatAsString(); final Object r = ctCell.getR(); - if(nCol == 0 || nRow == 0) { - System.out.println(String.format(Locale.US, "%s: Row %d col %d address=%s cell.address=%s cell.getR=%s", procName, nRow, - nCol, address, cellAddress, ctCell.getR())); - } assertEquals(String.format(Locale.US, "%s: Testing cell.getAddress",procName),address,cellAddress); assertEquals(String.format(Locale.US, "%s: Testing ctCell.getR",procName),address,r); } diff --git a/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java b/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java index 94516a77e5..0b3b68bc63 100644 --- a/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java +++ b/src/scratchpad/testcases/org/apache/poi/hdgf/dev/TestVSDDumper.java @@ -20,12 +20,29 @@ ==================================================================== */ package org.apache.poi.hdgf.dev; +import java.io.File; +import java.io.PrintStream; + import org.apache.poi.POIDataSamples; +import org.apache.poi.util.NullPrintStream; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; -import java.io.File; - public class TestVSDDumper { + private static PrintStream oldStdOut; + + @BeforeClass + public static void muteStdout() { + oldStdOut = System.out; + System.setOut(new NullPrintStream()); + } + + @AfterClass + public static void restoreStdout() { + System.setOut(oldStdOut); + } + @Test public void main() throws Exception { File file = POIDataSamples.getDiagramInstance().getFile("Test_Visio-Some_Random_Text.vsd"); diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java b/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java index fbd2aa0764..4a5b30dff7 100644 --- a/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java +++ b/src/scratchpad/testcases/org/apache/poi/hslf/dev/TestSLWTListing.java @@ -16,15 +16,32 @@ ==================================================================== */ package org.apache.poi.hslf.dev; -import org.apache.poi.EmptyFileException; -import org.junit.Test; +import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; +import java.io.PrintStream; -import static org.junit.Assert.fail; +import org.apache.poi.EmptyFileException; +import org.apache.poi.util.NullPrintStream; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; public class TestSLWTListing extends BasePPTIteratingTest { + private static PrintStream oldStdErr; + + @BeforeClass + public static void muteStdErr() { + oldStdErr = System.err; + System.setErr(new NullPrintStream()); + } + + @AfterClass + public static void restoreStdErr() { + System.setErr(oldStdErr); + } + @Test public void testMain() throws IOException { // calls System.exit(): SLWTListing.main(new String[0]); diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java b/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java index 83a0356a7a..515bb81ee3 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/dev/TestHWPFLister.java @@ -16,13 +16,30 @@ ==================================================================== */ package org.apache.poi.hwpf.dev; +import java.io.File; +import java.io.PrintStream; + import org.apache.poi.POIDataSamples; +import org.apache.poi.util.NullPrintStream; import org.junit.After; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; -import java.io.File; - public class TestHWPFLister { + private static PrintStream oldStdOut; + + @BeforeClass + public static void muteStdout() { + oldStdOut = System.out; + System.setOut(new NullPrintStream()); + } + + @AfterClass + public static void restoreStdout() { + System.setOut(oldStdOut); + } + @After public void tearDown() { // the main-method sets these properties, we need to revert them here to not affect other tests diff --git a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java index 25c5f18294..87193b9250 100644 --- a/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java +++ b/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java @@ -16,19 +16,19 @@ ==================================================================== */ package org.apache.poi.hwpf.usermodel; -import org.apache.poi.hwpf.HWPFDocument; -import org.apache.poi.hwpf.HWPFTestDataSamples; -import org.apache.poi.util.HexDump; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; +import static org.junit.Assert.assertTrue; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.junit.Assert.assertTrue; +import org.apache.poi.hwpf.HWPFDocument; +import org.apache.poi.hwpf.HWPFTestDataSamples; +import org.apache.poi.util.HexDump; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; /** * Bug 47563 - Exception when working with table @@ -59,9 +59,6 @@ public class TestBug47563 { @Test public void test() throws Exception { - System.out.println(); - System.out.println("Testing with rows: " + rows + ", columns: " + columns); - // POI apparently can't create a document from scratch, // so we need an existing empty dummy document try (HWPFDocument doc = HWPFTestDataSamples.openSampleFile("empty.doc")) { @@ -75,14 +72,10 @@ public class TestBug47563 { TableRow row = table.getRow(rowIdx); row.sanityCheck(); - System.out.println("row " + rowIdx); for (int colIdx = 0; colIdx < row.numCells(); colIdx++) { TableCell cell = row.getCell(colIdx); cell.sanityCheck(); - System.out.println("column " + colIdx + ", num paragraphs " - + cell.numParagraphs()); - Paragraph par = cell.getParagraph(0); par.sanityCheck(); |