You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by jo...@apache.org on 2009/12/17 02:31:29 UTC
svn commit: r891512 -
/poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java
Author: josh
Date: Thu Dec 17 01:31:29 2009
New Revision: 891512
URL: http://svn.apache.org/viewvc?rev=891512&view=rev
Log:
Minor improvements to error reporting in TestIndexFunctionFromSpreadsheet
Modified:
poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java?rev=891512&r1=891511&r2=891512&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/functions/TestIndexFunctionFromSpreadsheet.java Thu Dec 17 01:31:29 2009
@@ -92,7 +92,7 @@
case HSSFCell.CELL_TYPE_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 HSSFCell.CELL_TYPE_NUMERIC:
- assertEquals(expected.getNumericCellValue(), actual.getNumberValue(), 0.0);
+ assertEquals(msg, expected.getNumericCellValue(), actual.getNumberValue(), 0.0);
break;
case HSSFCell.CELL_TYPE_STRING:
assertEquals(msg, expected.getRichStringCellValue().getString(), actual.getStringValue());
@@ -181,11 +181,11 @@
if (c == null || c.getCellType() != HSSFCell.CELL_TYPE_FORMULA) {
continue;
}
- CellValue actualValue = evaluator.evaluate(c);
HSSFCell expectedValueCell = r.getCell(SS.COLUMN_INDEX_EXPECTED_RESULT);
String msgPrefix = formatTestCaseDetails(sheetName, r.getRowNum(), c);
try {
+ CellValue actualValue = evaluator.evaluate(c);
confirmExpectedResult(msgPrefix, expectedValueCell, actualValue);
_evaluationSuccessCount ++;
if(result != Result.SOME_EVALUATIONS_FAILED) {
@@ -193,14 +193,13 @@
}
} catch (RuntimeException e) {
_evaluationFailureCount ++;
- printShortStackTrace(System.err, e);
+ printShortStackTrace(System.err, e, msgPrefix);
result = Result.SOME_EVALUATIONS_FAILED;
} catch (AssertionFailedError e) {
_evaluationFailureCount ++;
- printShortStackTrace(System.err, e);
+ printShortStackTrace(System.err, e, msgPrefix);
result = Result.SOME_EVALUATIONS_FAILED;
}
-
}
}
@@ -210,14 +209,15 @@
StringBuffer sb = new StringBuffer();
CellReference cr = new CellReference(sheetName, rowIndex, c.getColumnIndex(), false, false);
sb.append(cr.formatAsString());
- sb.append(" {=").append(c.getCellFormula()).append("}");
+ sb.append(" [formula: ").append(c.getCellFormula()).append(" ]");
return sb.toString();
}
/**
* Useful to keep output concise when expecting many failures to be reported by this test case
*/
- private static void printShortStackTrace(PrintStream ps, Throwable e) {
+ private static void printShortStackTrace(PrintStream ps, Throwable e, String msgPrefix) {
+ System.err.println("Problem with " + msgPrefix);
StackTraceElement[] stes = e.getStackTrace();
int startIx = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org