jheight 2005/09/01 20:50:24
Modified: src/testcases/org/apache/poi/hssf HSSFTests.java
src/testcases/org/apache/poi/util TestBitField.java
Log:
BitfieldFactory update
Revision Changes Path
1.12 +41 -41
jakarta-poi/src/testcases/org/apache/poi/hssf/HSSFTests.java
Index: HSSFTests.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/hssf/HSSFTests.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HSSFTests.java 18 Aug 2005 07:06:41 -0000 1.11
+++ HSSFTests.java 2 Sep 2005 03:50:24 -0000 1.12
@@ -20,11 +20,11 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.poi.hssf.eventmodel.TestEventRecordFactory;
-import org.apache.poi.hssf.eventmodel.TestModelFactory;
+import org.apache.poi.hssf.eventmodel.TestEventRecordFactory;
+import org.apache.poi.hssf.eventmodel.TestModelFactory;
import org.apache.poi.hssf.model.TestFormulaParser;
-import org.apache.poi.hssf.model.TestDrawingManager;
-import org.apache.poi.hssf.model.TestSheet;
+import org.apache.poi.hssf.model.TestDrawingManager;
+import org.apache.poi.hssf.model.TestSheet;
import org.apache.poi.hssf.record.TestAreaFormatRecord;
import org.apache.poi.hssf.record.TestAreaRecord;
import org.apache.poi.hssf.record.TestAxisLineFormatRecord;
@@ -69,34 +69,34 @@
import org.apache.poi.hssf.record.TestSupBookRecord;
import org.apache.poi.hssf.record.TestTextRecord;
import org.apache.poi.hssf.record.TestTickRecord;
-import org.apache.poi.hssf.record.TestUnicodeString;
+import org.apache.poi.hssf.record.TestUnicodeString;
import org.apache.poi.hssf.record.TestUnitsRecord;
import org.apache.poi.hssf.record.TestValueRangeRecord;
import org.apache.poi.hssf.record.aggregates.TestRowRecordsAggregate;
import org.apache.poi.hssf.record.aggregates.TestValueRecordsAggregate;
import org.apache.poi.hssf.record.formula.TestFuncPtg;
-import org.apache.poi.hssf.usermodel.TestBugs;
+import org.apache.poi.hssf.usermodel.TestBugs;
import org.apache.poi.hssf.usermodel.TestCellStyle;
-import org.apache.poi.hssf.usermodel.TestCloneSheet;
-import org.apache.poi.hssf.usermodel.TestEscherGraphics;
-import org.apache.poi.hssf.usermodel.TestEscherGraphics2d;
-import org.apache.poi.hssf.usermodel.TestFontDetails;
+import org.apache.poi.hssf.usermodel.TestCloneSheet;
+import org.apache.poi.hssf.usermodel.TestEscherGraphics;
+import org.apache.poi.hssf.usermodel.TestEscherGraphics2d;
+import org.apache.poi.hssf.usermodel.TestFontDetails;
import org.apache.poi.hssf.usermodel.TestFormulas;
import org.apache.poi.hssf.usermodel.TestHSSFCell;
-import org.apache.poi.hssf.usermodel.TestHSSFClientAnchor;
+import org.apache.poi.hssf.usermodel.TestHSSFClientAnchor;
import org.apache.poi.hssf.usermodel.TestHSSFDateUtil;
-import org.apache.poi.hssf.usermodel.TestHSSFHeaderFooter;
+import org.apache.poi.hssf.usermodel.TestHSSFHeaderFooter;
import org.apache.poi.hssf.usermodel.TestHSSFPalette;
-import org.apache.poi.hssf.usermodel.TestHSSFRichTextString;
+import org.apache.poi.hssf.usermodel.TestHSSFRichTextString;
import org.apache.poi.hssf.usermodel.TestHSSFRow;
import org.apache.poi.hssf.usermodel.TestHSSFSheet;
-import org.apache.poi.hssf.usermodel.TestHSSFSheetOrder;
-import org.apache.poi.hssf.usermodel.TestHSSFSheetSetOrder;
-import org.apache.poi.hssf.usermodel.TestHSSFWorkbook;
+import org.apache.poi.hssf.usermodel.TestHSSFSheetOrder;
+import org.apache.poi.hssf.usermodel.TestHSSFSheetSetOrder;
+import org.apache.poi.hssf.usermodel.TestHSSFWorkbook;
import org.apache.poi.hssf.usermodel.TestNamedRange;
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.TestSanityChecker;
+import org.apache.poi.hssf.usermodel.TestSheetShiftRows;
import org.apache.poi.hssf.usermodel.TestWorkbook;
import org.apache.poi.hssf.util.TestAreaReference;
import org.apache.poi.hssf.util.TestCellReference;
@@ -123,21 +123,21 @@
TestSuite suite =
new TestSuite("Test for org.apache.poi.hssf.usermodel");
//$JUnit-BEGIN$
-
- suite.addTest(new TestSuite(TestBugs.class));
- suite.addTest(new TestSuite(TestCloneSheet.class));
- suite.addTest(new TestSuite(TestEscherGraphics.class));
- suite.addTest(new TestSuite(TestEscherGraphics2d.class));
- suite.addTest(new TestSuite(TestFontDetails.class));
- suite.addTest(new TestSuite(TestHSSFClientAnchor.class));
- suite.addTest(new TestSuite(TestHSSFHeaderFooter.class));
- suite.addTest(new TestSuite(TestHSSFRichTextString.class));
- suite.addTest(new TestSuite(TestHSSFSheetOrder.class));
- suite.addTest(new TestSuite(TestHSSFSheetSetOrder.class));
- suite.addTest(new TestSuite(TestHSSFWorkbook.class));
- suite.addTest(new TestSuite(TestSanityChecker.class));
- suite.addTest(new TestSuite(TestSheetShiftRows.class));
-
+
+ suite.addTest(new TestSuite(TestBugs.class));
+ suite.addTest(new TestSuite(TestCloneSheet.class));
+ suite.addTest(new TestSuite(TestEscherGraphics.class));
+ suite.addTest(new TestSuite(TestEscherGraphics2d.class));
+ suite.addTest(new TestSuite(TestFontDetails.class));
+ suite.addTest(new TestSuite(TestHSSFClientAnchor.class));
+ suite.addTest(new TestSuite(TestHSSFHeaderFooter.class));
+ suite.addTest(new TestSuite(TestHSSFRichTextString.class));
+ suite.addTest(new TestSuite(TestHSSFSheetOrder.class));
+ suite.addTest(new TestSuite(TestHSSFSheetSetOrder.class));
+ suite.addTest(new TestSuite(TestHSSFWorkbook.class));
+ suite.addTest(new TestSuite(TestSanityChecker.class));
+ suite.addTest(new TestSuite(TestSheetShiftRows.class));
+
suite.addTest(new TestSuite(TestCellStyle.class));
suite.addTest(new TestSuite(TestFormulas.class));
suite.addTest(new TestSuite(TestHSSFCell.class));
@@ -148,9 +148,9 @@
suite.addTest(new TestSuite(TestNamedRange.class));
suite.addTest(new TestSuite(TestReadWriteChart.class));
suite.addTest(new TestSuite(TestWorkbook.class));
-
-
-
+
+
+
suite.addTest(new TestSuite(TestFormulaParser.class));
suite.addTest(new TestSuite(TestAreaFormatRecord.class));
suite.addTest(new TestSuite(TestAreaRecord.class));
@@ -196,7 +196,7 @@
suite.addTest(new TestSuite(TestSupBookRecord.class));
suite.addTest(new TestSuite(TestTextRecord.class));
suite.addTest(new TestSuite(TestTickRecord.class));
- suite.addTest(new TestSuite(TestUnicodeString.class));
+ suite.addTest(new TestSuite(TestUnicodeString.class));
suite.addTest(new TestSuite(TestUnitsRecord.class));
suite.addTest(new TestSuite(TestValueRangeRecord.class));
suite.addTest(new TestSuite(TestRowRecordsAggregate.class));
@@ -210,10 +210,10 @@
suite.addTest(new TestSuite(TestFuncPtg.class));
suite.addTest(new TestSuite(TestValueRecordsAggregate.class));
suite.addTest(new TestSuite(TestNameRecord.class));
- suite.addTest(new TestSuite(TestEventRecordFactory.class));
- suite.addTest(new TestSuite(TestModelFactory.class));
- suite.addTest(new TestSuite(TestDrawingManager.class));
- suite.addTest(new TestSuite(TestSheet.class));
+ suite.addTest(new TestSuite(TestEventRecordFactory.class));
+ suite.addTest(new TestSuite(TestModelFactory.class));
+ suite.addTest(new TestSuite(TestDrawingManager.class));
+ suite.addTest(new TestSuite(TestSheet.class));
//$JUnit-END$
return suite;
1.4 +21 -21
jakarta-poi/src/testcases/org/apache/poi/util/TestBitField.java
Index: TestBitField.java
===================================================================
RCS file:
/home/cvs/jakarta-poi/src/testcases/org/apache/poi/util/TestBitField.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestBitField.java 9 Apr 2004 13:05:38 -0000 1.3
+++ TestBitField.java 2 Sep 2005 03:50:24 -0000 1.4
@@ -30,8 +30,8 @@
public class TestBitField
extends TestCase
{
- private static BitField bf_multi = new BitField(0x3F80);
- private static BitField bf_single = new BitField(0x4000);
+ private static BitField bf_multi = BitFieldFactory.getInstance(0x3F80);
+ private static BitField bf_single = BitFieldFactory.getInstance(0x4000);
/**
* Constructor TestBitField
@@ -182,29 +182,29 @@
public void testByte()
{
- assertEquals(1, new BitField(1).setByteBoolean(( byte ) 0, true));
- assertEquals(2, new BitField(2).setByteBoolean(( byte ) 0, true));
- assertEquals(4, new BitField(4).setByteBoolean(( byte ) 0, true));
- assertEquals(8, new BitField(8).setByteBoolean(( byte ) 0, true));
- assertEquals(16, new BitField(16).setByteBoolean(( byte ) 0, true));
- assertEquals(32, new BitField(32).setByteBoolean(( byte ) 0, true));
- assertEquals(64, new BitField(64).setByteBoolean(( byte ) 0, true));
+ assertEquals(1, BitFieldFactory.getInstance(1).setByteBoolean(( byte
) 0, true));
+ assertEquals(2, BitFieldFactory.getInstance(2).setByteBoolean(( byte
) 0, true));
+ assertEquals(4, BitFieldFactory.getInstance(4).setByteBoolean(( byte
) 0, true));
+ assertEquals(8, BitFieldFactory.getInstance(8).setByteBoolean(( byte
) 0, true));
+ assertEquals(16, BitFieldFactory.getInstance(16).setByteBoolean((
byte ) 0, true));
+ assertEquals(32, BitFieldFactory.getInstance(32).setByteBoolean((
byte ) 0, true));
+ assertEquals(64, BitFieldFactory.getInstance(64).setByteBoolean((
byte ) 0, true));
assertEquals(-128,
- new BitField(128).setByteBoolean(( byte ) 0, true));
- assertEquals(0, new BitField(1).setByteBoolean(( byte ) 1, false));
- assertEquals(0, new BitField(2).setByteBoolean(( byte ) 2, false));
- assertEquals(0, new BitField(4).setByteBoolean(( byte ) 4, false));
- assertEquals(0, new BitField(8).setByteBoolean(( byte ) 8, false));
- assertEquals(0, new BitField(16).setByteBoolean(( byte ) 16, false));
- assertEquals(0, new BitField(32).setByteBoolean(( byte ) 32, false));
- assertEquals(0, new BitField(64).setByteBoolean(( byte ) 64, false));
- assertEquals(0, new BitField(128).setByteBoolean(( byte ) 128,
+ BitFieldFactory.getInstance(128).setByteBoolean(( byte
) 0, true));
+ assertEquals(0, BitFieldFactory.getInstance(1).setByteBoolean(( byte
) 1, false));
+ assertEquals(0, BitFieldFactory.getInstance(2).setByteBoolean(( byte
) 2, false));
+ assertEquals(0, BitFieldFactory.getInstance(4).setByteBoolean(( byte
) 4, false));
+ assertEquals(0, BitFieldFactory.getInstance(8).setByteBoolean(( byte
) 8, false));
+ assertEquals(0, BitFieldFactory.getInstance(16).setByteBoolean((
byte ) 16, false));
+ assertEquals(0, BitFieldFactory.getInstance(32).setByteBoolean((
byte ) 32, false));
+ assertEquals(0, BitFieldFactory.getInstance(64).setByteBoolean((
byte ) 64, false));
+ assertEquals(0, BitFieldFactory.getInstance(128).setByteBoolean((
byte ) 128,
false));
- assertEquals(-2, new BitField(1).setByteBoolean(( byte ) 255,
false));
- byte clearedBit = new BitField(0x40).setByteBoolean(( byte ) -63,
+ assertEquals(-2, BitFieldFactory.getInstance(1).setByteBoolean((
byte ) 255, false));
+ byte clearedBit = BitFieldFactory.getInstance(0x40).setByteBoolean((
byte ) -63,
false);
- assertEquals(false, new BitField(0x40).isSet(clearedBit));
+ assertEquals(false,
BitFieldFactory.getInstance(0x40).isSet(clearedBit));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/
