Modified: poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java?rev=1808700&r1=1808699&r2=1808700&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java (original) +++ poi/trunk/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java Mon Sep 18 13:26:16 2017 @@ -61,13 +61,13 @@ public abstract class BaseTestCell { cell.setCellValue(1.2); assertEquals(1.2, cell.getNumericCellValue(), 0.0001); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertProhibitedValueAccess(cell, CellType.BOOLEAN, CellType.STRING, CellType.FORMULA, CellType.ERROR); cell.setCellValue(false); assertEquals(false, cell.getBooleanCellValue()); - assertEquals(CellType.BOOLEAN, cell.getCellTypeEnum()); + assertEquals(CellType.BOOLEAN, cell.getCellType()); cell.setCellValue(true); assertEquals(true, cell.getBooleanCellValue()); assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.STRING, @@ -76,14 +76,14 @@ public abstract class BaseTestCell { cell.setCellValue(factory.createRichTextString("Foo")); assertEquals("Foo", cell.getRichStringCellValue().getString()); assertEquals("Foo", cell.getStringCellValue()); - assertEquals(CellType.STRING, cell.getCellTypeEnum()); + assertEquals(CellType.STRING, cell.getCellType()); assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.BOOLEAN, CellType.FORMULA, CellType.ERROR); cell.setCellValue("345"); assertEquals("345", cell.getRichStringCellValue().getString()); assertEquals("345", cell.getStringCellValue()); - assertEquals(CellType.STRING, cell.getCellTypeEnum()); + assertEquals(CellType.STRING, cell.getCellType()); assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.BOOLEAN, CellType.FORMULA, CellType.ERROR); @@ -91,19 +91,19 @@ public abstract class BaseTestCell { c.setTimeInMillis(123456789); cell.setCellValue(c.getTime()); assertEquals(c.getTime().getTime(), cell.getDateCellValue().getTime()); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertProhibitedValueAccess(cell, CellType.BOOLEAN, CellType.STRING, CellType.FORMULA, CellType.ERROR); cell.setCellValue(c); assertEquals(c.getTime().getTime(), cell.getDateCellValue().getTime()); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertProhibitedValueAccess(cell, CellType.BOOLEAN, CellType.STRING, CellType.FORMULA, CellType.ERROR); cell.setCellErrorValue(FormulaError.NA.getCode()); assertEquals(FormulaError.NA.getCode(), cell.getErrorCellValue()); - assertEquals(CellType.ERROR, cell.getCellTypeEnum()); + assertEquals(CellType.ERROR, cell.getCellType()); assertProhibitedValueAccess(cell, CellType.NUMERIC, CellType.BOOLEAN, CellType.FORMULA, CellType.STRING); @@ -142,7 +142,6 @@ public abstract class BaseTestCell { /** * test that Boolean (BoolErrRecord) are supported properly. - * @see testErr */ @Test public void testBool() throws IOException { @@ -177,13 +176,13 @@ public abstract class BaseTestCell { c = r.getCell(1); assertEquals(0, c.getRowIndex()); assertEquals(1, c.getColumnIndex()); - assertEquals(CellType.BOOLEAN, c.getCellTypeEnum()); + assertEquals(CellType.BOOLEAN, c.getCellType()); assertEquals("B1 value", true, c.getBooleanCellValue()); c = r.getCell(2); assertEquals(0, c.getRowIndex()); assertEquals(2, c.getColumnIndex()); - assertEquals(CellType.BOOLEAN, c.getCellTypeEnum()); + assertEquals(CellType.BOOLEAN, c.getCellType()); assertEquals("C1 value", false, c.getBooleanCellValue()); wb2.close(); @@ -191,7 +190,7 @@ public abstract class BaseTestCell { /** * test that Error types (BoolErrRecord) are supported properly. - * @see testBool + * @see #testBool */ @Test public void testErr() throws IOException { @@ -227,13 +226,13 @@ public abstract class BaseTestCell { c = r.getCell(1); assertEquals(0, c.getRowIndex()); assertEquals(1, c.getColumnIndex()); - assertEquals(CellType.ERROR, c.getCellTypeEnum()); + assertEquals(CellType.ERROR, c.getCellType()); assertEquals("B1 value == #NULL!", FormulaError.NULL.getCode(), c.getErrorCellValue()); c = r.getCell(2); assertEquals(0, c.getRowIndex()); assertEquals(2, c.getColumnIndex()); - assertEquals(CellType.ERROR, c.getCellTypeEnum()); + assertEquals(CellType.ERROR, c.getCellType()); assertEquals("C1 value == #DIV/0!", FormulaError.DIV0.getCode(), c.getErrorCellValue()); wb2.close(); @@ -273,7 +272,7 @@ public abstract class BaseTestCell { r = s.getRow(0); c = r.getCell(0); - assertEquals("Formula Cell at 0,0", CellType.FORMULA, c.getCellTypeEnum()); + assertEquals("Formula Cell at 0,0", CellType.FORMULA, c.getCellType()); cs = c.getCellStyle(); assertNotNull("Formula Cell Style", cs); @@ -351,25 +350,25 @@ public abstract class BaseTestCell { Cell c1 = r.createCell(0); c1.setCellFormula("NA()"); assertEquals(0.0, c1.getNumericCellValue(), 0.0); - assertEquals(CellType.NUMERIC, c1.getCachedFormulaResultTypeEnum()); + assertEquals(CellType.NUMERIC, c1.getCachedFormulaResultType()); c1.setCellValue(10); assertEquals(10.0, c1.getNumericCellValue(), 0.0); - assertEquals(CellType.FORMULA, c1.getCellTypeEnum()); - assertEquals(CellType.NUMERIC, c1.getCachedFormulaResultTypeEnum()); + assertEquals(CellType.FORMULA, c1.getCellType()); + assertEquals(CellType.NUMERIC, c1.getCachedFormulaResultType()); Cell c2 = r.createCell(1); c2.setCellFormula("NA()"); assertEquals(0.0, c2.getNumericCellValue(), 0.0); - assertEquals(CellType.NUMERIC, c2.getCachedFormulaResultTypeEnum()); + assertEquals(CellType.NUMERIC, c2.getCachedFormulaResultType()); c2.setCellValue("I changed!"); assertEquals("I changed!", c2.getStringCellValue()); - assertEquals(CellType.FORMULA, c2.getCellTypeEnum()); - assertEquals(CellType.STRING, c2.getCachedFormulaResultTypeEnum()); + assertEquals(CellType.FORMULA, c2.getCellType()); + assertEquals(CellType.STRING, c2.getCachedFormulaResultType()); //calglin Cell.setCellFormula(null) for a non-formula cell Cell c3 = r.createCell(2); c3.setCellFormula(null); - assertEquals(CellType.BLANK, c3.getCellTypeEnum()); + assertEquals(CellType.BLANK, c3.getCellType()); wb.close(); } @@ -424,11 +423,11 @@ public abstract class BaseTestCell { Cell cell = createACell(wb); cell.setCellValue("TRUE"); - assertEquals(CellType.STRING, cell.getCellTypeEnum()); + assertEquals(CellType.STRING, cell.getCellType()); // test conversion of cell from text to boolean cell.setCellType(CellType.BOOLEAN); - assertEquals(CellType.BOOLEAN, cell.getCellTypeEnum()); + assertEquals(CellType.BOOLEAN, cell.getCellType()); assertEquals(true, cell.getBooleanCellValue()); cell.setCellType(CellType.STRING); assertEquals("TRUE", cell.getRichStringCellValue().getString()); @@ -436,7 +435,7 @@ public abstract class BaseTestCell { // 'false' text to bool and back cell.setCellValue("FALSE"); cell.setCellType(CellType.BOOLEAN); - assertEquals(CellType.BOOLEAN, cell.getCellTypeEnum()); + assertEquals(CellType.BOOLEAN, cell.getCellType()); assertEquals(false, cell.getBooleanCellValue()); cell.setCellType(CellType.STRING); assertEquals("FALSE", cell.getRichStringCellValue().getString()); @@ -593,17 +592,17 @@ public abstract class BaseTestCell { cell = row.createCell(0, CellType.NUMERIC); cell.setCellValue(1.0); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertEquals(1.0, cell.getNumericCellValue(), 0.0); cell = row.createCell(1, CellType.NUMERIC); cell.setCellValue(2.0); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertEquals(2.0, cell.getNumericCellValue(), 0.0); cell = row.createCell(2, CellType.FORMULA); cell.setCellFormula("SUM(A1:B1)"); - assertEquals(CellType.FORMULA, cell.getCellTypeEnum()); + assertEquals(CellType.FORMULA, cell.getCellType()); assertEquals("SUM(A1:B1)", cell.getCellFormula()); //serialize and check again @@ -611,15 +610,15 @@ public abstract class BaseTestCell { wb1.close(); row = wb2.getSheetAt(0).getRow(0); cell = row.getCell(0); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertEquals(1.0, cell.getNumericCellValue(), 0.0); cell = row.getCell(1); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); assertEquals(2.0, cell.getNumericCellValue(), 0.0); cell = row.getCell(2); - assertEquals(CellType.FORMULA, cell.getCellTypeEnum()); + assertEquals(CellType.FORMULA, cell.getCellType()); assertEquals("SUM(A1:B1)", cell.getCellFormula()); wb2.close(); } @@ -676,17 +675,17 @@ public abstract class BaseTestCell { Cell cell0 = row.createCell(0); cell0.setCellValue(Double.NaN); - assertEquals("Double.NaN should change cell type to CellType#ERROR", CellType.ERROR, cell0.getCellTypeEnum()); + assertEquals("Double.NaN should change cell type to CellType#ERROR", CellType.ERROR, cell0.getCellType()); assertEquals("Double.NaN should change cell value to #NUM!", FormulaError.NUM, forInt(cell0.getErrorCellValue())); Cell cell1 = row.createCell(1); cell1.setCellValue(Double.POSITIVE_INFINITY); - assertEquals("Double.POSITIVE_INFINITY should change cell type to CellType#ERROR", CellType.ERROR, cell1.getCellTypeEnum()); + assertEquals("Double.POSITIVE_INFINITY should change cell type to CellType#ERROR", CellType.ERROR, cell1.getCellType()); assertEquals("Double.POSITIVE_INFINITY should change cell value to #DIV/0!", FormulaError.DIV0, forInt(cell1.getErrorCellValue())); Cell cell2 = row.createCell(2); cell2.setCellValue(Double.NEGATIVE_INFINITY); - assertEquals("Double.NEGATIVE_INFINITY should change cell type to CellType#ERROR", CellType.ERROR, cell2.getCellTypeEnum()); + assertEquals("Double.NEGATIVE_INFINITY should change cell type to CellType#ERROR", CellType.ERROR, cell2.getCellType()); assertEquals("Double.NEGATIVE_INFINITY should change cell value to #DIV/0!", FormulaError.DIV0, forInt(cell2.getErrorCellValue())); Workbook wb2 = _testDataProvider.writeOutAndReadBack(wb1); @@ -694,15 +693,15 @@ public abstract class BaseTestCell { row = wb2.getSheetAt(0).getRow(0); cell0 = row.getCell(0); - assertEquals(CellType.ERROR, cell0.getCellTypeEnum()); + assertEquals(CellType.ERROR, cell0.getCellType()); assertEquals(FormulaError.NUM, forInt(cell0.getErrorCellValue())); cell1 = row.getCell(1); - assertEquals(CellType.ERROR, cell1.getCellTypeEnum()); + assertEquals(CellType.ERROR, cell1.getCellType()); assertEquals(FormulaError.DIV0, forInt(cell1.getErrorCellValue())); cell2 = row.getCell(2); - assertEquals(CellType.ERROR, cell2.getCellTypeEnum()); + assertEquals(CellType.ERROR, cell2.getCellType()); assertEquals(FormulaError.DIV0, forInt(cell2.getErrorCellValue())); wb2.close(); } @@ -903,21 +902,21 @@ public abstract class BaseTestCell { RichTextString nullStr = null; cell.setCellValue(nullStr); assertEquals("", cell.getStringCellValue()); - assertEquals(CellType.BLANK, cell.getCellTypeEnum()); + assertEquals(CellType.BLANK, cell.getCellType()); cell = sheet.createRow(0).createCell(1); cell.setCellValue(1.2d); - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); + assertEquals(CellType.NUMERIC, cell.getCellType()); cell.setCellValue(nullStr); assertEquals("", cell.getStringCellValue()); - assertEquals(CellType.BLANK, cell.getCellTypeEnum()); + assertEquals(CellType.BLANK, cell.getCellType()); cell = sheet.createRow(0).createCell(1); cell.setCellValue(wb.getCreationHelper().createRichTextString("Test")); - assertEquals(CellType.STRING, cell.getCellTypeEnum()); + assertEquals(CellType.STRING, cell.getCellType()); cell.setCellValue(nullStr); assertEquals("", cell.getStringCellValue()); - assertEquals(CellType.BLANK, cell.getCellTypeEnum()); + assertEquals(CellType.BLANK, cell.getCellType()); wb.close(); } @@ -1015,38 +1014,4 @@ public abstract class BaseTestCell { wb.close(); } - - @Test - public void primitiveToEnumReplacementDoesNotBreakBackwardsCompatibility() throws IOException { - // bug 59836 - // until we have changes POI from working on primitives (int) to enums, - // we should make sure we minimize backwards compatibility breakages. - // This method tests the old way of working with cell types, alignment, etc. - Workbook wb = _testDataProvider.createWorkbook(); - Sheet sheet = wb.createSheet(); - Row row = sheet.createRow(0); - Cell cell = row.createCell(0); - - // Cell.CELL_TYPE_* -> CellType.* - cell.setCellValue(5.0); - assertEquals(Cell.CELL_TYPE_NUMERIC, cell.getCellType()); - assertEquals(0, cell.getCellType()); //make sure that hard-coded int literals still work, even though users should be using the named constants - assertEquals(CellType.NUMERIC, cell.getCellTypeEnum()); // make sure old way and new way are compatible - - // make sure switch(int|Enum) still works. Cases must be statically resolvable in Java 6 ("constant expression required") - switch(cell.getCellType()) { - case Cell.CELL_TYPE_NUMERIC: - // expected - break; - case Cell.CELL_TYPE_STRING: - case Cell.CELL_TYPE_BOOLEAN: - case Cell.CELL_TYPE_ERROR: - case Cell.CELL_TYPE_FORMULA: - case Cell.CELL_TYPE_BLANK: - default: - fail("unexpected cell type: " + cell.getCellType()); - } - - wb.close(); - } }
--------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
