Merge pull request #1488 from antony-liu/master

Add test case for issue #1057
nissl-lab · Feb 13, 2025 · af9bd4f · af9bd4f
2 parents 5126e0d + ad57b0e
commit af9bd4f
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 2 deletions.
diff --git a/testcases/main/HSSF/UserModel/TestHSSFFormulaEvaluator.cs b/testcases/main/HSSF/UserModel/TestHSSFFormulaEvaluator.cs
@@ -66,8 +66,8 @@ public void TestEvaluateSimple()
         }
 
         /**
-	     * Test for bug due to attempt to convert a cached formula error result to a boolean
-	     */
+         * Test for bug due to attempt to convert a cached formula error result to a boolean
+         */
         [Test]
         public override void TestUpdateCachedFormulaResultFromErrorToNumber_bug46479()
         {
@@ -355,5 +355,11 @@ public void TestSharedFormulas()
         {
             BaseTestSharedFormulas("shared_formulas.xls");
         }
+
+        [Test]
+        public void TestNPOIIssue_1057()
+        {
+            BaseTestNPOIIssue_1057("hparams.xls", "hinstall.xls");
+        }
     }
 }
diff --git a/testcases/main/SS/UserModel/BaseTestFormulaEvaluator.cs b/testcases/main/SS/UserModel/BaseTestFormulaEvaluator.cs
@@ -20,6 +20,7 @@ namespace TestCases.SS.UserModel
     using NPOI.SS.UserModel;
     using NUnit.Framework;
     using System;
+    using System.Collections.Generic;
 
     /**
      * Common superclass for Testing implementatiosn of{@link FormulaEvaluator}
@@ -352,5 +353,34 @@ public void EvaluateInCellReturnsSameCell()
             Assert.AreSame(cell, same);
             wb.Close();
         }
+
+        public void BaseTestNPOIIssue_1057(string paramsFile, string installFile)
+        {
+            DataFormatter formatter = new DataFormatter();
+            var paramswb = _testDataProvider.OpenSampleWorkbook(paramsFile);
+            var installwb = _testDataProvider.OpenSampleWorkbook(installFile);
+
+            var paramsevaluator = paramswb.GetCreationHelper().CreateFormulaEvaluator();
+            var installevaluator = installwb.GetCreationHelper().CreateFormulaEvaluator();
+
+            var refs = new Dictionary<string, IFormulaEvaluator>();
+            refs.Add(paramsFile, paramsevaluator);
+            refs.Add(installFile, installevaluator);
+            installevaluator.SetupReferencedWorkbooks(refs);
+
+            var suffix = installFile[0].ToString().ToUpper();
+            var sheet = installwb.GetSheetAt(0);
+            var row = sheet.GetRow(0);
+            var cell = row.GetCell(1);
+
+
+            String cellValue = formatter.FormatCellValue(cell, installevaluator);
+            Assert.AreEqual("Referenced value in sheet 1" + suffix, cellValue);
+
+            row = sheet.GetRow(1);
+            cell = row.GetCell(1);
+            cellValue = formatter.FormatCellValue(cell, installevaluator);
+            Assert.AreEqual("Referenced value in sheet 2" + suffix, cellValue);
+        }
     }
 }
diff --git a/testcases/ooxml/XSSF/UserModel/TestXSSFFormulaEvaluation.cs b/testcases/ooxml/XSSF/UserModel/TestXSSFFormulaEvaluation.cs
@@ -755,6 +755,12 @@ public void EvaluateInCellReturnsSameDataType()
             Assert.AreSame(cell, same);
             wb.Close();
         }
+
+        [Test]
+        public void TestNPOIIssue_1057()
+        {
+            BaseTestNPOIIssue_1057("xparams.xlsx", "xinstall.xlsx");
+        }
     }
 
 }
diff --git a/testcases/test-data/spreadsheet/hinstall.xls b/testcases/test-data/spreadsheet/hinstall.xls
diff --git a/testcases/test-data/spreadsheet/hparams.xls b/testcases/test-data/spreadsheet/hparams.xls
diff --git a/testcases/test-data/spreadsheet/xinstall.xlsx b/testcases/test-data/spreadsheet/xinstall.xlsx
diff --git a/testcases/test-data/spreadsheet/xparams.xlsx b/testcases/test-data/spreadsheet/xparams.xlsx