You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2008/02/21 16:40:35 UTC
svn commit: r629831 - in /poi/trunk: build.xml
src/testcases/org/apache/poi/hssf/HSSFTests.java
src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
Author: nick
Date: Thu Feb 21 07:40:34 2008
New Revision: 629831
URL: http://svn.apache.org/viewvc?rev=629831&view=rev
Log:
Patch from Josh from bug #44437 - improved unit test for poifs
Modified:
poi/trunk/build.xml
poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java
poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=629831&r1=629830&r2=629831&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Thu Feb 21 07:40:34 2008
@@ -523,8 +523,7 @@
<batchtest todir="${main.reports.test}">
<fileset dir="${main.src.test}">
<include name="**/Test*.java"/>
- <exclude name="**/AllTests.java"/>
- <exclude name="**/TestEmptyDocument.java"/>
+ <exclude name="**/All*Tests.java"/>
<exclude name="**/TestUnfixedBugs.java"/>
<exclude name="**/TestcaseRecordInputStream.java"/>
</fileset>
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java?rev=629831&r1=629830&r2=629831&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java Thu Feb 21 07:40:34 2008
@@ -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.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 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 @@
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());
Modified: poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java?rev=629831&r1=629830&r2=629831&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/poifs/filesystem/TestEmptyDocument.java Thu Feb 21 07:40:34 2008
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.util.Arrays;
import junit.framework.TestCase;
@@ -157,12 +158,15 @@
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));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org