moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

fix testErr: createRow(1) -> createRow(0); replace assumeTrue with assertEquals for more informative test results

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1717171 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Javen O'Neal 2015-11-30 05:00:24 +00:00
parent dcba12a0ce
commit 7fc9df615f
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java
View File

@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.junit.Assume.assumeTrue;
import java.io.IOException; import java.io.IOException;
import java.util.Calendar; import java.util.Calendar;
@ -154,14 +153,14 @@ public abstract class BaseTestCell {
// B1 // B1
r = s.createRow(0); r = s.createRow(0);
c=r.createCell(1); c=r.createCell(1);
assumeTrue(0 == c.getRowIndex()); assertEquals(0, c.getRowIndex());
assumeTrue(1 == c.getColumnIndex()); assertEquals(1, c.getColumnIndex());
c.setCellValue(true); c.setCellValue(true);
// C1 // C1
c=r.createCell(2); c=r.createCell(2);
assumeTrue(0 == c.getRowIndex()); assertEquals(0, c.getRowIndex());
assumeTrue(2 == c.getColumnIndex()); assertEquals(2, c.getColumnIndex());
c.setCellValue(false); c.setCellValue(false);
Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1); Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
@ -169,17 +168,17 @@ public abstract class BaseTestCell {
s = wb2.getSheet("testSheet1"); s = wb2.getSheet("testSheet1");
r = s.getRow(0); r = s.getRow(0);
assumeTrue("Row 1 should have 2 cells", 2 == r.getPhysicalNumberOfCells()); assertEquals("Row 1 should have 2 cells", 2, r.getPhysicalNumberOfCells());
c = r.getCell(1); c = r.getCell(1);
assumeTrue(0 == c.getRowIndex()); assertEquals(0, c.getRowIndex());
assumeTrue(1 == c.getColumnIndex()); assertEquals(1, c.getColumnIndex());
assertEquals(Cell.CELL_TYPE_BOOLEAN, c.getCellType()); assertEquals(Cell.CELL_TYPE_BOOLEAN, c.getCellType());
assertEquals("B1 value", true, c.getBooleanCellValue()); assertEquals("B1 value", true, c.getBooleanCellValue());
c = r.getCell(2); c = r.getCell(2);
assumeTrue(0 == c.getRowIndex()); assertEquals(0, c.getRowIndex());
assumeTrue(2 == c.getColumnIndex()); assertEquals(2, c.getColumnIndex());
assertEquals(Cell.CELL_TYPE_BOOLEAN, c.getCellType()); assertEquals(Cell.CELL_TYPE_BOOLEAN, c.getCellType());
assertEquals("C1 value", false, c.getBooleanCellValue()); assertEquals("C1 value", false, c.getBooleanCellValue());
@ -199,16 +198,16 @@ public abstract class BaseTestCell {
Cell c; Cell c;
// B1 // B1
r = s.createRow(1); r = s.createRow(0);
c=r.createCell(1); c=r.createCell(1);
assumeTrue(0 == c.getRowIndex()); assertEquals(0, c.getRowIndex());
assumeTrue(1 == c.getColumnIndex()); assertEquals(1, c.getColumnIndex());
c.setCellErrorValue(FormulaError.NULL.getCode()); c.setCellErrorValue(FormulaError.NULL.getCode());
// C1 // C1
c=r.createCell(2); c=r.createCell(2);
assumeTrue(0 == c.getRowIndex()); assertEquals(0, c.getRowIndex());
assumeTrue(2 == c.getColumnIndex()); assertEquals(2, c.getColumnIndex());
c.setCellErrorValue(FormulaError.DIV0.getCode()); c.setCellErrorValue(FormulaError.DIV0.getCode());
Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1); Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1);
@ -217,7 +216,7 @@ public abstract class BaseTestCell {
s = wb2.getSheet("testSheet1"); s = wb2.getSheet("testSheet1");
r = s.getRow(0); r = s.getRow(0);
assumeTrue("Row 1 should have 2 cells", 2 == r.getPhysicalNumberOfCells()); assertEquals("Row 1 should have 2 cells", 2, r.getPhysicalNumberOfCells());
c = r.getCell(1); c = r.getCell(1);
assertEquals(Cell.CELL_TYPE_ERROR, c.getCellType()); assertEquals(Cell.CELL_TYPE_ERROR, c.getCellType());