change CellValue#getCellType() to return an int instead of an enum for backwards compatibility (source and binary) with POI 3.14. This reverts the behavior introduced in POI 3.15 beta 3 in r1751237.

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

22 files changed, 54 insertions, 54 deletions

diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
index 53f5f4ac75..291b3a5000 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
@@ -99,7 +99,7 @@ public final class TestFormulaParserEval extends TestCase {
 			}
 			throw e;
 		}
-		assertEquals(CellType.NUMERIC, result.getCellType());
+		assertEquals(CellType.NUMERIC, result.getCellTypeEnum());
 		assertEquals(42.0, result.getNumberValue(), 0.0);
 	}
 }
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java b/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
index bf7b813d0a..b61f9ed67d 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestSharedFormulaRecord.java
@@ -228,7 +228,7 @@ public final class TestSharedFormulaRecord extends TestCase {
     private static void confirmCellEvaluation(HSSFWorkbook wb, HSSFCell cell, double expectedValue) {
         HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
         CellValue cv = fe.evaluate(cell);
-        assertEquals(CellType.NUMERIC, cv.getCellType());
+        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
         assertEquals(expectedValue, cv.getNumberValue(), 0.0);
     }
 
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
index 4c762fa900..d8987496f8 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
@@ -55,7 +55,7 @@ public final class TestHSSFFormulaEvaluator extends BaseTestFormulaEvaluator {
 		HSSFCell cell = sheet.getRow(8).getCell(0);
 		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
 		CellValue cv = fe.evaluate(cell);
-		assertEquals(CellType.NUMERIC, cv.getCellType());
+		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
 		assertEquals(3.72, cv.getNumberValue(), 0.0);
 		wb.close();
 	}
@@ -127,7 +127,7 @@ public final class TestHSSFFormulaEvaluator extends BaseTestFormulaEvaluator {
 		try {
 			value = hsf.evaluate(cellA1);
 
-	        assertEquals(CellType.NUMERIC, value.getCellType());
+	        assertEquals(CellType.NUMERIC, value.getCellTypeEnum());
 	        assertEquals(5.33, value.getNumberValue(), 0.0);
 	        
 		} catch (RuntimeException e) {
diff --git a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
index c97face949..7c89363626 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
+++ b/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
@@ -203,7 +203,7 @@ public class TestWorkbookEvaluator {
         } catch (RuntimeException e) {
             fail("Missing arg result not being handled correctly.");
         }
-        assertEquals(CellType.NUMERIC, cv.getCellType());
+        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
         // adding blank to 1.0 gives 1.0
         assertEquals(1.0, cv.getNumberValue(), 0.0);
 
@@ -211,7 +211,7 @@ public class TestWorkbookEvaluator {
         cell.setCellFormula("\"abc\"&IF(1,,)");
         fe.notifySetFormula(cell);
         cv = fe.evaluate(cell);
-        assertEquals(CellType.STRING, cv.getCellType());
+        assertEquals(CellType.STRING, cv.getCellTypeEnum());
         // adding blank to "abc" gives "abc"
         assertEquals("abc", cv.getStringValue());
 
@@ -219,7 +219,7 @@ public class TestWorkbookEvaluator {
         cell.setCellFormula("\"abc\"&CHOOSE(2,5,,9)");
         fe.notifySetFormula(cell);
         cv = fe.evaluate(cell);
-        assertEquals(CellType.STRING, cv.getCellType());
+        assertEquals(CellType.STRING, cv.getCellTypeEnum());
         // adding blank to "abc" gives "abc"
         assertEquals("abc", cv.getStringValue());
     }
@@ -245,14 +245,14 @@ public class TestWorkbookEvaluator {
                 }
                 throw new RuntimeException(e);
             }
-            assertEquals(CellType.ERROR, cv.getCellType());
+            assertEquals(CellType.ERROR, cv.getCellTypeEnum());
             assertEquals(ErrorEval.VALUE_INVALID.getErrorCode(), cv.getErrorValue());
 
             // verify circular refs are still detected properly
             fe.clearAllCachedResultValues();
             cell.setCellFormula("OFFSET(A1,0,0)");
             cv = fe.evaluate(cell);
-            assertEquals(CellType.ERROR, cv.getCellType());
+            assertEquals(CellType.ERROR, cv.getCellTypeEnum());
             assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cv.getErrorValue());
         } finally {
             wb.close();
@@ -396,7 +396,7 @@ public class TestWorkbookEvaluator {
         assertEquals(CellType.FORMULA, D1.getCellTypeEnum());
         assertEquals(expectedFormula, D1.getCellFormula());
         
-        assertEquals(CellType.NUMERIC, result.getCellType());
+        assertEquals(CellType.NUMERIC, result.getCellTypeEnum());
         assertEquals(expectedResult, result.getNumberValue(), EPSILON);
         
         testIFEqualsFormulaEvaluation_teardown(wb);
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 1d956c76fa..ebf6951f01 100644
--- a/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
+++ b/src/testcases/org/apache/poi/ss/formula/atp/TestIfError.java
@@ -78,18 +78,18 @@ public class TestIfError extends TestCase {
         FormulaEvaluator evaluator = wb.getCreationHelper().createFormulaEvaluator();
 
         assertEquals("Checks that the cell is numeric",
-        		CellType.NUMERIC, evaluator.evaluate(cell1).getCellType());
+        		CellType.NUMERIC, evaluator.evaluate(cell1).getCellTypeEnum());
         assertEquals("Divides 210 by 35 and returns 6.0",
                 6.0, evaluator.evaluate(cell1).getNumberValue(), accuracy);
         
         
         assertEquals("Checks that the cell is numeric",
-        		CellType.STRING, evaluator.evaluate(cell2).getCellType());        
+        		CellType.STRING, evaluator.evaluate(cell2).getCellTypeEnum());        
         assertEquals("Rounds -10 to a nearest multiple of -3 (-9)",
                 "Error in calculation", evaluator.evaluate(cell2).getStringValue());
         
         assertEquals("Check that C1 returns string", 
-        		CellType.STRING, evaluator.evaluate(cell3).getCellType());
+        		CellType.STRING, evaluator.evaluate(cell3).getCellTypeEnum());
         assertEquals("Check that C1 returns string \"error\"", 
         		"error", evaluator.evaluate(cell3).getStringValue());
     }
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 4c0223afd7..ec3aa9107d 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
+++ b/src/testcases/org/apache/poi/ss/formula/eval/BaseTestCircularReferences.java
@@ -66,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() == CellType.ERROR);
+        assertTrue(cellValue.getCellTypeEnum() == CellType.ERROR);
         assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cellValue.getErrorValue());
     }
 
@@ -96,7 +96,7 @@ public abstract class BaseTestCircularReferences {
 
         CellValue cellValue = evaluateWithCycles(wb, testCell);
 
-        assertTrue(cellValue.getCellType() == CellType.NUMERIC);
+        assertTrue(cellValue.getCellTypeEnum() == CellType.NUMERIC);
         assertEquals(2, cellValue.getNumberValue(), 0);
         wb.close();
     }
@@ -166,24 +166,24 @@ public abstract class BaseTestCircularReferences {
 
         // Happy day flow - evaluate A1 first
         cv = fe.evaluate(cellA1);
-        assertEquals(CellType.NUMERIC, cv.getCellType());
+        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
         assertEquals(42.0, cv.getNumberValue(), 0.0);
         cv = fe.evaluate(cellB1); // no circ-ref-error because A1 result is cached
-        assertEquals(CellType.NUMERIC, cv.getCellType());
+        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
         assertEquals(46.0, cv.getNumberValue(), 0.0);
 
         // Show the bug - evaluate another cell from the loop first
         fe.clearAllCachedResultValues();
         cv = fe.evaluate(cellB1);
         // Identified bug 46898
-        assertNotEquals(cv.getCellType(), ErrorEval.CIRCULAR_REF_ERROR.getErrorCode());
-        assertEquals(CellType.NUMERIC, cv.getCellType());
+        assertNotEquals(cv.getCellTypeEnum(), ErrorEval.CIRCULAR_REF_ERROR.getErrorCode());
+        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
         assertEquals(46.0, cv.getNumberValue(), 0.0);
 
         // start evaluation on another cell
         fe.clearAllCachedResultValues();
         cv = fe.evaluate(cellE1);
-        assertEquals(CellType.NUMERIC, cv.getCellType());
+        assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
         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 561ce4bfda..98fe73169f 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(CellType.NUMERIC, cv.getCellType());
+		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
 		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(CellType.NUMERIC, cv.getCellType());
+		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
 		assertEquals(1.0, cv.getNumberValue(), 0.0);
 		
 		cv = fe.evaluate(row.getCell(1));
-		assertEquals(CellType.BOOLEAN, cv.getCellType());
+		assertEquals(CellType.BOOLEAN, cv.getCellTypeEnum());
 		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(CellType.NUMERIC, cv.getCellType());
+		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
 		assertEquals(expectedResult, cv.getNumberValue(), 0.0);
 
 		wb.close();
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
index fb3b6a9288..9ce0488f9e 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java
@@ -190,24 +190,24 @@ public final class TestFormulasFromSpreadsheet {
            final CellType cellType = expValue.getCellTypeEnum();
            switch (cellType) {
                case BLANK:
-                   assertEquals(msg, CellType.BLANK, actValue.getCellType());
+                   assertEquals(msg, CellType.BLANK, actValue.getCellTypeEnum());
                    break;
                case BOOLEAN:
-                   assertEquals(msg, CellType.BOOLEAN, actValue.getCellType());
+                   assertEquals(msg, CellType.BOOLEAN, actValue.getCellTypeEnum());
                    assertEquals(msg, expValue.getBooleanCellValue(), actValue.getBooleanValue());
                    break;
                case ERROR:
-                   assertEquals(msg, CellType.ERROR, actValue.getCellType());
+                   assertEquals(msg, CellType.ERROR, actValue.getCellTypeEnum());
                    assertEquals(msg, ErrorEval.getText(expValue.getErrorCellValue()), ErrorEval.getText(actValue.getErrorValue()));
                    break;
                case FORMULA: // will never be used, since we will call method after formula evaluation
                    fail("Cannot expect formula as result of formula evaluation: " + msg);
                case NUMERIC:
-                   assertEquals(msg, CellType.NUMERIC, actValue.getCellType());
+                   assertEquals(msg, CellType.NUMERIC, actValue.getCellTypeEnum());
                    TestMathX.assertEquals(msg, expValue.getNumericCellValue(), actValue.getNumberValue(), TestMathX.POS_ZERO, TestMathX.DIFF_TOLERANCE_FACTOR);
                    break;
                case STRING:
-                   assertEquals(msg, CellType.STRING, actValue.getCellType());
+                   assertEquals(msg, CellType.STRING, actValue.getCellTypeEnum());
                    assertEquals(msg, expValue.getRichStringCellValue().getString(), actValue.getStringValue());
                    break;
                default:
diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java b/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
index 429f5616e3..b1b66c00da 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
+++ b/src/testcases/org/apache/poi/ss/formula/eval/TestMultiSheetEval.java
@@ -110,24 +110,24 @@ public final class TestMultiSheetEval extends TestCase {
 
 		switch (cellType) {
 			case BLANK:
-				assertEquals(msg, CellType.BLANK, actual.getCellType());
+				assertEquals(msg, CellType.BLANK, actual.getCellTypeEnum());
 				break;
 			case BOOLEAN:
-				assertEquals(msg, CellType.BOOLEAN, actual.getCellType());
+				assertEquals(msg, CellType.BOOLEAN, actual.getCellTypeEnum());
 				assertEquals(msg, expected.getBooleanCellValue(), actual.getBooleanValue());
 				break;
 			case ERROR:
-				assertEquals(msg, CellType.ERROR, actual.getCellType());
+				assertEquals(msg, CellType.ERROR, actual.getCellTypeEnum());
 				assertEquals(msg, ErrorEval.getText(expected.getErrorCellValue()), ErrorEval.getText(actual.getErrorValue()));
 				break;
 			case FORMULA: // will never be used, since we will call method after formula evaluation
 				throw new AssertionFailedError("Cannot expect formula as result of formula evaluation: " + msg);
 			case NUMERIC:
-				assertEquals(msg, CellType.NUMERIC, actual.getCellType());
+				assertEquals(msg, CellType.NUMERIC, actual.getCellTypeEnum());
 				TestMathX.assertEquals(msg, expected.getNumericCellValue(), actual.getNumberValue(), TestMathX.POS_ZERO, TestMathX.DIFF_TOLERANCE_FACTOR);
 				break;
 			case STRING:
-				assertEquals(msg, CellType.STRING, actual.getCellType());
+				assertEquals(msg, CellType.STRING, actual.getCellTypeEnum());
 				assertEquals(msg, expected.getRichStringCellValue().getString(), actual.getStringValue());
 				break;
 			default:
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 c3a5eec233..71cf649dd8 100644
--- a/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
+++ b/src/testcases/org/apache/poi/ss/formula/eval/TestPercentEval.java
@@ -78,7 +78,7 @@ public final class TestPercentEval extends TestCase {
 			// else some other unexpected error
 			throw e;
 		}
-		assertEquals(CellType.NUMERIC, cv.getCellType());
+		assertEquals(CellType.NUMERIC, cv.getCellTypeEnum());
 		assertEquals(0.5, cv.getNumberValue(), 0.0);
 	}
 }
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
index 8c40581e4a..e32f3e05bf 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java
@@ -155,7 +155,7 @@ public abstract class BaseTestFunctionsFromSpreadsheet {
 

         if (expectedCell.getCellTypeEnum() == CellType.ERROR) {

             int expectedErrorCode = expectedCell.getErrorCellValue();

-            assertEquals(msg, CellType.ERROR, actualValue.getCellType());

+            assertEquals(msg, CellType.ERROR, actualValue.getCellTypeEnum());

             assertEquals(msg, ErrorEval.getText(expectedErrorCode), actualValue.formatAsString());

             assertEquals(msg, expectedErrorCode, actualValue.getErrorValue());

             assertEquals(msg, ErrorEval.getText(expectedErrorCode), ErrorEval.getText(actualValue.getErrorValue()));

@@ -163,11 +163,11 @@ public abstract class BaseTestFunctionsFromSpreadsheet {
         }

 

         // unexpected error

-        assertNotEquals(msg, CellType.ERROR, actualValue.getCellType());

+        assertNotEquals(msg, CellType.ERROR, actualValue.getCellTypeEnum());

         assertNotEquals(msg, formatValue(expectedCell), ErrorEval.getText(actualValue.getErrorValue()));

 

         // wrong type error

-        assertEquals(msg, expectedCell.getCellTypeEnum(), actualValue.getCellType());

+        assertEquals(msg, expectedCell.getCellTypeEnum(), actualValue.getCellTypeEnum());

 

         final CellType expectedCellType = expectedCell.getCellTypeEnum();

         switch (expectedCellType) {

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 8f3951aa91..84c1778f35 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestAddress.java
@@ -73,7 +73,7 @@ public final class TestAddress extends TestCase {
         cell.setCellFormula(formulaText);

         fe.notifyUpdateCell(cell);

         CellValue result = fe.evaluate(cell);

-        assertEquals(result.getCellType(), CellType.STRING);

+        assertEquals(result.getCellTypeEnum(), 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 3f88237293..337ad8518f 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestCalendarFieldFunction.java
@@ -103,7 +103,7 @@ public final class TestCalendarFieldFunction extends TestCase {
         cell11.setCellFormula(formulaText);
         evaluator.clearAllCachedResultValues();
         CellValue cv = evaluator.evaluate(cell11);
-        if (cv.getCellType() != CellType.NUMERIC) {
+        if (cv.getCellTypeEnum() != 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 fe6c6a6ed5..e0137aee47 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestClean.java
@@ -60,7 +60,7 @@ public final class TestClean extends TestCase {
         cell.setCellFormula(formulaText);

         fe.notifyUpdateCell(cell);

         CellValue result = fe.evaluate(cell);

-        assertEquals(result.getCellType(), CellType.STRING);

+        assertEquals(result.getCellTypeEnum(), CellType.STRING);

         assertEquals(expectedResult, result.getStringValue());

     }

 }

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 db0f6b0805..0051f72e7c 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestDate.java
@@ -81,7 +81,7 @@ public final class TestDate extends TestCase {
         cell11.setCellFormula(formulaText);
         evaluator.clearAllCachedResultValues();
         CellValue cv = evaluator.evaluate(cell11);
-        if (cv.getCellType() != CellType.NUMERIC) {
+        if (cv.getCellTypeEnum() != 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 0bfff626af..5ac75d62ad 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFind.java
@@ -66,7 +66,7 @@ public final class TestFind {
 		cell.setCellFormula(formulaText);
 		fe.notifyUpdateCell(cell);
 		CellValue result = fe.evaluate(cell);
-		assertEquals(result.getCellType(), CellType.NUMERIC);
+		assertEquals(result.getCellTypeEnum(), CellType.NUMERIC);
 		assertEquals(expectedResult, result.getNumberValue(), 0.0);
 	}
 
@@ -75,7 +75,7 @@ public final class TestFind {
 		cell.setCellFormula(formulaText);
 		fe.notifyUpdateCell(cell);
 		CellValue result = fe.evaluate(cell);
-		assertEquals(result.getCellType(), CellType.ERROR);
+		assertEquals(result.getCellTypeEnum(), 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 e14ea3c45b..f6e1f38093 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
@@ -117,7 +117,7 @@ public final class TestFixed {
         cell11.setCellFormula(formulaText);
         evaluator.clearAllCachedResultValues();
         CellValue cv = evaluator.evaluate(cell11);
-        assertEquals("Wrong result type: " + cv.formatAsString(), CellType.STRING, cv.getCellType());
+        assertEquals("Wrong result type: " + cv.formatAsString(), CellType.STRING, cv.getCellTypeEnum());
         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() == CellType.ERROR
+                cv.getCellTypeEnum() == 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 ea5ac9c7aa..99d370bd68 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIndirect.java
@@ -185,7 +185,7 @@ public final class TestIndirect {
         fe.clearAllCachedResultValues();
         cell.setCellFormula(formula);
         CellValue cv = fe.evaluate(cell);
-        if (cv.getCellType() != CellType.NUMERIC) {
+        if (cv.getCellTypeEnum() != CellType.NUMERIC) {
             fail("expected numeric cell type but got " + cv.formatAsString());
         }
         assertEquals(expectedResult, cv.getNumberValue(), 0.0);
@@ -196,7 +196,7 @@ public final class TestIndirect {
         fe.clearAllCachedResultValues();
         cell.setCellFormula(formula);
         CellValue cv = fe.evaluate(cell);
-        if (cv.getCellType() != CellType.ERROR) {
+        if (cv.getCellTypeEnum() != 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 2fb108eadc..40fac0dea6 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIrr.java
@@ -128,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(), CellType.NUMERIC, cv.getCellType());
+        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());
         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 51b80876ec..e723711cce 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestIsBlank.java
@@ -47,13 +47,13 @@ public final class TestIsBlank extends TestCase {
         
         HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
         CellValue result = fe.evaluate(cell);
-        assertEquals(CellType.BOOLEAN, result.getCellType());
+        assertEquals(CellType.BOOLEAN, result.getCellTypeEnum());
         assertEquals(true, result.getBooleanValue());
         
         cell.setCellFormula("isblank(D7:D7)");
         
         result = fe.evaluate(cell);
-        assertEquals(CellType.BOOLEAN, result.getCellType());
+        assertEquals(CellType.BOOLEAN, result.getCellTypeEnum());
         assertEquals(true, result.getBooleanValue());
    }
 }
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 fc4c3c9275..6a925511f1 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
@@ -162,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(), CellType.NUMERIC, cv.getCellType());

+        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());

         assertEquals(expectedValue, actualValue, 1E-8);

     }

 }

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index bdd09bfd6c..f9725ba8ae 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
@@ -1133,8 +1133,8 @@ public abstract class BaseTestBugzillaIssues {
         cfs.setCellFormula("B1");
 
         FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
-        assertEquals(CellType.NUMERIC, fe.evaluate(cfn).getCellType());
-        assertEquals(CellType.STRING, fe.evaluate(cfs).getCellType());
+        assertEquals(CellType.NUMERIC, fe.evaluate(cfn).getCellTypeEnum());
+        assertEquals(CellType.STRING, fe.evaluate(cfs).getCellTypeEnum());
         fe.evaluateFormulaCellEnum(cfn);
         fe.evaluateFormulaCellEnum(cfs);