change CellValue#getCellType() to return an int instead of an enum for backwards...

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

diff --git a/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java b/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
index 8d7d781f9af58cdb35b3369c2640120789772559..a0a932d0726b42d8c6aeed1a2ab4bdca9017c7f3 100644 (file)
--- a/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
+++ b/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
@@ -163,7 +163,7 @@ public class HSSFFormulaEvaluator extends BaseFormulaEvaluator {
         CellValue cv = evaluateFormulaCellValue(cell);
         // cell remains a formula cell, but the cached value is changed
         setCellValue(cell, cv);
-        return cv.getCellType();
+        return cv.getCellTypeEnum();
     }
 
     /**
@@ -196,7 +196,7 @@ public class HSSFFormulaEvaluator extends BaseFormulaEvaluator {
     }
 
     private static void setCellValue(Cell cell, CellValue cv) {
-        CellType cellType = cv.getCellType();
+        CellType cellType = cv.getCellTypeEnum();
         switch (cellType) {
             case BOOLEAN:
                 cell.setCellValue(cv.getBooleanValue());

diff --git a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
index 8746ba7fa06d431ea2605793dcb48c1a698384a9..fb0c4d68dee48a5d5aa2ba952b88aa68502ec748 100644 (file)
--- a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
+++ b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java
@@ -132,7 +132,7 @@ public abstract class BaseFormulaEvaluator implements FormulaEvaluator, Workbook
     }
 
     protected static void setCellType(Cell cell, CellValue cv) {
-        CellType cellType = cv.getCellType();
+        CellType cellType = cv.getCellTypeEnum();
         switch (cellType) {
             case BOOLEAN:
             case ERROR:

diff --git a/src/java/org/apache/poi/ss/usermodel/CellValue.java b/src/java/org/apache/poi/ss/usermodel/CellValue.java
index 52fea225abc017a0b9ac46df2b02cd14d3ea6a55..301accfca8e2f7a0c0e27a11fec5307660735b12 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/CellValue.java
+++ b/src/java/org/apache/poi/ss/usermodel/CellValue.java
@@ -78,10 +78,22 @@ public final class CellValue {
        }
        /**
         * @return Returns the cellType.
+        * @since POI 3.15
         */
-       public CellType getCellType() {
+       public CellType getCellTypeEnum() {
                return _cellType;
        }
+       /**
+        * @return Returns the cellType.
+        * @deprecated POI 3.15. Use {@link #getCellTypeEnum()} instead.
+        * In the future, the signature of this method will be changed to return a
+        * {@link CellType}.
+        */
+       @Deprecated
+       public int getCellType() {
+               return _cellType.getCode();
+       }
+
        /**
         * @return Returns the errorValue.
         */

diff --git a/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java b/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java
index 3bf891e0a9ca2ced7d01c4ab924881a77dad357c..75e7fd9a814a6047f88b1d158c1f80d34b198df1 100644 (file)
--- a/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java
+++ b/src/java/org/apache/poi/ss/usermodel/charts/DataSources.java
@@ -42,7 +42,7 @@ public class DataSources {
         return new AbstractCellRangeDataSource<Number>(sheet, cellRangeAddress) {
             public Number getPointAt(int index) {
                 CellValue cellValue = getCellValueAt(index);
-                if (cellValue != null && cellValue.getCellType() == CellType.NUMERIC) {
+                if (cellValue != null && cellValue.getCellTypeEnum() == CellType.NUMERIC) {
                     return Double.valueOf(cellValue.getNumberValue());
                 } else {
                     return null;
@@ -59,7 +59,7 @@ public class DataSources {
         return new AbstractCellRangeDataSource<String>(sheet, cellRangeAddress) {
             public String getPointAt(int index) {
                 CellValue cellValue = getCellValueAt(index);
-                if (cellValue != null && cellValue.getCellType() == CellType.STRING) {
+                if (cellValue != null && cellValue.getCellTypeEnum() == CellType.STRING) {
                     return cellValue.getStringValue();
                 } else {
                     return null;

diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
index c6c030b957416432865aa8e4977430c538a89238..726ae87e4b2a621f032342901772442986e7439d 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/BaseXSSFFormulaEvaluator.java
@@ -77,7 +77,7 @@ public abstract class BaseXSSFFormulaEvaluator extends BaseFormulaEvaluator {
         CellValue cv = evaluateFormulaCellValue(cell);
         // cell remains a formula cell, but the cached value is changed
         setCellValue(cell, cv);
-        return cv.getCellType();
+        return cv.getCellTypeEnum();
     }
 
     /**
@@ -97,7 +97,7 @@ public abstract class BaseXSSFFormulaEvaluator extends BaseFormulaEvaluator {
     }
 
     private static void setCellValue(Cell cell, CellValue cv) {
-        CellType cellType = cv.getCellType();
+        CellType cellType = cv.getCellTypeEnum();
         switch (cellType) {
             case BOOLEAN:
                 cell.setCellValue(cv.getBooleanValue());

diff --git a/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java b/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
index 4e176257f6eeeaf52895e70e1dcfbde138e5c232..b60664ad021c79b81eef9bb0a1b8ada4f9db3846 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/formula/TestStructuredReferences.java
@@ -110,7 +110,7 @@ public class TestStructuredReferences {
     private static void confirm(FormulaEvaluator fe, Cell cell, double expectedResult) {
         fe.clearAllCachedResultValues();
         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);
@@ -119,7 +119,7 @@ public class TestStructuredReferences {
     private static void confirm(FormulaEvaluator fe, Cell cell, String expectedResult) {
         fe.clearAllCachedResultValues();
         CellValue cv = fe.evaluate(cell);
-        if (cv.getCellType() != CellType.STRING) {
+        if (cv.getCellTypeEnum() != CellType.STRING) {
             fail("expected String cell type but got " + cv.formatAsString());
         }
         assertEquals(expectedResult, cv.getStringValue());

diff --git a/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java b/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
index d86079eca5e2bd12418007b1e24b5af759c19f61..a24fd88795cc90debfcce6451b4151de6974c867 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/formula/functions/TestProper.java
@@ -96,7 +96,7 @@ public final class TestProper {
         cell11.setCellFormula(formulaText);
         evaluator.clearAllCachedResultValues();
         CellValue cv = evaluator.evaluate(cell11);
-        if (cv.getCellType() != CellType.STRING) {
+        if (cv.getCellTypeEnum() != CellType.STRING) {
             throw new AssertionFailedError("Wrong result type: " + cv.formatAsString());
         }
         String actualValue = cv.getStringValue();

diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
index 4cbc7c4e61c4cfa6caef1ece622d9344b4c6249d..ad8b49028d5d60b6302b7c72b37f241122170882 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestFormulaEvaluatorOnXSSF.java
@@ -205,14 +205,14 @@ public final class TestFormulaEvaluatorOnXSSF {
                final CellType expectedCellType = expValue.getCellTypeEnum();
                switch (expectedCellType) {
                    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());
 //                   if(false) { // TODO: fix ~45 functions which are currently returning incorrect error values
 //                       assertEquals(msg, expValue.getErrorCellValue(), actValue.getErrorValue());
 //                   }
@@ -220,14 +220,14 @@ public final class TestFormulaEvaluatorOnXSSF {
                    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);
 //                   double delta = Math.abs(expValue.getNumericCellValue()-actValue.getNumberValue());
 //                   double pctExpValue = Math.abs(0.00001*expValue.getNumericCellValue());
 //                   assertTrue(msg, delta <= pctExpValue);
                        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/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
index f33d96e637ed8ae2889325ae3727c385e2bc4897..b8926a3cf53fbddee00276c95946d9f85eb8a429 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestMultiSheetFormulaEvaluatorOnXSSF.java
@@ -188,14 +188,14 @@ public final class TestMultiSheetFormulaEvaluatorOnXSSF {
         final CellType expectedCellType = expValue.getCellTypeEnum();
         switch (expectedCellType) {
             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());
 //              if(false) { // TODO: fix ~45 functions which are currently returning incorrect error values
 //                  assertEquals(msg, expected.getErrorCellValue(), actual.getErrorValue());
 //              }
@@ -203,14 +203,14 @@ public final class TestMultiSheetFormulaEvaluatorOnXSSF {
             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);
 //              double delta = Math.abs(expected.getNumericCellValue()-actual.getNumberValue());
 //              double pctExpected = Math.abs(0.00001*expected.getNumericCellValue());
 //              assertTrue(msg, delta <= pctExpected);
                 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/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 2be21e830cc36665b4aa995a9fa1dd8291168e86..e695f385f9babe1498f0ebaca3a01e94bdb4e26a 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -304,7 +304,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
                         if(c.getCellTypeEnum() == CellType.FORMULA) {
                             CellValue cv = eval.evaluate(c);
 
-                            if(cv.getCellType() == CellType.NUMERIC) {
+                            if(cv.getCellTypeEnum() == CellType.NUMERIC) {
                                 // assert that the calculated value agrees with
                                 // the cached formula result calculated by Excel
                                 String formula = c.getCellFormula();
@@ -2187,7 +2187,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
         assertEquals("E4+E5", cell.getCellFormula());
 
         CellValue value = evaluator.evaluate(cell);
-        assertEquals(CellType.ERROR, value.getCellType());
+        assertEquals(CellType.ERROR, value.getCellTypeEnum());
         assertEquals(-60, value.getErrorValue());
         assertEquals("~CIRCULAR~REF~", FormulaError.forInt(value.getErrorValue()).getString());
         assertEquals("CIRCULAR_REF", FormulaError.forInt(value.getErrorValue()).toString());

diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParserEval.java
index 53f5f4ac75660818dc2505a96efe8bd0adee87f9..291b3a50008e9fa8a96b339ef28a31e62f15b793 100644 (file)
--- 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 bf7b813d0a0e429fb00ac385dfd5401237af5046..b61f9ed67dd281152ee94ca4e4b3d07cdd23e8f4 100644 (file)
--- 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 4c762fa9008913a2968d3b186859390a4ee8e15f..d8987496f80127d5f27fde5d8cd494c8ef4d0dbf 100644 (file)
--- 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 c97face949da510f62e470092ff111440bd95a57..7c89363626f5067b95c6b4d27a86f7eab064e060 100644 (file)
--- 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 1d956c76fa9dc13143a7a47a9e160f98c4f19d46..ebf6951f01356a5ddbe8b9fa7040dc2e6d0d1639 100644 (file)
--- 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 4c0223afd7f05c0562b3197c13f62e544a045c94..ec3aa9107dba57fbd410a9f4b30481237afc48c9 100644 (file)
--- 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 561ce4bfda4972eaf217f0c2768ec0fc97b0442b..98fe73169fb7dfa27bddaf61cbc563e5ba732daa 100644 (file)
--- 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 fb3b6a9288cb9d3fdbfd4b22240c7fd7b8a59d2a..9ce0488f9e2356f56be7a11c4957b5ad3788e56a 100644 (file)
--- 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 429f5616e3a958915d62370c0c7f9d5bcd584391..b1b66c00da060d3316a4f375390a3eb8a9b13539 100644 (file)
--- 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 c3a5eec233ceb8f14aceef028302d92f5727fdb5..71cf649dd8e3dfd8e1178eacb3e4e67ea264f2b3 100644 (file)
--- 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 8c40581e4aff4cbb52cee2c0f8122bba7c2f48e5..e32f3e05bf5baced56792db2e83cfd4e1504cbb3 100644 (file)
--- 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 {
 \r
         if (expectedCell.getCellTypeEnum() == CellType.ERROR) {\r
             int expectedErrorCode = expectedCell.getErrorCellValue();\r
-            assertEquals(msg, CellType.ERROR, actualValue.getCellType());\r
+            assertEquals(msg, CellType.ERROR, actualValue.getCellTypeEnum());\r
             assertEquals(msg, ErrorEval.getText(expectedErrorCode), actualValue.formatAsString());\r
             assertEquals(msg, expectedErrorCode, actualValue.getErrorValue());\r
             assertEquals(msg, ErrorEval.getText(expectedErrorCode), ErrorEval.getText(actualValue.getErrorValue()));\r
@@ -163,11 +163,11 @@ public abstract class BaseTestFunctionsFromSpreadsheet {
         }\r
 \r
         // unexpected error\r
-        assertNotEquals(msg, CellType.ERROR, actualValue.getCellType());\r
+        assertNotEquals(msg, CellType.ERROR, actualValue.getCellTypeEnum());\r
         assertNotEquals(msg, formatValue(expectedCell), ErrorEval.getText(actualValue.getErrorValue()));\r
 \r
         // wrong type error\r
-        assertEquals(msg, expectedCell.getCellTypeEnum(), actualValue.getCellType());\r
+        assertEquals(msg, expectedCell.getCellTypeEnum(), actualValue.getCellTypeEnum());\r
 \r
         final CellType expectedCellType = expectedCell.getCellTypeEnum();\r
         switch (expectedCellType) {\r

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 8f3951aa911d8e851210ba0c674216253d41bcd6..84c1778f3501622f2de4f750ac0f7384e44fe6f4 100644 (file)
--- 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);\r
         fe.notifyUpdateCell(cell);\r
         CellValue result = fe.evaluate(cell);\r
-        assertEquals(result.getCellType(), CellType.STRING);\r
+        assertEquals(result.getCellTypeEnum(), CellType.STRING);\r
         assertEquals(expectedResult, result.getStringValue());\r
     }\r
 }\r

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 3f88237293a5e3e888a73d213938fb87d52144a2..337ad8518f8129b5b05d7ccfc69ae327eff3d600 100644 (file)
--- 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 fe6c6a6ed57501161dab9dce26dc8e734d72cb89..e0137aee47fb3847903df3bf591d43acc20fe55d 100644 (file)
--- 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);\r
         fe.notifyUpdateCell(cell);\r
         CellValue result = fe.evaluate(cell);\r
-        assertEquals(result.getCellType(), CellType.STRING);\r
+        assertEquals(result.getCellTypeEnum(), CellType.STRING);\r
         assertEquals(expectedResult, result.getStringValue());\r
     }\r
 }\r

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 db0f6b0805a5a5c4718d6776a50a0895749c011d..0051f72e7c25de508b676dc881890b2e7c6b2a4a 100644 (file)
--- 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 0bfff626af54f21c13020047f8926308d71b9b7c..5ac75d62ad04e27e9f7136ca979b2cfe9b20a4a3 100644 (file)
--- 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 e14ea3c45b26598b66d4b353556dc38c4796db16..f6e1f38093806f120f06d3ab8ee71a243bee3b8d 100644 (file)
--- 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 ea5ac9c7aa5d1a1aa25ba0b777d86e49013d32fe..99d370bd6886700ff1d7b59e62d857c743890fc2 100644 (file)
--- 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 2fb108eadc6aca46fd4bf06a2d9ccd5a5b9ba29e..40fac0dea6d73ef38b0b91a0120cb7b7ce3ff5e8 100644 (file)
--- 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 51b80876ec0497f533f5b2378e66995f2c05be32..e723711cce8a2c1527dccac14629e282c8204c4b 100644 (file)
--- 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 fc4c3c9275d83c764481074daa31b5c0bfeac54b..6a925511f16221df9e5e6456510c865ffacd716c 100644 (file)
--- 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) {\r
         double actualValue = cv.getNumberValue();\r
         double expectedValue = cell.getNumericCellValue(); // cached formula result calculated by Excel\r
-        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellType());\r
+        assertEquals("Invalid formula result: " + cv.toString(), CellType.NUMERIC, cv.getCellTypeEnum());\r
         assertEquals(expectedValue, actualValue, 1E-8);\r
     }\r
 }\r

diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java
index bdd09bfd6c8dce5b6148bb5b5cd922bfb818120e..f9725ba8ae06b1eb462747f1f8ccac4293ff125f 100644 (file)
--- 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);