poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cen...@apache.org
Subject svn commit: r1621641 - in /poi/trunk/src: java/org/apache/poi/ss/formula/WorkbookEvaluator.java ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
Date Sun, 31 Aug 2014 21:46:48 GMT
Author: centic
Date: Sun Aug 31 21:46:48 2014
New Revision: 1621641

URL: http://svn.apache.org/r1621641
Log:
Bug 48195: Formulas: Fix incorrect evaluation of IF() with ROW()/COLUMN() as else-result

Modified:
    poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
    poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java

Modified: poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java?rev=1621641&r1=1621640&r2=1621641&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/WorkbookEvaluator.java Sun Aug 31 21:46:48
2014
@@ -39,6 +39,7 @@ import org.apache.poi.ss.formula.eval.Nu
 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.function.FunctionMetadataRegistry;
 import org.apache.poi.ss.formula.functions.Choose;
 import org.apache.poi.ss.formula.functions.FreeRefFunction;
 import org.apache.poi.ss.formula.functions.Function;
@@ -486,12 +487,15 @@ public final class WorkbookEvaluator {
 						continue;
 					}
 					if (evaluatedPredicate) {
-						// nothing to skip - true param folows
+						// nothing to skip - true param follows
 					} else {
 						int dist = attrPtg.getData();
 						i+= countTokensToBeSkipped(ptgs, i, dist);
 						Ptg nextPtg = ptgs[i+1];
-						if (ptgs[i] instanceof AttrPtg && nextPtg instanceof FuncVarPtg) {
+						if (ptgs[i] instanceof AttrPtg && nextPtg instanceof FuncVarPtg &&

+						        // in order to verify that there is no third param, we need to check 
+						        // if we really have the IF next or some other FuncVarPtg as third param, e.g.
ROW()/COLUMN()!
+						        ((FuncVarPtg)nextPtg).getFunctionIndex() == FunctionMetadataRegistry.FUNCTION_INDEX_IF)
{
 							// this is an if statement without a false param (as opposed to MissingArgPtg as the
false param)
 							i++;
 							stack.push(BoolEval.FALSE);

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java?rev=1621641&r1=1621640&r2=1621641&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
(original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
Sun Aug 31 21:46:48 2014
@@ -17,6 +17,7 @@
 
 package org.apache.poi.xssf.usermodel;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -288,48 +289,212 @@ public final class TestXSSFFormulaEvalua
         }
     }
     
-    public void testMultisheetFormulaEval() {
+    public void testMultisheetFormulaEval() throws IOException {
     	XSSFWorkbook wb = new XSSFWorkbook();
-		XSSFSheet sheet1 = wb.createSheet("Sheet1");
-		XSSFSheet sheet2 = wb.createSheet("Sheet2");
-		XSSFSheet sheet3 = wb.createSheet("Sheet3");
-		
-		// sheet1 A1
-		XSSFCell cell = sheet1.createRow(0).createCell(0);
-		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
-		cell.setCellValue(1.0);
-		
-		// sheet2 A1
-		cell = sheet2.createRow(0).createCell(0);
-		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
-		cell.setCellValue(1.0);
-		
-		// sheet2 B1
-		cell = sheet2.getRow(0).createCell(1);
-		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
-		cell.setCellValue(1.0);
-		
-		// sheet3 A1
-		cell = sheet3.createRow(0).createCell(0);
-		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
-		cell.setCellValue(1.0);
-		
-		// sheet1 A2 formulae
-		cell = sheet1.createRow(1).createCell(0);
-		cell.setCellType(Cell.CELL_TYPE_FORMULA);
-		cell.setCellFormula("SUM(Sheet1:Sheet3!A1)");
-		
-		// sheet1 A3 formulae
-		cell = sheet1.createRow(2).createCell(0);
-		cell.setCellType(Cell.CELL_TYPE_FORMULA);
-		cell.setCellFormula("SUM(Sheet1:Sheet3!A1:B1)");
-		
-		wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
-		
-		cell = sheet1.getRow(1).getCell(0);
-		assertEquals(3.0, cell.getNumericCellValue());
-		
-		cell = sheet1.getRow(2).getCell(0);
-		assertEquals(4.0, cell.getNumericCellValue());
+    	try {
+    		XSSFSheet sheet1 = wb.createSheet("Sheet1");
+    		XSSFSheet sheet2 = wb.createSheet("Sheet2");
+    		XSSFSheet sheet3 = wb.createSheet("Sheet3");
+    		
+    		// sheet1 A1
+    		XSSFCell cell = sheet1.createRow(0).createCell(0);
+    		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
+    		cell.setCellValue(1.0);
+    		
+    		// sheet2 A1
+    		cell = sheet2.createRow(0).createCell(0);
+    		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
+    		cell.setCellValue(1.0);
+    		
+    		// sheet2 B1
+    		cell = sheet2.getRow(0).createCell(1);
+    		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
+    		cell.setCellValue(1.0);
+    		
+    		// sheet3 A1
+    		cell = sheet3.createRow(0).createCell(0);
+    		cell.setCellType(Cell.CELL_TYPE_NUMERIC);
+    		cell.setCellValue(1.0);
+    		
+    		// sheet1 A2 formulae
+    		cell = sheet1.createRow(1).createCell(0);
+    		cell.setCellType(Cell.CELL_TYPE_FORMULA);
+    		cell.setCellFormula("SUM(Sheet1:Sheet3!A1)");
+    		
+    		// sheet1 A3 formulae
+    		cell = sheet1.createRow(2).createCell(0);
+    		cell.setCellType(Cell.CELL_TYPE_FORMULA);
+    		cell.setCellFormula("SUM(Sheet1:Sheet3!A1:B1)");
+    		
+    		wb.getCreationHelper().createFormulaEvaluator().evaluateAll();
+    		
+    		cell = sheet1.getRow(1).getCell(0);
+    		assertEquals(3.0, cell.getNumericCellValue());
+    		
+    		cell = sheet1.getRow(2).getCell(0);
+    		assertEquals(4.0, cell.getNumericCellValue());
+    	} finally {
+    	    wb.close();
+    	}
 	}
+
+    public void testBug55843() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+            cellA2.setCellFormula("IF(B1=0,\"\",((ROW()-ROW(A$1))*12))");
+            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluate);
+            assertEquals("12.0", evaluate.formatAsString());
+
+            cellA2.setCellFormula("IF(NOT(B1=0),((ROW()-ROW(A$1))*12),\"\")");
+            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluateN);
+            
+            assertEquals(evaluate.toString(), evaluateN.toString());
+            assertEquals("12.0", evaluateN.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }
+    
+    public void testBug55843a() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+            cellA2.setCellFormula("IF(B1=0,\"\",((ROW(A$1))))");
+            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluate);
+            assertEquals("1.0", evaluate.formatAsString());
+
+            cellA2.setCellFormula("IF(NOT(B1=0),((ROW(A$1))),\"\")");
+            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluateN);
+            
+            assertEquals(evaluate.toString(), evaluateN.toString());
+            assertEquals("1.0", evaluateN.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }    
+
+    public void testBug55843b() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+
+            cellA2.setCellFormula("IF(B1=0,\"\",((ROW())))");
+            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluate);
+            assertEquals("2.0", evaluate.formatAsString());
+            
+            cellA2.setCellFormula("IF(NOT(B1=0),((ROW())),\"\")");
+            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluateN);
+            
+            assertEquals(evaluate.toString(), evaluateN.toString());
+            assertEquals("2.0", evaluateN.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }
+    
+    public void testBug55843c() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+            
+            cellA2.setCellFormula("IF(NOT(B1=0),((ROW())))");
+            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluateN);
+            assertEquals("2.0", evaluateN.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }
+    
+    public void testBug55843d() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+            
+            cellA2.setCellFormula("IF(NOT(B1=0),((ROW())),\"\")");
+            CellValue evaluateN = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluateN);
+            assertEquals("2.0", evaluateN.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }
+
+    public void testBug55843e() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+
+            cellA2.setCellFormula("IF(B1=0,\"\",((ROW())))");
+            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluate);
+            assertEquals("2.0", evaluate.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }
+    
+
+    public void testBug55843f() throws IOException {
+        XSSFWorkbook wb = new XSSFWorkbook();
+        try {
+            XSSFSheet sheet = wb.createSheet("test");
+            XSSFRow row = sheet.createRow(0);
+            XSSFRow row2 = sheet.createRow(1);
+            XSSFCell cellA2 = row2.createCell(0, Cell.CELL_TYPE_FORMULA);
+            XSSFCell cellB1 = row.createCell(1, Cell.CELL_TYPE_NUMERIC);
+            cellB1.setCellValue(10);
+            XSSFFormulaEvaluator formulaEvaluator = wb.getCreationHelper().createFormulaEvaluator();
+
+            cellA2.setCellFormula("IF(B1=0,\"\",IF(B1=10,3,4))");
+            CellValue evaluate = formulaEvaluator.evaluate(cellA2);
+            System.out.println(evaluate);
+            assertEquals("3.0", evaluate.formatAsString());
+        } finally {
+            wb.close();
+        }
+    }    
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message