diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/testcases/org/apache/poi/hssf/HSSFTests.java | 22 | ||||
| -rw-r--r-- | src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java | 10 |
2 files changed, 22 insertions, 10 deletions
diff --git a/src/testcases/org/apache/poi/hssf/HSSFTests.java b/src/testcases/org/apache/poi/hssf/HSSFTests.java index da37b68adf..7a1d51903a 100644 --- a/src/testcases/org/apache/poi/hssf/HSSFTests.java +++ b/src/testcases/org/apache/poi/hssf/HSSFTests.java @@ -1,4 +1,3 @@ - /* ==================================================================== Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with @@ -100,15 +99,20 @@ import org.apache.poi.hssf.usermodel.TestReadWriteChart; import org.apache.poi.hssf.usermodel.TestSanityChecker; import org.apache.poi.hssf.usermodel.TestSheetShiftRows; import org.apache.poi.hssf.usermodel.TestWorkbook; -import org.apache.poi.hssf.util.AllHSSFUtilTests; +import org.apache.poi.hssf.util.TestAreaReference; +import org.apache.poi.hssf.util.TestCellReference; +import org.apache.poi.hssf.util.TestRKUtil; +import org.apache.poi.hssf.util.TestRangeAddress; +import org.apache.poi.hssf.util.TestSheetReferences; /** - * Test Suite for running just HSSF tests. Mostly - * this is for my convienience. + * Test Suite for all sub-packages of org.apache.poi.hssf<br/> + * + * Mostly this is for my convenience. * * @author Andrew C. Oliver acoliver@apache.org */ -public class HSSFTests +public final class HSSFTests { public static void main(String[] args) @@ -119,7 +123,7 @@ public class HSSFTests public static Test suite() { TestSuite suite = - new TestSuite("Test for org.apache.poi.hssf.usermodel"); + new TestSuite("Tests for org.apache.poi.hssf"); //$JUnit-BEGIN$ suite.addTest(new TestSuite(TestBugs.class)); @@ -198,7 +202,11 @@ public class HSSFTests suite.addTest(new TestSuite(TestUnitsRecord.class)); suite.addTest(new TestSuite(TestValueRangeRecord.class)); suite.addTest(new TestSuite(TestRowRecordsAggregate.class)); - suite.addTest(AllHSSFUtilTests.suite()); + suite.addTest(new TestSuite(TestAreaReference.class)); + suite.addTest(new TestSuite(TestCellReference.class)); + suite.addTest(new TestSuite(TestRangeAddress.class)); + suite.addTest(new TestSuite(TestRKUtil.class)); + suite.addTest(new TestSuite(TestSheetReferences.class)); suite.addTest(AllFormulaTests.suite()); diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java b/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java index 4f67f98767..870d752522 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java @@ -20,6 +20,7 @@ package org.apache.poi.poifs.filesystem; import java.io.IOException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.util.Arrays; import junit.framework.TestCase; @@ -157,12 +158,15 @@ public class TestEmptyDocument extends TestCase { DocumentEntry entry = (DocumentEntry) fs.getRoot().getEntry("Empty"); assertEquals("Expected zero size", 0, entry.getSize()); + byte[] actualReadbackData; + actualReadbackData = IOUtils.toByteArray(new DocumentInputStream(entry)); assertEquals("Expected zero read from stream", 0, - IOUtils.toByteArray(new DocumentInputStream(entry)).length); + actualReadbackData.length); entry = (DocumentEntry) fs.getRoot().getEntry("NotEmpty"); + actualReadbackData = IOUtils.toByteArray(new DocumentInputStream(entry)); assertEquals("Expected size was wrong", testData.length, entry.getSize()); - assertEquals("Expected different data read from stream", testData, - IOUtils.toByteArray(new DocumentInputStream(entry))); + assertTrue("Expected different data read from stream", + Arrays.equals(testData, actualReadbackData)); } } |