bug 59791: FormulaEvaluator#evaluateFormulaCell(Cell) should return an integer for backwards compatibility

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751261 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 13 insertions, 13 deletions

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 1ddf81ef52..51bbdf0981 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestRandBetween.java
@@ -66,11 +66,11 @@ public class TestRandBetween extends TestCase {
 		
 		evaluator.clearAllCachedResultValues();
 		formulaCell.setCellFormula("RANDBETWEEN(1,1)");
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(1, formulaCell.getNumericCellValue(), 0);
 		evaluator.clearAllCachedResultValues();
 		formulaCell.setCellFormula("RANDBETWEEN(-1,-1)");
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(-1, formulaCell.getNumericCellValue(), 0);
 
 	}
@@ -86,25 +86,25 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellValue(0.1);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(1, formulaCell.getNumericCellValue(), 0);
 		bottomValueCell.setCellValue(-0.1);		
 		topValueCell.setCellValue(-0.05);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(0, formulaCell.getNumericCellValue(), 0);
 		bottomValueCell.setCellValue(-1.1);		
 		topValueCell.setCellValue(-1.05);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(-1, formulaCell.getNumericCellValue(), 0);
 		bottomValueCell.setCellValue(-1.1);		
 		topValueCell.setCellValue(-1.1);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(-1, formulaCell.getNumericCellValue(), 0);
 	}
 	
@@ -117,7 +117,7 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellType(CellType.BLANK);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertTrue(formulaCell.getNumericCellValue() == 0 || formulaCell.getNumericCellValue() == -1);
 	
 	}
@@ -130,7 +130,7 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellValue(1);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
 		assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue());
 		
@@ -140,7 +140,7 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellValue("STRING");		
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
 		assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue());
 
@@ -149,7 +149,7 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellValue("STRING");		
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
 		assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), formulaCell.getErrorCellValue());
 	
@@ -165,14 +165,14 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellValue(0);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
 		assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), formulaCell.getErrorCellValue());		
 		bottomValueCell.setCellValue(1);		
 		topValueCell.setCellType(CellType.BLANK);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertEquals(CellType.ERROR, formulaCell.getCachedFormulaResultTypeEnum());
 		assertEquals(ErrorEval.NUM_ERROR.getErrorCode(), formulaCell.getErrorCellValue());
 	}
@@ -186,7 +186,7 @@ public class TestRandBetween extends TestCase {
 		topValueCell.setCellValue(Double.MAX_VALUE);
 		formulaCell.setCellFormula("RANDBETWEEN($A$1,$B$1)");
 		evaluator.clearAllCachedResultValues();
-		evaluator.evaluateFormulaCell(formulaCell);
+		evaluator.evaluateFormulaCellEnum(formulaCell);
 		assertTrue(formulaCell.getNumericCellValue() >= Double.MIN_VALUE && formulaCell.getNumericCellValue() <= Double.MAX_VALUE);		
 		
 	}