bug 59983: add failing unit test demonstrating formula shifting is apply twice to shared formulas; patch from Luca Martini

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1761673 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2016-09-21 05:20:36 +00:00
parent eedc13f5ce
commit cbeddd0d11
3 changed files with 51 additions and 5 deletions

View File

@ -147,7 +147,8 @@ public final class XSSFRowShifter extends RowShifter {
}
if (f.isSetRef()) { //Range of cells which the formula applies to.
//Range of cells which the formula applies to.
if (f.isSetRef()) {
String ref = f.getRef();
String shiftedRef = shiftFormula(row, ref, shifter);
if (shiftedRef != null) f.setRef(shiftedRef);

View File

@ -17,6 +17,8 @@
package org.apache.poi.xssf.usermodel;
import static org.apache.poi.POITestCase.skipTest;
import static org.apache.poi.POITestCase.testPassesNow;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@ -24,6 +26,8 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import junit.framework.AssertionFailedError;
import org.apache.poi.ss.usermodel.BaseTestSheetShiftRows;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
@ -35,7 +39,7 @@ import org.apache.poi.ss.util.CellAddress;
import org.apache.poi.ss.util.CellUtil;
import org.apache.poi.xssf.XSSFITestDataProvider;
import org.apache.poi.xssf.XSSFTestDataSamples;
import org.junit.Ignore;
import org.apache.xmlbeans.impl.values.XmlValueDisconnectedException;
import org.junit.Test;
public final class TestXSSFSheetShiftRows extends BaseTestSheetShiftRows {
@ -377,7 +381,9 @@ public final class TestXSSFSheetShiftRows extends BaseTestSheetShiftRows {
wb.close();
}
@Ignore("Bug 59733 - shiftRows() causes org.apache.xmlbeans.impl.values.XmlValueDisconnectedException")
// This test is written as expected-to-fail and should be rewritten
// as expected-to-pass when the bug is fixed.
//@Ignore("Bug 59733 - shiftRows() causes org.apache.xmlbeans.impl.values.XmlValueDisconnectedException")
@Test
public void bug59733() throws IOException {
Workbook workbook = new XSSFWorkbook();
@ -399,9 +405,48 @@ public final class TestXSSFSheetShiftRows extends BaseTestSheetShiftRows {
at org.apache.poi.xssf.usermodel.XSSFRow.getRowNum(XSSFRow.java:363)
at org.apache.poi.xssf.usermodel.TestXSSFSheetShiftRows.bug59733(TestXSSFSheetShiftRows.java:393)
*/
try {
sheet.removeRow(sheet.getRow(0));
assertEquals(1, sheet.getRow(1).getRowNum());
testPassesNow(59733);
} catch (XmlValueDisconnectedException e) {
skipTest(e);
}
workbook.close();
}
private static String getCellFormula(Sheet sheet, String address) {
CellAddress cellAddress = new CellAddress(address);
Row row = sheet.getRow(cellAddress.getRow());
assertNotNull(row);
Cell cell = row.getCell(cellAddress.getColumn());
assertNotNull(cell);
assertEquals(CellType.FORMULA, cell.getCellTypeEnum());
return cell.getCellFormula();
}
// This test is written as expected-to-fail and should be rewritten
// as expected-to-pass when the bug is fixed.
@Test
public void testSharedFormulas() throws Exception {
XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("TestShiftRowSharedFormula.xlsx");
XSSFSheet sheet = wb.getSheetAt(0);
assertEquals("SUM(C2:C4)", getCellFormula(sheet, "C5"));
assertEquals("SUM(D2:D4)", getCellFormula(sheet, "D5"));
assertEquals("SUM(E2:E4)", getCellFormula(sheet, "E5"));
sheet.shiftRows(3, sheet.getLastRowNum(), 1);
try {
assertEquals("SUM(C2:C5)", getCellFormula(sheet, "C6"));
assertEquals("SUM(D2:D5)", getCellFormula(sheet, "D6"));
assertEquals("SUM(E2:E5)", getCellFormula(sheet, "E6"));
testPassesNow(59983);
} catch (AssertionError e) {
skipTest(e);
}
wb.close();
}
}

Binary file not shown.