Author: nick
Date: Tue Nov 4 16:03:25 2014
New Revision: 1636626
URL: http://svn.apache.org/r1636626
Log:
More disabled unit tests relating to external workbook formula references
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaEvaluation.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
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=1636626&r1=1636625&r2=1636626&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
Tue Nov 4 16:03:25 2014
@@ -168,12 +168,12 @@ public final class TestXSSFFormulaEvalua
assertEquals("142.0", evaluator.evaluate(cXSL_gNR).formatAsString());
/**
- // Now add a formula that refers to a different workbook again
+ // Now add a formula that refers to yet another (different) workbook
Cell cXSLX_nw_cell = rXSLX.createCell(42);
- cXSLX_nw_cell.setCellFormula("[alt.xslx]Sheet1!$A$1");
+ cXSLX_nw_cell.setCellFormula("[alt.xlsx]Sheet1!$A$1");
// Check it - TODO Is this correct? Or should it become [2]Sheet1!$A$1
?
- assertEquals("[alt.xslx]Sheet1!$A$1", cXSLX_nw_cell.getCellFormula());
+ assertEquals("[alt.xlsx]Sheet1!$A$1", cXSLX_nw_cell.getCellFormula());
// Evaluate it, without a link to that workbook
try {
@@ -184,7 +184,7 @@ public final class TestXSSFFormulaEvalua
// Add a link, check it does
Workbook alt = new XSSFWorkbook();
alt.createSheet().createRow(0).createCell(0).setCellValue("In another
workbook");
- evaluators.put("alt.xslx",
alt.getCreationHelper().createFormulaEvaluator());
+ evaluators.put("alt.xlsx",
alt.getCreationHelper().createFormulaEvaluator());
evaluator.setupReferencedWorkbooks(evaluators);
evaluator.evaluate(cXSLX_nw_cell);
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java?rev=1636626&r1=1636625&r2=1636626&view=diff
==============================================================================
---
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
(original)
+++
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFFormulaEvaluator.java
Tue Nov 4 16:03:25 2014
@@ -230,6 +230,36 @@ public final class TestHSSFFormulaEvalua
assertEquals(Cell.CELL_TYPE_FORMULA, cell.getCellType());
assertEquals(Cell.CELL_TYPE_NUMERIC, cell.getCachedFormulaResultType());
assertEquals(36.90, cell.getNumericCellValue(), 0.0001);
+
+/*
+ // Now add a formula that refers to yet another (different) workbook
+ cell = wb.getSheetAt(0).getRow(1).createCell(42);
+ cell.setCellFormula("[alt.xls]Sheet1!$A$1");
+
+ // Check it - TODO Is this correct? Or should it become [2]Sheet1!$A$1 ?
+ assertEquals("[alt.xls]Sheet1!$A$1", cell.getCellFormula());
+
+ // Evaluate it, without a link to that workbook
+ try {
+ eval.evaluate(cell);
+ fail("No cached value and no link to workbook, shouldn't evaluate");
+ } catch(Exception e) {}
+
+ // Add a link, check it does
+ HSSFWorkbook alt = new HSSFWorkbook();
+ alt.createSheet().createRow(0).createCell(0).setCellValue("In another
workbook");
+ HSSFFormulaEvaluator.setupEnvironment(
+ new String[] { "XRefCalc.xls", "XRefCalcData.xls", "alt.xls" },
+ new HSSFFormulaEvaluator[] {
+ eval,
+ new HSSFFormulaEvaluator(wbData),
+ new HSSFFormulaEvaluator(alt)
+ }
+ );
+
+ eval.evaluate(cell);
+ assertEquals("In another workbook", cell.getStringCellValue());
+*/
}
public void testSharedFormulas(){
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
