Support for ClosedXml 0.94

Author: traf72

ExcelReportGenerator.Tests/CustomAsserts/ExcelAssert.cs

@@ -13,13 +13,13 @@ public static void AreWorksheetsContentEquals(IXLWorksheet expected, IXLWorkshee
                 return;
             }
 
-            Assert.AreEqual(expected.CellsUsed(true).Count(), actual.CellsUsed(true).Count(), "Cells used count failed");
+            Assert.AreEqual(expected.CellsUsed(XLCellsUsedOptions.All).Count(), actual.CellsUsed(XLCellsUsedOptions.All).Count(), "Cells used count failed");
 
-            IXLCell expectedFirstCellUsed = expected.FirstCellUsed(true);
-            IXLCell actualFirstCellUsed = actual.FirstCellUsed(true);
+            IXLCell expectedFirstCellUsed = expected.FirstCellUsed(XLCellsUsedOptions.All);
+            IXLCell actualFirstCellUsed = actual.FirstCellUsed(XLCellsUsedOptions.All);
             Assert.AreEqual(expectedFirstCellUsed.Address, actualFirstCellUsed.Address, "First cell used failed");
-            IXLCell expectedLastCellUsed = expected.LastCellUsed(true);
-            IXLCell actualLastCellUsed = actual.LastCellUsed(true);
+            IXLCell expectedLastCellUsed = expected.LastCellUsed(XLCellsUsedOptions.All);
+            IXLCell actualLastCellUsed = actual.LastCellUsed(XLCellsUsedOptions.All);
             Assert.AreEqual(expectedLastCellUsed.Address, actualLastCellUsed.Address, "Last cell used failed");
 
             IXLRange range = expected.Range(expectedFirstCellUsed, expectedLastCellUsed);

ExcelReportGenerator.Tests/Excel/ExcelHelperTest.cs

@@ -993,8 +993,8 @@ public void TestCloneRange()
 
             Assert.AreEqual(range, ExcelHelper.CloneRange(range));
 
-            // Since ClosedXml 0.93.0 this test does not pass
-            Assert.AreNotSame(range, ExcelHelper.CloneRange(range));
+            //// Since ClosedXml 0.93.0 this test does not pass
+            //Assert.AreNotSame(range, ExcelHelper.CloneRange(range));
 
             Assert.IsNull(ExcelHelper.CloneRange(null));
         }

ExcelReportGenerator.Tests/Extensions/XLRangeBaseExtensionsTest.cs

@@ -23,13 +23,13 @@ public void TestCellsUsedWithoutFormulas()
             ws.Cell(25, 30).FormulaA1 = "=A1+B2";
 
             Assert.AreEqual(5, ws.CellsUsed().Count());
-            Assert.AreEqual(6, ws.CellsUsed(true).Count());
+            Assert.AreEqual(6, ws.CellsUsed(XLCellsUsedOptions.All).Count());
             Assert.AreEqual(2, ws.CellsUsedWithoutFormulas().Count());
-            Assert.AreEqual(3, ws.CellsUsedWithoutFormulas(true).Count());
+            Assert.AreEqual(3, ws.CellsUsedWithoutFormulas(XLCellsUsedOptions.All).Count());
             Assert.AreEqual(2, ws.CellsUsed(c => c.Active || c.Style.Border.TopBorder == XLBorderStyleValues.Thin).Count());
             Assert.AreEqual(1, ws.CellsUsedWithoutFormulas(c => c.Active || c.Style.Border.TopBorder == XLBorderStyleValues.Thin).Count());
-            Assert.AreEqual(3, ws.CellsUsed(true, c => c.Active || c.Style.Border.TopBorder == XLBorderStyleValues.Thin).Count());
-            Assert.AreEqual(2, ws.CellsUsedWithoutFormulas(true, c => c.Active || c.Style.Border.TopBorder == XLBorderStyleValues.Thin).Count());
+            Assert.AreEqual(3, ws.CellsUsed(XLCellsUsedOptions.All, c => c.Active || c.Style.Border.TopBorder == XLBorderStyleValues.Thin).Count());
+            Assert.AreEqual(2, ws.CellsUsedWithoutFormulas(XLCellsUsedOptions.All, c => c.Active || c.Style.Border.TopBorder == XLBorderStyleValues.Thin).Count());
         }
 
         [Test]

ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanelDataSetRenderTest.cs

@@ -1,13 +1,14 @@
-using System.Linq;
-using ClosedXML.Excel;
+using ClosedXML.Excel;
 using ExcelReportGenerator.Enums;
 using ExcelReportGenerator.Rendering.Panels.ExcelPanels;
 using ExcelReportGenerator.Tests.CustomAsserts;
 using NUnit.Framework;
+using System;
+using System.IO;
+using System.Linq;
 
 namespace ExcelReportGenerator.Tests.Rendering.Panels.ExcelPanels.PanelRenderTests.DataSourceDynamicPanelRenderTests
 {
-    
     public class DataSourceDynamicPanelDataSetRenderTest
     {
         [Test]
@@ -45,14 +46,15 @@ public void TestRenderDataSetWithEvents()
 
             Assert.AreEqual(ws.Range(2, 2, 7, 8), panel.ResultRange);
 
-            // Bug of ClosedXml - invalid determine of FirstCellUsed and LastCellUsed if merged ranges exist
-            ws.Cell(1, 1).Value = "Stub";
-            ws.Range(1, 1, 1, 1).Merge();
-            ws.Cell(8, 9).Value = "Stub";
-            ws.Range(8, 9, 8, 9).Merge();
+            // The test doesn't pass if we compare the expected workbook with the in-memory workbook (since ClosedXml 0.94.0)
+            string actualWorkbookName = $"{Guid.NewGuid()}.xlsx";
+            report.Workbook.SaveAs(actualWorkbookName);
+            var actualWorkbook = new XLWorkbook(actualWorkbookName);
 
             ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(nameof(DataSourceDynamicPanelDataSetRenderTest),
-                nameof(TestRenderDataSetWithEvents)), ws.Workbook);
+                nameof(TestRenderDataSetWithEvents)), actualWorkbook);
+
+            File.Delete(actualWorkbookName);
 
             //report.Workbook.SaveAs("test.xlsx");
         }
@@ -90,8 +92,15 @@ public void TestRenderDataSetWithEvents_HorizontalPanel()
 
             Assert.AreEqual(ws.Range(2, 2, 8, 6), panel.ResultRange);
 
+            // The test doesn't pass if we compare the expected workbook with the in-memory workbook (since ClosedXml 0.94.0)
+            string actualWorkbookName = $"{Guid.NewGuid()}.xlsx";
+            report.Workbook.SaveAs(actualWorkbookName);
+            var actualWorkbook = new XLWorkbook(actualWorkbookName);
+
             ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(nameof(DataSourceDynamicPanelDataSetRenderTest),
-                nameof(TestRenderDataSetWithEvents_HorizontalPanel)), ws.Workbook);
+                nameof(TestRenderDataSetWithEvents_HorizontalPanel)), actualWorkbook);
+
+            File.Delete(actualWorkbookName);
 
             //report.Workbook.SaveAs("test.xlsx");
         }

ExcelReportGenerator.Tests/TestData/DataSourceDynamicPanelDataSetRenderTest/TestRenderDataSetWithEvents.xlsx

@@ -280,7 +280,7 @@ public static bool IsRangeInvalid(IXLRange range)
                 range.FirstColumn().ColumnNumber();
                 range.LastColumn().ColumnNumber();
             }
-            catch (IndexOutOfRangeException)
+            catch (ArgumentOutOfRangeException)
             {
                 return true;
             }

ExcelReportGenerator/Excel/ExcelHelper.cs

@@ -22,7 +22,7 @@
 
   <!-- Common NuGet package refs that affect all projects -->
   <ItemGroup>
-    <PackageReference Include="ClosedXML" Version="0.93.1" />
+    <PackageReference Include="ClosedXML" Version="0.94.0" />
   </ItemGroup>
 
   <!-- .NET Standard 2.0 -->

ExcelReportGenerator/ExcelReportGenerator.csproj

@@ -15,14 +15,14 @@ public static IXLCells CellsUsedWithoutFormulas(this IXLRangeBase range, Func<IX
             return range.CellsUsed(c => predicate(c) && !c.HasFormula);
         }
 
-        public static IXLCells CellsUsedWithoutFormulas(this IXLRangeBase range, bool includeFormats)
+        public static IXLCells CellsUsedWithoutFormulas(this IXLRangeBase range, XLCellsUsedOptions options)
         {
-            return range.CellsUsed(includeFormats, c => !c.HasFormula);
+            return range.CellsUsed(options, c => !c.HasFormula);
         }
 
-        public static IXLCells CellsUsedWithoutFormulas(this IXLRangeBase range, bool includeFormats, Func<IXLCell, bool> predicate)
+        public static IXLCells CellsUsedWithoutFormulas(this IXLRangeBase range, XLCellsUsedOptions options, Func<IXLCell, bool> predicate)
         {
-            return range.CellsUsed(includeFormats, c => predicate(c) && !c.HasFormula);
+            return range.CellsUsed(options, c => predicate(c) && !c.HasFormula);
         }
 
         public static IXLCells CellsWithoutFormulas(this IXLRangeBase range)