From 9a127374b3b59a0818cff5337e004916943c4f9c Mon Sep 17 00:00:00 2001
From: Josh Micich <josh@apache.org>
Date: Wed, 17 Sep 2008 22:08:15 +0000
Subject: [PATCH] merged 696109,696111 from trunk - (Added junit for bug 45732)

git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@696492 13f79535-47bb-0310-9956-ffa450edef68
---
 .../poi/hssf/data/FormulaEvalTestData.xls     | Bin 157184 -> 157184 bytes
 .../AllIndividualFunctionEvaluationTests.java |   1 +
 .../record/formula/functions/TestNper.java    |  67 ++++++++++++++++++
 3 files changed, 68 insertions(+)
 create mode 100644 src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java

diff --git a/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls b/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
index f806c792f6c9b4db58c02f6a63f5bb004779663e..344a072cdf7e49939e3164aa60a9593222d55b11 100644
GIT binary patch
delta 2286
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

delta 2294
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
Zjj{+V;&<N%eza)%$BhodS1nzp{{wlT%envn

diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java
index 4ae90d067b..c57c40b62a 100755
--- a/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/AllIndividualFunctionEvaluationTests.java
@@ -41,6 +41,7 @@ public final class AllIndividualFunctionEvaluationTests {
 		result.addTestSuite(TestMid.class);
 		result.addTestSuite(TestMathX.class);
 		result.addTestSuite(TestMatch.class);
+		result.addTestSuite(TestNper.class);
 		result.addTestSuite(TestPmt.class);
 		result.addTestSuite(TestOffset.class);
 		result.addTestSuite(TestRowCol.class);
diff --git a/src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java
new file mode 100644
index 0000000000..a2bb0f6adb
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/record/formula/functions/TestNper.java
@@ -0,0 +1,67 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.formula.functions;
+
+import org.apache.poi.hssf.record.formula.eval.Eval;
+import org.apache.poi.hssf.record.formula.eval.NumberEval;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFErrorConstants;
+import org.apache.poi.hssf.usermodel.HSSFFont;
+import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+/**
+ * 
+ * @author Josh Micich
+ */
+public final class TestNper extends TestCase {
+	public void testSimpleEvaluate() {
+		
+		Eval[] args = {
+			new NumberEval(0.05),
+			new NumberEval(250),
+			new NumberEval(-1000),
+		};
+		Eval result = FinanceFunction.NPER.evaluate(args, 0, (short)0);
+		
+		assertEquals(NumberEval.class, result.getClass());
+		assertEquals(4.57353557, ((NumberEval)result).getNumberValue(), 0.00000001);
+	}
+	
+	public void testEvaluate_bug_45732() {
+		HSSFWorkbook wb = new HSSFWorkbook();
+		HSSFSheet sheet = wb.createSheet("Sheet1");
+		HSSFCell cell = sheet.createRow(0).createCell(0);
+		
+		cell.setCellFormula("NPER(12,4500,100000,100000)");
+		cell.setCellValue(15.0);
+		assertEquals("NPER(12,4500,100000.0,100000.0)", cell.getCellFormula());
+		assertEquals(HSSFCell.CELL_TYPE_NUMERIC, cell.getCachedFormulaResultType());
+		assertEquals(15.0, cell.getNumericCellValue(), 0.0);
+		
+		HSSFFormulaEvaluator fe = new HSSFFormulaEvaluator(wb);
+		fe.evaluateFormulaCell(cell);
+		assertEquals(HSSFCell.CELL_TYPE_ERROR, cell.getCachedFormulaResultType());
+		assertEquals(HSSFErrorConstants.ERROR_NUM, cell.getErrorCellValue());
+	}
+	
+}
-- 
2.39.5