diff options
Diffstat (limited to 'src/testcases/org/apache/poi/ss')
33 files changed, 205 insertions, 185 deletions
diff --git a/src/testcases/org/apache/poi/ss/format/TestCellFormat.java b/src/testcases/org/apache/poi/ss/format/TestCellFormat.java index 6f4ed58ee2..5d19c633f4 100644 --- a/src/testcases/org/apache/poi/ss/format/TestCellFormat.java +++ b/src/testcases/org/apache/poi/ss/format/TestCellFormat.java @@ -157,16 +157,16 @@ public class TestCellFormat { CellFormat cf = CellFormat.getInstance("General"); - // case Cell.CELL_TYPE_BLANK + // case CellType.BLANK CellFormatResult result0 = cf.apply(cell0); assertEquals("", result0.text); - // case Cell.CELL_TYPE_BOOLEAN + // case CellType.BOOLEAN cell1.setCellValue(true); CellFormatResult result1 = cf.apply(cell1); assertEquals("TRUE", result1.text); - // case Cell.CELL_TYPE_NUMERIC + // case CellType.NUMERIC cell2.setCellValue(1.23); CellFormatResult result2 = cf.apply(cell2); assertEquals("1.23", result2.text); @@ -175,7 +175,7 @@ public class TestCellFormat { CellFormatResult result3 = cf.apply(cell3); assertEquals("123", result3.text); - // case Cell.CELL_TYPE_STRING + // case CellType.STRING cell4.setCellValue("abc"); CellFormatResult result4 = cf.apply(cell4); assertEquals("abc", result4.text); @@ -198,16 +198,16 @@ public class TestCellFormat { CellFormat cf = CellFormat.getInstance("@"); - // case Cell.CELL_TYPE_BLANK + // case CellType.BLANK CellFormatResult result0 = cf.apply(cell0); assertEquals("", result0.text); - // case Cell.CELL_TYPE_BOOLEAN + // case CellType.BOOLEAN cell1.setCellValue(true); CellFormatResult result1 = cf.apply(cell1); assertEquals("TRUE", result1.text); - // case Cell.CELL_TYPE_NUMERIC + // case CellType.NUMERIC cell2.setCellValue(1.23); CellFormatResult result2 = cf.apply(cell2); assertEquals("1.23", result2.text); @@ -216,7 +216,7 @@ public class TestCellFormat { CellFormatResult result3 = cf.apply(cell3); assertEquals("123", result3.text); - // case Cell.CELL_TYPE_STRING + // case CellType.STRING cell4.setCellValue("abc"); CellFormatResult result4 = cf.apply(cell4); assertEquals("abc", result4.text); @@ -309,18 +309,18 @@ public class TestCellFormat { JLabel label3 = new JLabel(); JLabel label4 = new JLabel(); - // case Cell.CELL_TYPE_BLANK + // case CellType.BLANK CellFormatResult result0 = cf.apply(label0, cell0); assertEquals("", result0.text); assertEquals("", label0.getText()); - // case Cell.CELL_TYPE_BOOLEAN + // case CellType.BOOLEAN cell1.setCellValue(true); CellFormatResult result1 = cf.apply(label1, cell1); assertEquals("TRUE", result1.text); assertEquals("TRUE", label1.getText()); - // case Cell.CELL_TYPE_NUMERIC + // case CellType.NUMERIC cell2.setCellValue(1.23); CellFormatResult result2 = cf.apply(label2, cell2); assertEquals("1.23", result2.text); @@ -331,7 +331,7 @@ public class TestCellFormat { assertEquals("123", result3.text); assertEquals("123", label3.getText()); - // case Cell.CELL_TYPE_STRING + // case CellType.STRING cell4.setCellValue("abc"); CellFormatResult result4 = cf.apply(label4, cell4); assertEquals("abc", result4.text); @@ -361,18 +361,18 @@ public class TestCellFormat { JLabel label3 = new JLabel(); JLabel label4 = new JLabel(); - // case Cell.CELL_TYPE_BLANK + // case CellType.BLANK CellFormatResult result0 = cf.apply(label0, cell0); assertEquals("", result0.text); assertEquals("", label0.getText()); - // case Cell.CELL_TYPE_BOOLEAN + // case CellType.BOOLEAN cell1.setCellValue(true); CellFormatResult result1 = cf.apply(label1, cell1); assertEquals("TRUE", result1.text); assertEquals("TRUE", label1.getText()); - // case Cell.CELL_TYPE_NUMERIC + // case CellType.NUMERIC cell2.setCellValue(1.23); CellFormatResult result2 = cf.apply(label2, cell2); assertEquals("1.23", result2.text); @@ -383,7 +383,7 @@ public class TestCellFormat { assertEquals("123", result3.text); assertEquals("123", label3.getText()); - // case Cell.CELL_TYPE_STRING + // case CellType.STRING cell4.setCellValue("abc"); CellFormatResult result4 = cf.apply(label4, cell4); assertEquals("abc", result4.text); diff --git a/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java b/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java index 0043187c05..d2b6577345 100644 --- a/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java +++ b/src/testcases/org/apache/poi/ss/formula/BaseTestExternalFunctions.java @@ -16,7 +16,9 @@ ==================================================================== */ package org.apache.poi.ss.formula; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.IOException; @@ -30,6 +32,7 @@ import org.apache.poi.ss.formula.functions.FreeRefFunction; import org.apache.poi.ss.formula.udf.DefaultUDFFinder; import org.apache.poi.ss.formula.udf.UDFFinder; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -146,12 +149,12 @@ public abstract class BaseTestExternalFunctions { Cell cell2 = sh.getRow(2).getCell(1); assertEquals("ISODD(2)", cell2.getCellFormula()); assertEquals(false, evaluator.evaluate(cell2).getBooleanValue()); - assertEquals(Cell.CELL_TYPE_BOOLEAN, evaluator.evaluateFormulaCell(cell2)); + assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCell(cell2)); Cell cell3 = sh.getRow(3).getCell(1); assertEquals("ISEVEN(2)", cell3.getCellFormula()); assertEquals(true, evaluator.evaluate(cell3).getBooleanValue()); - assertEquals(Cell.CELL_TYPE_BOOLEAN, evaluator.evaluateFormulaCell(cell3)); + assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCell(cell3)); wb.close(); } diff --git a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java index 1c626dcee1..c469b5cdcd 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java +++ b/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java @@ -224,14 +224,14 @@ public class TestEvaluationCache extends TestCase { public void setCellValue(String cellRefText, double value) { HSSFCell cell = getOrCreateCell(cellRefText); // be sure to blank cell, in case it is currently a formula - cell.setCellType(HSSFCell.CELL_TYPE_BLANK); + cell.setCellType(CellType.BLANK); // otherwise this line will only set the formula cached result; cell.setCellValue(value); _evaluator.notifyUpdateCell(wrapCell(cell)); } public void clearCell(String cellRefText) { HSSFCell cell = getOrCreateCell(cellRefText); - cell.setCellType(HSSFCell.CELL_TYPE_BLANK); + cell.setCellType(CellType.BLANK); _evaluator.notifyUpdateCell(wrapCell(cell)); } @@ -598,7 +598,7 @@ public class TestEvaluationCache extends TestCase { cv = fe.evaluate(cellA1); assertEquals(3.7, cv.getNumberValue(), 0.0); - cellB1.setCellType(HSSFCell.CELL_TYPE_BLANK); + cellB1.setCellType(CellType.BLANK); fe.notifyUpdateCell(cellB1); cv = fe.evaluate(cellA1); // B1 was used to evaluate A1 assertEquals(2.2, cv.getNumberValue(), 0.0); diff --git a/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java b/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java index 35bb050b1a..004097c822 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java +++ b/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java @@ -27,6 +27,7 @@ import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@@ -66,7 +67,7 @@ public class TestMissingWorkbook extends TestCase { Row lARow = lSheet.getRow(0);
Cell lA1Cell = lARow.getCell(0);
- assertEquals(Cell.CELL_TYPE_FORMULA, lA1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lA1Cell.getCellType());
try {
evaluator.evaluateFormulaCell(lA1Cell);
fail("Missing external workbook reference exception expected!");
@@ -81,9 +82,9 @@ public class TestMissingWorkbook extends TestCase { Cell lB1Cell = lSheet.getRow(1).getCell(0);
Cell lC1Cell = lSheet.getRow(2).getCell(0);
- assertEquals(Cell.CELL_TYPE_FORMULA, lA1Cell.getCellType());
- assertEquals(Cell.CELL_TYPE_FORMULA, lB1Cell.getCellType());
- assertEquals(Cell.CELL_TYPE_FORMULA, lC1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lA1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lB1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lC1Cell.getCellType());
// Check cached values
assertEquals(10.0d, lA1Cell.getNumericCellValue(), 0.00001d);
@@ -94,9 +95,9 @@ public class TestMissingWorkbook extends TestCase { FormulaEvaluator evaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator();
evaluator.setIgnoreMissingWorkbooks(true);
- assertEquals(Cell.CELL_TYPE_NUMERIC, evaluator.evaluateFormulaCell(lA1Cell));
- assertEquals(Cell.CELL_TYPE_STRING, evaluator.evaluateFormulaCell(lB1Cell));
- assertEquals(Cell.CELL_TYPE_BOOLEAN, evaluator.evaluateFormulaCell(lC1Cell));
+ assertEquals(CellType.NUMERIC, evaluator.evaluateFormulaCell(lA1Cell));
+ assertEquals(CellType.STRING, evaluator.evaluateFormulaCell(lB1Cell));
+ assertEquals(CellType.BOOLEAN, evaluator.evaluateFormulaCell(lC1Cell));
assertEquals(10.0d, lA1Cell.getNumericCellValue(), 0.00001d);
assertEquals("POI rocks!", lB1Cell.getStringCellValue());
@@ -110,9 +111,9 @@ public class TestMissingWorkbook extends TestCase { Cell lB1Cell = lSheet.getRow(1).getCell(0);
Cell lC1Cell = lSheet.getRow(2).getCell(0);
- assertEquals(Cell.CELL_TYPE_FORMULA, lA1Cell.getCellType());
- assertEquals(Cell.CELL_TYPE_FORMULA, lB1Cell.getCellType());
- assertEquals(Cell.CELL_TYPE_FORMULA, lC1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lA1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lB1Cell.getCellType());
+ assertEquals(CellType.FORMULA, lC1Cell.getCellType());
FormulaEvaluator lMainWorkbookEvaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator();
FormulaEvaluator lSourceEvaluator = sourceWorkbook.getCreationHelper().createFormulaEvaluator();
@@ -121,9 +122,9 @@ public class TestMissingWorkbook extends TestCase { workbooks.put(SOURCE_DUMMY_WORKBOOK_FILENAME, lSourceEvaluator);
lMainWorkbookEvaluator.setupReferencedWorkbooks(workbooks);
- assertEquals(Cell.CELL_TYPE_NUMERIC, lMainWorkbookEvaluator.evaluateFormulaCell(lA1Cell));
- assertEquals(Cell.CELL_TYPE_STRING, lMainWorkbookEvaluator.evaluateFormulaCell(lB1Cell));
- assertEquals(Cell.CELL_TYPE_BOOLEAN, lMainWorkbookEvaluator.evaluateFormulaCell(lC1Cell));
+ assertEquals(CellType.NUMERIC, lMainWorkbookEvaluator.evaluateFormulaCell(lA1Cell));
+ assertEquals(CellType.STRING, lMainWorkbookEvaluator.evaluateFormulaCell(lB1Cell));
+ assertEquals(CellType.BOOLEAN, lMainWorkbookEvaluator.evaluateFormulaCell(lC1Cell));
assertEquals(20.0d, lA1Cell.getNumericCellValue(), 0.00001d);
assertEquals("Apache rocks!", lB1Cell.getStringCellValue());
diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java b/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java index 7a70fee262..1d956c76fa 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java @@ -16,16 +16,17 @@ ==================================================================== */ package org.apache.poi.ss.formula.atp; -import junit.framework.TestCase; - import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.util.CellReference; +import junit.framework.TestCase; + /** * Testcase for 'Analysis Toolpak' function IFERROR() * @@ -45,11 +46,11 @@ public class TestIfError extends TestCase { Row row2 = sh.createRow(1); // Create cells - row1.createCell(0, Cell.CELL_TYPE_NUMERIC); - row1.createCell(1, Cell.CELL_TYPE_NUMERIC); - row1.createCell(2, Cell.CELL_TYPE_NUMERIC); - row2.createCell(0, Cell.CELL_TYPE_NUMERIC); - row2.createCell(1, Cell.CELL_TYPE_NUMERIC); + row1.createCell(0, CellType.NUMERIC); + row1.createCell(1, CellType.NUMERIC); + row1.createCell(2, CellType.NUMERIC); + row2.createCell(0, CellType.NUMERIC); + row2.createCell(1, CellType.NUMERIC); // Create references CellReference a1 = new CellReference("A1"); @@ -77,18 +78,18 @@ public class TestIfError extends TestCase { FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator(); assertEquals("Checks that the cell is numeric", - Cell.CELL_TYPE_NUMERIC, evaluator.evaluate(cell1).getCellType()); + CellType.NUMERIC, evaluator.evaluate(cell1).getCellType()); assertEquals("Divides 210 by 35 and returns 6.0", 6.0, evaluator.evaluate(cell1).getNumberValue(), accuracy); assertEquals("Checks that the cell is numeric", - Cell.CELL_TYPE_STRING, evaluator.evaluate(cell2).getCellType()); + CellType.STRING, evaluator.evaluate(cell2).getCellType()); assertEquals("Rounds -10 to a nearest multiple of -3 (-9)", "Error in calculation", evaluator.evaluate(cell2).getStringValue()); assertEquals("Check that C1 returns string", - Cell.CELL_TYPE_STRING, evaluator.evaluate(cell3).getCellType()); + CellType.STRING, evaluator.evaluate(cell3).getCellType()); assertEquals("Check that C1 returns string \"error\"", "error", evaluator.evaluate(cell3).getStringValue()); } diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java b/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java index 6b8d50322e..802b7d8b33 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java @@ -21,6 +21,7 @@ import junit.framework.TestCase; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -49,7 +50,7 @@ public class TestRandBetween extends TestCase { Row row = sheet.createRow(0); bottomValueCell = row.createCell(0); topValueCell = row.createCell(1); - formulaCell = row.createCell(2, Cell.CELL_TYPE_FORMULA); + formulaCell = row.createCell(2, CellType.FORMULA); } @Override @@ -113,7 +114,7 @@ public class TestRandBetween extends TestCase { public void testRandBetweenTopBlank() { bottomValueCell.setCellValue(-1); - topValueCell.setCellType(Cell.CELL_TYPE_BLANK); + topValueCell.setCellType(CellType.BLANK); formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)"); evaluator.clearAllCachedResultValues(); evaluator.evaluateFormulaCell(formulaCell); @@ -130,7 +131,7 @@ public class TestRandBetween extends TestCase { formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)"); evaluator.clearAllCachedResultValues(); evaluator.evaluateFormulaCell(formulaCell); - assertEquals(Cell.CELL_TYPE_ERROR, formulaCell.getCachedFormulaResultType()); + assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultType()); assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue()); @@ -140,7 +141,7 @@ public class TestRandBetween extends TestCase { formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)"); evaluator.clearAllCachedResultValues(); evaluator.evaluateFormulaCell(formulaCell); - assertEquals(Cell.CELL_TYPE_ERROR, formulaCell.getCachedFormulaResultType()); + assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultType()); assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue()); // Check case where both inputs are of wrong type @@ -149,7 +150,7 @@ public class TestRandBetween extends TestCase { formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)"); evaluator.clearAllCachedResultValues(); evaluator.evaluateFormulaCell(formulaCell); - assertEquals(Cell.CELL_TYPE_ERROR, formulaCell.getCachedFormulaResultType()); + assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultType()); assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue()); } @@ -165,14 +166,14 @@ public class TestRandBetween extends TestCase { formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)"); evaluator.clearAllCachedResultValues(); evaluator.evaluateFormulaCell(formulaCell); - assertEquals(Cell.CELL_TYPE_ERROR, formulaCell.getCachedFormulaResultType()); + assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultType()); assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), formulaCell.getErrorCellValue()); bottomValueCell.setCellValue(1); - topValueCell.setCellType(Cell.CELL_TYPE_BLANK); + topValueCell.setCellType(CellType.BLANK); formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)"); evaluator.clearAllCachedResultValues(); evaluator.evaluateFormulaCell(formulaCell); - assertEquals(Cell.CELL_TYPE_ERROR, formulaCell.getCachedFormulaResultType()); + assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultType()); assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), formulaCell.getErrorCellValue()); } diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java index 4860d6b05e..f52d0728e6 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestYearFracCalculatorFromSpreadsheet.java @@ -32,6 +32,7 @@ import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.eval.EvaluationException; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.util.LocaleUtil; import org.junit.Test; @@ -62,7 +63,7 @@ public final class TestYearFracCalculatorFromSpreadsheet { HSSFRow row = (HSSFRow) rowIterator.next(); HSSFCell cell = row.getCell(SS.YEARFRAC_FORMULA_COLUMN); - if (cell == null || cell.getCellType() != HSSFCell.CELL_TYPE_FORMULA) { + if (cell == null || cell.getCellType() != CellType.FORMULA) { continue; } processRow(row, cell, formulaEvaluator); diff --git a/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java b/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java index e82fcf7517..4c0223afd7 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java @@ -24,6 +24,7 @@ import java.io.IOException; import org.apache.poi.ss.ITestDataProvider; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.Row; @@ -65,7 +66,7 @@ public abstract class BaseTestCircularReferences { * Makes sure that the specified evaluated cell value represents a circular reference error. */ private static void confirmCycleErrorCode(CellValue cellValue) { - assertTrue(cellValue.getCellType() == Cell.CELL_TYPE_ERROR); + assertTrue(cellValue.getCellType() == CellType.ERROR); assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cellValue.getErrorValue()); } @@ -95,7 +96,7 @@ public abstract class BaseTestCircularReferences { CellValue cellValue = evaluateWithCycles(wb, testCell); - assertTrue(cellValue.getCellType() == Cell.CELL_TYPE_NUMERIC); + assertTrue(cellValue.getCellType() == CellType.NUMERIC); assertEquals(2, cellValue.getNumberValue(), 0); wb.close(); } @@ -165,10 +166,10 @@ public abstract class BaseTestCircularReferences { // Happy day flow - evaluate A1 first cv = fe.evaluate(cellA1); - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(42.0, cv.getNumberValue(), 0.0); cv = fe.evaluate(cellB1); // no circ-ref-error because A1 result is cached - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(46.0, cv.getNumberValue(), 0.0); // Show the bug - evaluate another cell from the loop first @@ -176,13 +177,13 @@ public abstract class BaseTestCircularReferences { cv = fe.evaluate(cellB1); // Identified bug 46898 assertNotEquals(cv.getCellType(), ErrorEval.CIRCULAR_REF_ERROR.getErrorCode()); - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(46.0, cv.getNumberValue(), 0.0); // start evaluation on another cell fe.clearAllCachedResultValues(); cv = fe.evaluate(cellE1); - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(43.0, cv.getNumberValue(), 0.0); wb.close(); diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java index 451b840713..561ce4bfda 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulaBugs.java @@ -58,7 +58,7 @@ public final class TestFormulaBugs { FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator(); CellValue cv = fe.evaluate(cell); - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(3.0, cv.getNumberValue(), 0.0); wb.close(); @@ -106,11 +106,11 @@ public final class TestFormulaBugs { FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator(); CellValue cv; cv = fe.evaluate(cell); - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(1.0, cv.getNumberValue(), 0.0); cv = fe.evaluate(row.getCell(1)); - assertEquals(Cell.CELL_TYPE_BOOLEAN, cv.getCellType()); + assertEquals(CellType.BOOLEAN, cv.getCellType()); assertEquals(true, cv.getBooleanValue()); wb.close(); @@ -161,7 +161,7 @@ public final class TestFormulaBugs { FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator(); CellValue cv = fe.evaluate(cell); - assertEquals(Cell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(expectedResult, cv.getNumberValue(), 0.0); wb.close(); diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java index faeee6af3e..c3a5eec233 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java @@ -27,6 +27,7 @@ import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; /** @@ -77,7 +78,7 @@ public final class TestPercentEval extends TestCase { // else some other unexpected error throw e; } - assertEquals(HSSFCell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals(CellType.NUMERIC, cv.getCellType()); assertEquals(0.5, cv.getNumberValue(), 0.0); } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java b/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java index 94a5c86e92..af0d7fbde0 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/CountifsTests.java @@ -29,11 +29,11 @@ public class CountifsTests extends TestCase { HSSFWorkbook workbook = new HSSFWorkbook(); Sheet sheet = workbook.createSheet("test"); Row row1 = sheet.createRow(0); - Cell cellA1 = row1.createCell(0, Cell.CELL_TYPE_FORMULA); - Cell cellB1 = row1.createCell(1, Cell.CELL_TYPE_NUMERIC); - Cell cellC1 = row1.createCell(2, Cell.CELL_TYPE_NUMERIC); - Cell cellD1 = row1.createCell(3, Cell.CELL_TYPE_NUMERIC); - Cell cellE1 = row1.createCell(4, Cell.CELL_TYPE_NUMERIC); + Cell cellA1 = row1.createCell(0, CellType.FORMULA); + Cell cellB1 = row1.createCell(1, CellType.NUMERIC); + Cell cellC1 = row1.createCell(2, CellType.NUMERIC); + Cell cellD1 = row1.createCell(3, CellType.NUMERIC); + Cell cellE1 = row1.createCell(4, CellType.NUMERIC); cellB1.setCellValue(1); cellC1.setCellValue(1); cellD1.setCellValue(2); @@ -49,7 +49,7 @@ public class CountifsTests extends TestCase { HSSFWorkbook workbook = new HSSFWorkbook(); Sheet sheet = workbook.createSheet("test"); Row row1 = sheet.createRow(0); - Cell cellA1 = row1.createCell(0, Cell.CELL_TYPE_FORMULA); + Cell cellA1 = row1.createCell(0, CellType.FORMULA); cellA1.setCellFormula("COUNTIFS()"); FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator(); CellValue evaluate = evaluator.evaluate(cellA1); diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java b/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java index 013b15806c..8f3951aa91 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java @@ -19,6 +19,7 @@ package org.apache.poi.ss.formula.functions; import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import junit.framework.TestCase;
@@ -72,7 +73,7 @@ public final class TestAddress extends TestCase { cell.setCellFormula(formulaText);
fe.notifyUpdateCell(cell);
CellValue result = fe.evaluate(cell);
- assertEquals(result.getCellType(), HSSFCell.CELL_TYPE_STRING);
+ assertEquals(result.getCellType(), CellType.STRING);
assertEquals(expectedResult, result.getStringValue());
}
}
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java b/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java index 636c72a427..3f88237293 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java @@ -17,16 +17,16 @@ package org.apache.poi.ss.formula.functions; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; -import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + /** * Test for YEAR / MONTH / DAY / HOUR / MINUTE / SECOND */ @@ -39,7 +39,7 @@ public final class TestCalendarFieldFunction extends TestCase { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet("new sheet"); cell11 = sheet.createRow(0).createCell(0); - cell11.setCellType(HSSFCell.CELL_TYPE_FORMULA); + cell11.setCellType(CellType.FORMULA); evaluator = new HSSFFormulaEvaluator(wb); } @@ -103,7 +103,7 @@ public final class TestCalendarFieldFunction extends TestCase { cell11.setCellFormula(formulaText); evaluator.clearAllCachedResultValues(); CellValue cv = evaluator.evaluate(cell11); - if (cv.getCellType() != Cell.CELL_TYPE_NUMERIC) { + if (cv.getCellType() != CellType.NUMERIC) { throw new AssertionFailedError("Wrong result type: " + cv.formatAsString()); } double actualValue = cv.getNumberValue(); diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java b/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java index ad717b162e..fe6c6a6ed5 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java @@ -19,6 +19,7 @@ package org.apache.poi.ss.formula.functions; import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import junit.framework.TestCase;
@@ -59,7 +60,7 @@ public final class TestClean extends TestCase { cell.setCellFormula(formulaText);
fe.notifyUpdateCell(cell);
CellValue result = fe.evaluate(cell);
- assertEquals(result.getCellType(), HSSFCell.CELL_TYPE_STRING);
+ assertEquals(result.getCellType(), CellType.STRING);
assertEquals(expectedResult, result.getStringValue());
}
}
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java index fd3bc4b7b7..6dff5eda3c 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestCountFuncs.java @@ -17,10 +17,12 @@ package org.apache.poi.ss.formula.functions; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - import org.apache.poi.hssf.HSSFTestDataSamples; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.eval.AreaEval; import org.apache.poi.ss.formula.eval.BlankEval; import org.apache.poi.ss.formula.eval.BoolEval; @@ -30,15 +32,14 @@ import org.apache.poi.ss.formula.eval.OperandResolver; import org.apache.poi.ss.formula.eval.StringEval; import org.apache.poi.ss.formula.eval.ValueEval; import org.apache.poi.ss.formula.functions.CountUtils.I_MatchPredicate; -import org.apache.poi.hssf.usermodel.HSSFCell; -import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; -import org.apache.poi.hssf.usermodel.HSSFRow; -import org.apache.poi.hssf.usermodel.HSSFSheet; -import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.util.CellReference; +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + /** * Test cases for COUNT(), COUNTA() COUNTIF(), COUNTBLANK() */ @@ -504,9 +505,9 @@ public final class TestCountFuncs extends TestCase { for (int rowIx=7; rowIx<=12; rowIx++) { HSSFRow row = sheet1.getRow(rowIx-1); HSSFCell cellA = row.getCell(0); // cell containing a formula with COUNTIF - assertEquals(HSSFCell.CELL_TYPE_FORMULA, cellA.getCellType()); + assertEquals(CellType.FORMULA, cellA.getCellType()); HSSFCell cellC = row.getCell(2); // cell with a reference value - assertEquals(HSSFCell.CELL_TYPE_NUMERIC, cellC.getCellType()); + assertEquals(CellType.NUMERIC, cellC.getCellType()); CellValue cv = fe.evaluate(cellA); double actualValue = cv.getNumberValue(); @@ -522,9 +523,9 @@ public final class TestCountFuncs extends TestCase { for (int rowIx=9; rowIx<=14; rowIx++) { HSSFRow row = sheet2.getRow(rowIx-1); HSSFCell cellA = row.getCell(0); // cell containing a formula with COUNTIF - assertEquals(HSSFCell.CELL_TYPE_FORMULA, cellA.getCellType()); + assertEquals(CellType.FORMULA, cellA.getCellType()); HSSFCell cellC = row.getCell(2); // cell with a reference value - assertEquals(HSSFCell.CELL_TYPE_NUMERIC, cellC.getCellType()); + assertEquals(CellType.NUMERIC, cellC.getCellType()); CellValue cv = fe.evaluate(cellA); double actualValue = cv.getNumberValue(); diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java b/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java index 64e1c45542..ae3d5846ae 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java @@ -25,6 +25,7 @@ import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; /** @@ -39,7 +40,7 @@ public final class TestDate extends TestCase { HSSFWorkbook wb = new HSSFWorkbook(); HSSFSheet sheet = wb.createSheet("new sheet"); cell11 = sheet.createRow(0).createCell(0); - cell11.setCellType(HSSFCell.CELL_TYPE_FORMULA); + cell11.setCellType(CellType.FORMULA); evaluator = new HSSFFormulaEvaluator(wb); } @@ -81,7 +82,7 @@ public final class TestDate extends TestCase { cell11.setCellFormula(formulaText); evaluator.clearAllCachedResultValues(); CellValue cv = evaluator.evaluate(cell11); - if (cv.getCellType() != Cell.CELL_TYPE_NUMERIC) { + if (cv.getCellType() != CellType.NUMERIC) { throw new AssertionFailedError("Wrong result type: " + cv.formatAsString()); } double actualValue = cv.getNumberValue(); diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java b/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java index d9eb226bfc..0bfff626af 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java @@ -24,6 +24,7 @@ import java.io.IOException; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaError; import org.junit.Test; @@ -65,7 +66,7 @@ public final class TestFind { cell.setCellFormula(formulaText); fe.notifyUpdateCell(cell); CellValue result = fe.evaluate(cell); - assertEquals(result.getCellType(), HSSFCell.CELL_TYPE_NUMERIC); + assertEquals(result.getCellType(), CellType.NUMERIC); assertEquals(expectedResult, result.getNumberValue(), 0.0); } @@ -74,7 +75,7 @@ public final class TestFind { cell.setCellFormula(formulaText); fe.notifyUpdateCell(cell); CellValue result = fe.evaluate(cell); - assertEquals(result.getCellType(), HSSFCell.CELL_TYPE_ERROR); + assertEquals(result.getCellType(), CellType.ERROR); assertEquals(expectedErrorCode.getCode(), result.getErrorValue()); } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java b/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java index 8624898d57..e14ea3c45b 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java @@ -31,7 +31,7 @@ import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.formula.eval.NumberEval; import org.apache.poi.ss.formula.eval.StringEval; import org.apache.poi.ss.formula.eval.ValueEval; -import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaError; import org.junit.Before; @@ -48,7 +48,7 @@ public final class TestFixed { try { HSSFSheet sheet = wb.createSheet("new sheet"); cell11 = sheet.createRow(0).createCell(0); - cell11.setCellType(HSSFCell.CELL_TYPE_FORMULA); + cell11.setCellType(CellType.FORMULA); evaluator = new HSSFFormulaEvaluator(wb); } finally { wb.close(); @@ -117,7 +117,7 @@ public final class TestFixed { cell11.setCellFormula(formulaText); evaluator.clearAllCachedResultValues(); CellValue cv = evaluator.evaluate(cell11); - assertEquals("Wrong result type: " + cv.formatAsString(), Cell.CELL_TYPE_STRING, cv.getCellType()); + assertEquals("Wrong result type: " + cv.formatAsString(), CellType.STRING, cv.getCellType()); String actualValue = cv.getStringValue(); assertEquals(expectedResult, actualValue); } @@ -127,7 +127,7 @@ public final class TestFixed { evaluator.clearAllCachedResultValues(); CellValue cv = evaluator.evaluate(cell11); assertTrue("Wrong result type: " + cv.formatAsString(), - cv.getCellType() == Cell.CELL_TYPE_ERROR + cv.getCellType() == CellType.ERROR && cv.getErrorValue() == FormulaError.VALUE.getCode()); } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java index c2118a147d..8e93152c81 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java @@ -28,6 +28,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.eval.ErrorEval; import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.junit.Test; @@ -182,7 +183,7 @@ public final class TestIndirect { fe.clearAllCachedResultValues(); cell.setCellFormula(formula); CellValue cv = fe.evaluate(cell); - if (cv.getCellType() != Cell.CELL_TYPE_NUMERIC) { + if (cv.getCellType() != CellType.NUMERIC) { fail("expected numeric cell type but got " + cv.formatAsString()); } assertEquals(expectedResult, cv.getNumberValue(), 0.0); @@ -193,7 +194,7 @@ public final class TestIndirect { fe.clearAllCachedResultValues(); cell.setCellFormula(formula); CellValue cv = fe.evaluate(cell); - if (cv.getCellType() != Cell.CELL_TYPE_ERROR) { + if (cv.getCellType() != CellType.ERROR) { fail("expected error cell type but got " + cv.formatAsString()); } int expCode = expectedResult.getErrorCode(); diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java index 7606d3fefa..b16fe50009 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java @@ -17,12 +17,18 @@ package org.apache.poi.ss.formula.functions; -import junit.framework.TestCase; -import junit.framework.AssertionFailedError; -import org.apache.poi.hssf.usermodel.*; import org.apache.poi.hssf.HSSFTestDataSamples; +import org.apache.poi.hssf.usermodel.HSSFCell; +import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; +import org.apache.poi.hssf.usermodel.HSSFRow; +import org.apache.poi.hssf.usermodel.HSSFSheet; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; +import junit.framework.AssertionFailedError; +import junit.framework.TestCase; + /** * Tests for {@link Irr} * @@ -122,7 +128,7 @@ public final class TestIrr extends TestCase { private static void assertFormulaResult(CellValue cv, HSSFCell cell){ double actualValue = cv.getNumberValue(); double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel - assertEquals("Invalid formula result: " + cv.toString(), HSSFCell.CELL_TYPE_NUMERIC, cv.getCellType()); + assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellType()); assertEquals(expectedValue, actualValue, 1E-4); // should agree within 0.01% } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java b/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java index 6b40f9c173..51b80876ec 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java @@ -17,14 +17,15 @@ package org.apache.poi.ss.formula.functions; -import junit.framework.TestCase; - import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellValue; + +import junit.framework.TestCase; /** * Tests for Excel function ISBLANK() * @@ -46,13 +47,13 @@ public final class TestIsBlank extends TestCase { HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb); CellValue result = fe.evaluate(cell); - assertEquals(HSSFCell.CELL_TYPE_BOOLEAN, result.getCellType()); + assertEquals(CellType.BOOLEAN, result.getCellType()); assertEquals(true, result.getBooleanValue()); cell.setCellFormula("isblank(D7:D7)"); result = fe.evaluate(cell); - assertEquals(HSSFCell.CELL_TYPE_BOOLEAN, result.getCellType()); + assertEquals(CellType.BOOLEAN, result.getCellType()); assertEquals(true, result.getBooleanValue()); } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java b/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java index 628df033d0..52b72dfa25 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestLogicalFunction.java @@ -19,9 +19,9 @@ package org.apache.poi.ss.formula.functions; import java.io.IOException;
-import junit.framework.TestCase;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
import org.apache.poi.ss.usermodel.Row;
@@ -29,6 +29,8 @@ import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.util.CellReference;
+import junit.framework.TestCase;
+
/**
* LogicalFunction unit tests.
*/
@@ -55,11 +57,11 @@ public class TestLogicalFunction extends TestCase { Row row2 = sh.createRow(1);
row3 = sh.createRow(2);
- row1.createCell(0, Cell.CELL_TYPE_NUMERIC);
- row1.createCell(1, Cell.CELL_TYPE_NUMERIC);
+ row1.createCell(0, CellType.NUMERIC);
+ row1.createCell(1, CellType.NUMERIC);
- row2.createCell(0, Cell.CELL_TYPE_NUMERIC);
- row2.createCell(1, Cell.CELL_TYPE_NUMERIC);
+ row2.createCell(0, CellType.NUMERIC);
+ row2.createCell(1, CellType.NUMERIC);
row3.createCell(0);
row3.createCell(1);
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java index a934202ed1..0fe105c634 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java @@ -17,9 +17,6 @@ package org.apache.poi.ss.formula.functions;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
-
import org.apache.poi.hssf.HSSFTestDataSamples;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
@@ -28,8 +25,12 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.CellValue;
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
/**
* Tests for {@link org.apache.poi.ss.formula.functions.Mirr}
*
@@ -161,7 +162,7 @@ public final class TestMirr extends TestCase { private static void assertFormulaResult(CellValue cv, HSSFCell cell) {
double actualValue = cv.getNumberValue();
double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel
- assertEquals("Invalid formula result: " + cv.toString(), HSSFCell.CELL_TYPE_NUMERIC, cv.getCellType());
+ assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellType());
assertEquals(expectedValue, actualValue, 1E-8);
}
}
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java b/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java index fe3b41122f..ec5553d84c 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestNper.java @@ -27,6 +27,7 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.formula.eval.NumberEval; import org.apache.poi.ss.formula.eval.ValueEval; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.FormulaError; import org.junit.Test; @@ -57,12 +58,12 @@ public final class TestNper { cell.setCellFormula("NPER(12,4500,100000,100000)"); cell.setCellValue(15.0); assertEquals("NPER(12,4500,100000,100000)", cell.getCellFormula()); - assertEquals(HSSFCell.CELL_TYPE_NUMERIC, cell.getCachedFormulaResultType()); + assertEquals(CellType.NUMERIC, cell.getCachedFormulaResultType()); assertEquals(15.0, cell.getNumericCellValue(), 0.0); HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb); fe.evaluateFormulaCell(cell); - assertEquals(HSSFCell.CELL_TYPE_ERROR, cell.getCachedFormulaResultType()); + assertEquals(CellType.ERROR, cell.getCachedFormulaResultType()); assertEquals(FormulaError.NUM.getCode(), cell.getErrorCellValue()); wb.close(); } diff --git a/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java b/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java index 76e175d5c9..88d7e84fff 100644 --- a/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java +++ b/src/testcases/org/apache/poi/ss/formula/udf/TestAggregatingUDFFinder.java @@ -16,11 +16,7 @@ ==================================================================== */ package org.apache.poi.ss.formula.udf; -import static org.junit.Assert.assertNotNull; - import org.apache.poi.ss.formula.atp.AnalysisToolPak; -import org.apache.poi.ss.formula.functions.FreeRefFunction; - import org.junit.Test; public class TestAggregatingUDFFinder extends BaseTestUDFFinder { diff --git a/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java b/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java index 6647276097..010b19d4e2 100644 --- a/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java +++ b/src/testcases/org/apache/poi/ss/formula/udf/TestDefaultUDFFinder.java @@ -16,10 +16,7 @@ ==================================================================== */ package org.apache.poi.ss.formula.udf; -import static org.junit.Assert.assertNotNull; - import org.apache.poi.ss.formula.functions.FreeRefFunction; - import org.junit.Test; public class TestDefaultUDFFinder extends BaseTestUDFFinder { diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java index a1c91481a5..9570341fd6 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestCell.java @@ -672,17 +672,17 @@ public abstract class BaseTestCell { Cell cell0 = row.createCell(0); cell0.setCellValue(Double.NaN); - assertEquals("Double.NaN should change cell type to CELL_TYPE_ERROR", CellType.ERROR, cell0.getCellType()); + 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 CELL_TYPE_ERROR", CellType.ERROR, cell1.getCellType()); + 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 CELL_TYPE_ERROR", CellType.ERROR, cell2.getCellType()); + 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); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java index 120216bd7f..27ac4c93a8 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestRow.java @@ -252,40 +252,40 @@ public abstract class BaseTestRow { // 5 -> num row.createCell(0).setCellValue("test"); row.createCell(1).setCellValue(3.2); - row.createCell(4, Cell.CELL_TYPE_BLANK); + row.createCell(4, CellType.BLANK); row.createCell(5).setCellValue(4); // First up, no policy given, uses default - assertEquals(Cell.CELL_TYPE_STRING, row.getCell(0).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(1).getCellType()); + assertEquals(CellType.STRING, row.getCell(0).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(1).getCellType()); assertEquals(null, row.getCell(2)); assertEquals(null, row.getCell(3)); - assertEquals(Cell.CELL_TYPE_BLANK, row.getCell(4).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(5).getCellType()); + assertEquals(CellType.BLANK, row.getCell(4).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(5).getCellType()); // RETURN_NULL_AND_BLANK - same as default - assertEquals(Cell.CELL_TYPE_STRING, row.getCell(0, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(1, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); + assertEquals(CellType.STRING, row.getCell(0, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(1, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); assertEquals(null, row.getCell(2, MissingCellPolicy.RETURN_NULL_AND_BLANK)); assertEquals(null, row.getCell(3, MissingCellPolicy.RETURN_NULL_AND_BLANK)); - assertEquals(Cell.CELL_TYPE_BLANK, row.getCell(4, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(5, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); + assertEquals(CellType.BLANK, row.getCell(4, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(5, MissingCellPolicy.RETURN_NULL_AND_BLANK).getCellType()); // RETURN_BLANK_AS_NULL - nearly the same - assertEquals(Cell.CELL_TYPE_STRING, row.getCell(0, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(1, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellType()); + assertEquals(CellType.STRING, row.getCell(0, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(1, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellType()); assertEquals(null, row.getCell(2, MissingCellPolicy.RETURN_BLANK_AS_NULL)); assertEquals(null, row.getCell(3, MissingCellPolicy.RETURN_BLANK_AS_NULL)); assertEquals(null, row.getCell(4, MissingCellPolicy.RETURN_BLANK_AS_NULL)); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(5, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(5, MissingCellPolicy.RETURN_BLANK_AS_NULL).getCellType()); // CREATE_NULL_AS_BLANK - creates as needed - assertEquals(Cell.CELL_TYPE_STRING, row.getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(1, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_BLANK, row.getCell(2, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_BLANK, row.getCell(3, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_BLANK, row.getCell(4, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(5, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); + assertEquals(CellType.STRING, row.getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(1, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); + assertEquals(CellType.BLANK, row.getCell(2, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); + assertEquals(CellType.BLANK, row.getCell(3, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); + assertEquals(CellType.BLANK, row.getCell(4, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(5, MissingCellPolicy.CREATE_NULL_AS_BLANK).getCellType()); // Check created ones get the right column assertEquals(0, row.getCell(0, MissingCellPolicy.CREATE_NULL_AS_BLANK).getColumnIndex()); @@ -300,12 +300,12 @@ public abstract class BaseTestRow { // that that is now used if no policy given workbook.setMissingCellPolicy(MissingCellPolicy.RETURN_BLANK_AS_NULL); - assertEquals(Cell.CELL_TYPE_STRING, row.getCell(0).getCellType()); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(1).getCellType()); + assertEquals(CellType.STRING, row.getCell(0).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(1).getCellType()); assertEquals(null, row.getCell(2)); assertEquals(null, row.getCell(3)); assertEquals(null, row.getCell(4)); - assertEquals(Cell.CELL_TYPE_NUMERIC, row.getCell(5).getCellType()); + assertEquals(CellType.NUMERIC, row.getCell(5).getCellType()); workbook.close(); } @@ -409,7 +409,7 @@ public abstract class BaseTestRow { assertFalse(it.hasNext()); // Add another cell, specifying the cellType - Cell cell5 = row.createCell(2, Cell.CELL_TYPE_STRING); + Cell cell5 = row.createCell(2, CellType.STRING); it = row.cellIterator(); assertNotNull(cell5); assertTrue(it.hasNext()); @@ -420,7 +420,7 @@ public abstract class BaseTestRow { assertTrue(cell5 == it.next()); assertTrue(it.hasNext()); assertTrue(cell2 == it.next()); - assertEquals(Cell.CELL_TYPE_STRING, cell5.getCellType()); + assertEquals(CellType.STRING, cell5.getCellType()); wb.close(); } diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java index 0d3611992c..f587b640a3 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetAutosizeColumn.java @@ -344,7 +344,7 @@ public abstract class BaseTestSheetAutosizeColumn { Sheet sheet = workbook.getSheetAt(i); for (Row r : sheet) { for (Cell c : r) { - if (c.getCellType() == Cell.CELL_TYPE_FORMULA){ + if (c.getCellType() == CellType.FORMULA){ eval.evaluateFormulaCell(c); } } diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java index b16645e8f6..ac6037b42c 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java @@ -318,7 +318,7 @@ public abstract class BaseTestSheetShiftRows { Row row = sheet.createRow(i); for (int j = 0; j < 10; j++) { - Cell cell = row.createCell(j, Cell.CELL_TYPE_STRING); + Cell cell = row.createCell(j, CellType.STRING); cell.setCellValue(i + "x" + j); } } diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java index 58919167fd..7bfc606ec3 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetUpdateArrayFormulas.java @@ -133,7 +133,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { for(Cell acell : cells){ assertTrue(acell.isPartOfArrayFormulaGroup()); - assertEquals(Cell.CELL_TYPE_FORMULA, acell.getCellType()); + assertEquals(CellType.FORMULA, acell.getCellType()); assertEquals("SUM(A1:A3*B1:B3)", acell.getCellFormula()); //retrieve the range and check it is the same assertEquals(range.formatAsString(), acell.getArrayFormulaRange().formatAsString()); @@ -210,7 +210,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { for(Cell acell : cr){ assertFalse(acell.isPartOfArrayFormulaGroup()); - assertEquals(Cell.CELL_TYPE_BLANK, acell.getCellType()); + assertEquals(CellType.BLANK, acell.getCellType()); } // cells C4:C6 are not included in array formula, @@ -279,7 +279,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { CellRange<? extends Cell> srange = sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5")); Cell scell = srange.getTopLeftCell(); - assertEquals(Cell.CELL_TYPE_FORMULA, scell.getCellType()); + assertEquals(CellType.FORMULA, scell.getCellType()); assertEquals(0.0, scell.getNumericCellValue(), 0); scell.setCellValue(1.1); assertEquals(1.1, scell.getNumericCellValue(), 0); @@ -288,7 +288,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { CellRange<? extends Cell> mrange = sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3")); for(Cell mcell : mrange){ - assertEquals(Cell.CELL_TYPE_FORMULA, mcell.getCellType()); + assertEquals(CellType.FORMULA, mcell.getCellType()); assertEquals(0.0, mcell.getNumericCellValue(), 0); double fmlaResult = 1.2; mcell.setCellValue(fmlaResult); @@ -307,10 +307,10 @@ public abstract class BaseTestSheetUpdateArrayFormulas { CellRange<? extends Cell> srange = sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5")); Cell scell = srange.getTopLeftCell(); - assertEquals(Cell.CELL_TYPE_FORMULA, scell.getCellType()); + assertEquals(CellType.FORMULA, scell.getCellType()); assertEquals(0.0, scell.getNumericCellValue(), 0); - scell.setCellType(Cell.CELL_TYPE_STRING); - assertEquals(Cell.CELL_TYPE_STRING, scell.getCellType()); + scell.setCellType(CellType.STRING); + assertEquals(CellType.STRING, scell.getCellType()); scell.setCellValue("string cell"); assertEquals("string cell", scell.getStringCellValue()); @@ -319,8 +319,8 @@ public abstract class BaseTestSheetUpdateArrayFormulas { sheet.setArrayFormula("A1:A3*B1:B3", CellRangeAddress.valueOf("C1:C3")); for(Cell mcell : mrange){ try { - assertEquals(Cell.CELL_TYPE_FORMULA, mcell.getCellType()); - mcell.setCellType(Cell.CELL_TYPE_NUMERIC); + assertEquals(CellType.FORMULA, mcell.getCellType()); + mcell.setCellType(CellType.NUMERIC); fail("expected exception"); } catch (IllegalStateException e){ CellReference ref = new CellReference(mcell); @@ -329,7 +329,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { } // a failed invocation of Cell.setCellType leaves the cell // in the state that it was in prior to the invocation - assertEquals(Cell.CELL_TYPE_FORMULA, mcell.getCellType()); + assertEquals(CellType.FORMULA, mcell.getCellType()); assertTrue(mcell.isPartOfArrayFormulaGroup()); } workbook.close(); @@ -344,13 +344,13 @@ public abstract class BaseTestSheetUpdateArrayFormulas { sheet.setArrayFormula("SUM(A4:A6,B4:B6)", CellRangeAddress.valueOf("B5")); Cell scell = srange.getTopLeftCell(); assertEquals("SUM(A4:A6,B4:B6)", scell.getCellFormula()); - assertEquals(Cell.CELL_TYPE_FORMULA, scell.getCellType()); + assertEquals(CellType.FORMULA, scell.getCellType()); assertTrue(scell.isPartOfArrayFormulaGroup()); scell.setCellFormula("SUM(A4,A6)"); //we are now a normal formula cell assertEquals("SUM(A4,A6)", scell.getCellFormula()); assertFalse(scell.isPartOfArrayFormulaGroup()); - assertEquals(Cell.CELL_TYPE_FORMULA, scell.getCellType()); + assertEquals(CellType.FORMULA, scell.getCellType()); //check that setting formula result works assertEquals(0.0, scell.getNumericCellValue(), 0); scell.setCellValue(33.0); @@ -396,7 +396,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { //re-create the removed cell scell = srow.createCell(cra.getFirstColumn()); - assertEquals(Cell.CELL_TYPE_BLANK, scell.getCellType()); + assertEquals(CellType.BLANK, scell.getCellType()); assertFalse(scell.isPartOfArrayFormulaGroup()); //we cannot remove cells included in a multi-cell array formula @@ -417,7 +417,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { // in the state that it was in prior to the invocation assertSame(mcell, mrow.getCell(columnIndex)); assertTrue(mcell.isPartOfArrayFormulaGroup()); - assertEquals(Cell.CELL_TYPE_FORMULA, mcell.getCellType()); + assertEquals(CellType.FORMULA, mcell.getCellType()); } workbook.close(); @@ -433,7 +433,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { CellRange<? extends Cell> srange = sheet.setArrayFormula("SUM(A4:A6,B4:B6)", cra); Cell scell = srange.getTopLeftCell(); - assertEquals(Cell.CELL_TYPE_FORMULA, scell.getCellType()); + assertEquals(CellType.FORMULA, scell.getCellType()); Row srow = scell.getRow(); assertSame(srow, sheet.getRow(cra.getFirstRow())); @@ -442,7 +442,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { //re-create the removed row and cell scell = sheet.createRow(cra.getFirstRow()).createCell(cra.getFirstColumn()); - assertEquals(Cell.CELL_TYPE_BLANK, scell.getCellType()); + assertEquals(CellType.BLANK, scell.getCellType()); assertFalse(scell.isPartOfArrayFormulaGroup()); //we cannot remove rows with cells included in a multi-cell array formula @@ -463,7 +463,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { assertSame(mrow, sheet.getRow(mrow.getRowNum())); assertSame(mcell, mrow.getCell(columnIndex)); assertTrue(mcell.isPartOfArrayFormulaGroup()); - assertEquals(Cell.CELL_TYPE_FORMULA, mcell.getCellType()); + assertEquals(CellType.FORMULA, mcell.getCellType()); } workbook.close(); @@ -481,7 +481,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { Cell scell = srange.getTopLeftCell(); sheet.addMergedRegion(CellRangeAddress.valueOf("B5:C6")); //we are still an array formula - assertEquals(Cell.CELL_TYPE_FORMULA, scell.getCellType()); + assertEquals(CellType.FORMULA, scell.getCellType()); assertTrue(scell.isPartOfArrayFormulaGroup()); assertEquals(1, sheet.getNumMergedRegions()); @@ -570,7 +570,7 @@ public abstract class BaseTestSheetUpdateArrayFormulas { assertEquals(cra.formatAsString(), mcell.getArrayFormulaRange().formatAsString()); assertEquals("A2:A4*B2:B4", mcell.getCellFormula()); assertTrue(mcell.isPartOfArrayFormulaGroup()); - assertEquals(Cell.CELL_TYPE_FORMULA, mcell.getCellType()); + assertEquals(CellType.FORMULA, mcell.getCellType()); } */ diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java b/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java index 95d173aa3e..c4903214a0 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java +++ b/src/testcases/org/apache/poi/ss/usermodel/TestDataFormatter.java @@ -583,7 +583,7 @@ public class TestDataFormatter { try { Sheet s = wb.createSheet(); Row r = s.createRow(0); - Cell c = r.createCell(0, Cell.CELL_TYPE_ERROR); + Cell c = r.createCell(0, CellType.ERROR); c.setCellErrorValue(FormulaError.DIV0.getCode()); assertEquals(FormulaError.DIV0.getString(), dfUS.formatCellValue(c)); diff --git a/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java b/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java index ee90ee6c5a..7a668b016d 100644 --- a/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java +++ b/src/testcases/org/apache/poi/ss/util/TestSheetBuilder.java @@ -19,13 +19,14 @@ package org.apache.poi.ss.util; import java.util.Date; -import junit.framework.TestCase; - -import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.ss.usermodel.Row; -import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; + +import junit.framework.TestCase; /** * Tests SheetBuilder. @@ -49,7 +50,7 @@ public final class TestSheetBuilder extends TestCase { Row firstRow = sheet.getRow(0); Cell firstCell = firstRow.getCell(0); - assertEquals(firstCell.getCellType(), Cell.CELL_TYPE_NUMERIC); + assertEquals(firstCell.getCellType(), CellType.NUMERIC); assertEquals(1.0, firstCell.getNumericCellValue(), 0.00001); @@ -58,11 +59,11 @@ public final class TestSheetBuilder extends TestCase { assertNull(secondRow.getCell(2)); Row thirdRow = sheet.getRow(2); - assertEquals(Cell.CELL_TYPE_STRING, thirdRow.getCell(0).getCellType()); + assertEquals(CellType.STRING, thirdRow.getCell(0).getCellType()); String cellValue = thirdRow.getCell(0).getStringCellValue(); assertEquals(testData[2][0].toString(), cellValue); - assertEquals(Cell.CELL_TYPE_FORMULA, thirdRow.getCell(2).getCellType()); + assertEquals(CellType.FORMULA, thirdRow.getCell(2).getCellType()); assertEquals("A1+B2", thirdRow.getCell(2).getCellFormula()); } @@ -72,7 +73,7 @@ public final class TestSheetBuilder extends TestCase { Cell emptyCell = sheet.getRow(1).getCell(1); assertNotNull(emptyCell); - assertEquals(Cell.CELL_TYPE_BLANK, emptyCell.getCellType()); + assertEquals(CellType.BLANK, emptyCell.getCellType()); } public void testSheetName() { |