From 3572e116275ecf81331a594c5d473c62136296f8 Mon Sep 17 00:00:00 2001 From: Josh Micich Date: Sun, 15 Jun 2008 22:26:06 +0000 Subject: [PATCH] added extra RVA test case (for bug 45206) git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@668014 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/hssf/record/formula/Ref3DPtg.java | 22 ++++++++---------- .../org/apache/poi/hssf/data/testRVA.xls | Bin 32768 -> 32256 bytes .../org/apache/poi/hssf/model/TestRVA.java | 11 +++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java index 87e455ba8c..9306516596 100644 --- a/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java +++ b/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java @@ -15,11 +15,10 @@ limitations under the License. ==================================================================== */ - package org.apache.poi.hssf.record.formula; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.record.RecordInputStream; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.util.CellReference; import org.apache.poi.hssf.util.RangeAddress; import org.apache.poi.hssf.util.SheetReferences; @@ -69,16 +68,15 @@ public class Ref3DPtg extends OperandPtg { } public String toString() { - StringBuffer buffer = new StringBuffer(); - - buffer.append("Ref3dPtg\n"); - buffer.append("Index to Extern Sheet = " + getExternSheetIndex()).append("\n"); - buffer.append("Row = " + getRow()).append("\n"); - buffer.append("Col = " + getColumn()).append("\n"); - buffer.append("ColRowRel= " - + isRowRelative()).append("\n"); - buffer.append("ColRel = " + isColRelative()).append("\n"); - return buffer.toString(); + CellReference cr = new CellReference(getRow(), getColumn(), !isRowRelative(),!isColRelative()); + StringBuffer sb = new StringBuffer(); + sb.append(getClass().getName()); + sb.append(" ["); + sb.append("sheetIx=").append(getExternSheetIndex()); + sb.append(" ! "); + sb.append(cr.formatAsString()); + sb.append("]"); + return sb.toString(); } public void writeBytes(byte [] array, int offset) { diff --git a/src/testcases/org/apache/poi/hssf/data/testRVA.xls b/src/testcases/org/apache/poi/hssf/data/testRVA.xls index 327edbb4cbf11e7ed0a2e6bf2cafdaa54a041198..f23821117e96c2c5e9649a8c5227748bb519ae5a 100644 GIT binary patch delta 4048 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 diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/src/testcases/org/apache/poi/hssf/model/TestRVA.java index f8c70eb7b8..ca74c6e2db 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestRVA.java +++ b/src/testcases/org/apache/poi/hssf/model/TestRVA.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.record.formula.AttrPtg; import org.apache.poi.hssf.record.formula.Ptg; -import org.apache.poi.hssf.record.formula.RefPtgBase; import org.apache.poi.hssf.usermodel.FormulaExtractor; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; @@ -60,7 +59,7 @@ public final class TestRVA extends TestCase { } String formula = cell.getCellFormula(); try { - confirmCell(cell, formula); + confirmCell(cell, formula, wb); } catch (AssertionFailedError e) { System.err.println("Problem with row[" + rowIx + "] formula '" + formula + "'"); System.err.println(e.getMessage()); @@ -79,9 +78,9 @@ public final class TestRVA extends TestCase { } } - private void confirmCell(HSSFCell formulaCell, String formula) { + private void confirmCell(HSSFCell formulaCell, String formula, HSSFWorkbook wb) { Ptg[] excelPtgs = FormulaExtractor.getPtgs(formulaCell); - Ptg[] poiPtgs = FormulaParser.parse(formula, null); + Ptg[] poiPtgs = FormulaParser.parse(formula, wb); int nExcelTokens = excelPtgs.length; int nPoiTokens = poiPtgs.length; if (nExcelTokens != nPoiTokens) { @@ -122,6 +121,10 @@ public final class TestRVA extends TestCase { } sb.append(NEW_LINE); } + if (false) { // set 'true' to see trace of RVA values + System.out.println(formula); + System.out.println(sb.toString()); + } if (hasMismatch) { throw new AssertionFailedError(sb.toString()); } -- 2.39.5