Author: nick
Date: Sun Dec 27 18:22:02 2009
New Revision: 894091
URL: http://svn.apache.org/viewvc?rev=894091&view=rev
Log:
Start testing the contents of FeatRecord
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java?rev=894091&r1=894090&r2=894091&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/FeatRecord.java Sun Dec 27
18:22:02 2009
@@ -104,4 +104,38 @@
(cellRefs.length * CellRangeAddress.ENCODED_SIZE)
+rgbFeat.length;
}
+
+ public int getIsf_sharedFeatureType() {
+ return isf_sharedFeatureType;
+ }
+ public void setIsf_sharedFeatureType(int isfSharedFeatureType) {
+ isf_sharedFeatureType = isfSharedFeatureType;
+ }
+
+ public long getCbFeatData() {
+ return cbFeatData;
+ }
+ public void setCbFeatData(long cbFeatData) {
+ this.cbFeatData = cbFeatData;
+ }
+
+ public CellRangeAddress[] getCellRefs() {
+ return cellRefs;
+ }
+ public void setCellRefs(CellRangeAddress[] cellRefs) {
+ this.cellRefs = cellRefs;
+ }
+
+ public byte[] getRgbFeat() {
+ return rgbFeat;
+ }
+ public void setRgbFeat(byte[] rgbFeat) {
+ this.rgbFeat = rgbFeat;
+
+ if(isf_sharedFeatureType ==
FeatHdrRecord.SHAREDFEATURES_ISFFEC2) {
+ cbFeatData = rgbFeat.length;
+ } else {
+ cbFeatData = 0;
+ }
+ }
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java?rev=894091&r1=894090&r2=894091&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
(original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java Sun
Dec 27 18:22:02 2009
@@ -88,6 +88,7 @@
InternalWorkbook wb = HSSFTestHelper.getWorkbookForTest(hssf);
FeatRecord fr = null;
+ FeatHdrRecord fhr = null;
assertEquals(1, hssf.getNumberOfSheets());
@@ -125,6 +126,7 @@
countFR++;
}
if(r instanceof FeatHdrRecord) {
+ fhr = (FeatHdrRecord)r;
countFRH++;
} else if (r.getSid() == FeatHdrRecord.sid) {
countFRH++;
@@ -135,7 +137,23 @@
assertEquals(1, countFR);
assertEquals(1, countFRH);
assertNotNull(fr);
+ assertNotNull(fhr);
// Now check the contents are as expected
+ assertEquals(
+ FeatHdrRecord.SHAREDFEATURES_ISFFEC2,
+ fr.getIsf_sharedFeatureType()
+ );
+
+ // Applies to one cell only
+ assertEquals(1, fr.getCellRefs().length);
+ assertEquals(0, fr.getCellRefs()[0].getFirstRow());
+ assertEquals(0, fr.getCellRefs()[0].getLastRow());
+ assertEquals(0, fr.getCellRefs()[0].getFirstColumn());
+ assertEquals(0, fr.getCellRefs()[0].getLastColumn());
+
+ // TODO - more checking of shared features stuff
+ assertEquals(4, fr.getCbFeatData());
+ assertEquals(4, fr.getRgbFeat().length);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
