Skip to content

Commit 0f6b602

Browse files
traf72traf72
committed
Change obsolete NamedRange to DefinedName
1 parent e04130b commit 0f6b602

File tree

43 files changed

+379
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+379
-375
lines changed

‎ExcelReportGenerator.Samples/ExcelReportGenerator.Samples.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="SimpleInjector" Version="5.4.4" />
13-
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
12+
<PackageReference Include="SimpleInjector" Version="5.5.0" />
13+
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎ExcelReportGenerator.Tests/CustomAsserts/ExcelAssert.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ string GetErrorMessage(string propName) =>
109109
}
110110

111111
AreMergedRangesEqual(expected.MergedRanges, actual.MergedRanges);
112-
AreNamedRangesEqual(expected.NamedRanges, actual.NamedRanges);
112+
AreNamedRangesEqual(expected.DefinedNames, actual.DefinedNames);
113113
ArePageSetupEqual(expected.PageSetup, actual.PageSetup, "PageSetup {0} failed.");
114114
}
115115

@@ -126,8 +126,8 @@ public static void AreWorkbooksContentEqual(XLWorkbook expected, XLWorkbook actu
126126
Assert.AreEqual(expected.Worksheet(i + 1).Name, actual.Worksheet(i + 1).Name, "Worksheets names failed");
127127
}
128128

129-
Assert.AreEqual(expected.NamedRanges.Count(), actual.NamedRanges.Count(), "Workbook named ranges count failed");
130-
AreNamedRangesEqual(expected.NamedRanges, actual.NamedRanges);
129+
Assert.AreEqual(expected.DefinedNames.Count(), actual.DefinedNames.Count(), "Workbook named ranges count failed");
130+
AreNamedRangesEqual(expected.DefinedNames, actual.DefinedNames);
131131
for (var i = 0; i < expected.Worksheets.Count; i++)
132132
{
133133
AreWorksheetsContentEqual(expected.Worksheet(i + 1), actual.Worksheet(i + 1));
@@ -220,7 +220,7 @@ public static void AreNamedRangesEqual(IXLDefinedNames expected, IXLDefinedNames
220220
Assert.AreEqual(expected.Count(), actual.Count(), "Worksheet named ranges count failed");
221221
foreach (var expectedNamedRange in expected)
222222
{
223-
var actualNamedRange = actual.NamedRange(expectedNamedRange.Name);
223+
var actualNamedRange = actual.DefinedName(expectedNamedRange.Name);
224224
Assert.AreEqual(expectedNamedRange.Comment, actualNamedRange.Comment,
225225
$"Named range {expectedNamedRange.Name} comment failed");
226226
Assert.AreEqual(expectedNamedRange.Ranges.Count, actualNamedRange.Ranges.Count,

‎ExcelReportGenerator.Tests/Excel/ExcelHelperTest.cs‎

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public void TestCopyNamedRange()
259259
var ws = wb.AddWorksheet("Test");
260260
var range = ws.Range(6, 5, 9, 7);
261261
range.AddToNamed("TestRange", XLScope.Worksheet);
262-
var namedRange = ws.NamedRange("TestRange");
262+
var namedRange = ws.DefinedName("TestRange");
263263

264264
range.FirstCell().Value = "RangeStart";
265265
range.LastCell().Value = "RangeEnd";
@@ -307,7 +307,7 @@ public void TestCopyNamedRange()
307307
Assert.AreEqual(XLBorderStyleValues.Thin, newRange2.FirstCell().Style.Border.TopBorder);
308308
Assert.AreEqual(XLBorderStyleValues.Thin, newRange2.LastCell().Style.Border.BottomBorder);
309309

310-
Assert.AreEqual(3, ws.NamedRanges.Count());
310+
Assert.AreEqual(3, ws.DefinedNames.Count());
311311

312312
//wb.SaveAs("test.xlsx");
313313
}
@@ -318,7 +318,7 @@ public void TestAllocateSpaceForNextRange()
318318
// Adding cells at the top
319319
var wb = InitWorkBookForShiftTests();
320320
var ws = wb.Worksheet("Test");
321-
var range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
321+
var range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
322322

323323
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Top);
324324

@@ -349,7 +349,7 @@ public void TestAllocateSpaceForNextRange()
349349
// Adding cells at the bottom
350350
wb = InitWorkBookForShiftTests();
351351
ws = wb.Worksheet("Test");
352-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
352+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
353353

354354
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Bottom);
355355

@@ -380,7 +380,7 @@ public void TestAllocateSpaceForNextRange()
380380
// Adding rows at the top
381381
wb = InitWorkBookForShiftTests();
382382
ws = wb.Worksheet("Test");
383-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
383+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
384384

385385
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Top, ShiftType.Row);
386386

@@ -411,7 +411,7 @@ public void TestAllocateSpaceForNextRange()
411411
// Adding rows at the bottom
412412
wb = InitWorkBookForShiftTests();
413413
ws = wb.Worksheet("Test");
414-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
414+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
415415

416416
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Bottom, ShiftType.Row);
417417

@@ -442,7 +442,7 @@ public void TestAllocateSpaceForNextRange()
442442
// Adding cells on the left
443443
wb = InitWorkBookForShiftTests();
444444
ws = wb.Worksheet("Test");
445-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
445+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
446446

447447
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Left);
448448

@@ -473,7 +473,7 @@ public void TestAllocateSpaceForNextRange()
473473
// Adding cells on the right
474474
wb = InitWorkBookForShiftTests();
475475
ws = wb.Worksheet("Test");
476-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
476+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
477477

478478
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Right);
479479

@@ -504,7 +504,7 @@ public void TestAllocateSpaceForNextRange()
504504
// Adding columns on the left
505505
wb = InitWorkBookForShiftTests();
506506
ws = wb.Worksheet("Test");
507-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
507+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
508508

509509
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Left, ShiftType.Row);
510510

@@ -535,7 +535,7 @@ public void TestAllocateSpaceForNextRange()
535535
// Adding columns on the right
536536
wb = InitWorkBookForShiftTests();
537537
ws = wb.Worksheet("Test");
538-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
538+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
539539

540540
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Right, ShiftType.Row);
541541

@@ -566,7 +566,7 @@ public void TestAllocateSpaceForNextRange()
566566
// Adding nothing (without shift)
567567
wb = InitWorkBookForShiftTests();
568568
ws = wb.Worksheet("Test");
569-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
569+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
570570

571571
ExcelHelper.AllocateSpaceForNextRange(range, Direction.Top, ShiftType.NoShift);
572572

@@ -602,7 +602,7 @@ public void TestDeleteRange()
602602
// Deleting with moving cells up
603603
var wb = InitWorkBookForShiftTests();
604604
var ws = wb.Worksheet("Test");
605-
var range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
605+
var range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
606606

607607
ExcelHelper.DeleteRange(range, ShiftType.Cells);
608608

@@ -632,7 +632,7 @@ public void TestDeleteRange()
632632
// Deleting with moving the row up
633633
wb = InitWorkBookForShiftTests();
634634
ws = wb.Worksheet("Test");
635-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
635+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
636636

637637
ExcelHelper.DeleteRange(range, ShiftType.Row);
638638

@@ -662,7 +662,7 @@ public void TestDeleteRange()
662662
// Deleting with moving cells left
663663
wb = InitWorkBookForShiftTests();
664664
ws = wb.Worksheet("Test");
665-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
665+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
666666

667667
ExcelHelper.DeleteRange(range, ShiftType.Cells, XLShiftDeletedCells.ShiftCellsLeft);
668668

@@ -692,7 +692,7 @@ public void TestDeleteRange()
692692
// Deleting with moving the column left
693693
wb = InitWorkBookForShiftTests();
694694
ws = wb.Worksheet("Test");
695-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
695+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
696696

697697
ExcelHelper.DeleteRange(range, ShiftType.Row, XLShiftDeletedCells.ShiftCellsLeft);
698698

@@ -722,7 +722,7 @@ public void TestDeleteRange()
722722
// Deleting without any shift
723723
wb = InitWorkBookForShiftTests();
724724
ws = wb.Worksheet("Test");
725-
range = ws.NamedRange("TestRange").Ranges.ElementAt(0);
725+
range = ws.DefinedName("TestRange").Ranges.ElementAt(0);
726726

727727
ExcelHelper.DeleteRange(range, ShiftType.NoShift);
728728

@@ -812,7 +812,7 @@ public void TestMoveNamedRange()
812812
var ws = wb.AddWorksheet("Test");
813813
var range = ws.Range(6, 5, 9, 7);
814814
range.AddToNamed("TestRange", XLScope.Worksheet);
815-
var namedRange = ws.NamedRange("TestRange");
815+
var namedRange = ws.DefinedName("TestRange");
816816

817817
range.FirstCell().Value = "RangeStart";
818818
range.LastCell().Value = "RangeEnd";
@@ -824,7 +824,7 @@ public void TestMoveNamedRange()
824824
var movedNamedRange = ExcelHelper.MoveNamedRange(namedRange, ws.Cell(10, 8));
825825
var movedRange = movedNamedRange.Ranges.ElementAt(0);
826826

827-
Assert.AreEqual(movedNamedRange, ws.NamedRange("TestRange"));
827+
Assert.AreEqual(movedNamedRange, ws.DefinedName("TestRange"));
828828
Assert.AreEqual(1, movedNamedRange.Ranges.Count);
829829
Assert.AreEqual(2, ws.CellsUsed(XLCellsUsedOptions.Contents).Count());
830830
Assert.AreEqual(range.FirstCell(), ws.Cell(6, 5));
@@ -845,7 +845,7 @@ public void TestMoveNamedRange()
845845
var movedNamedRange2 = ExcelHelper.MoveNamedRange(movedNamedRange, ws.Cell(11, 8));
846846
var movedRange2 = movedNamedRange2.Ranges.ElementAt(0);
847847

848-
Assert.AreEqual(movedNamedRange2, ws.NamedRange("TestRange"));
848+
Assert.AreEqual(movedNamedRange2, ws.DefinedName("TestRange"));
849849
Assert.AreEqual(1, movedNamedRange2.Ranges.Count);
850850
Assert.AreEqual(2, ws.CellsUsed(XLCellsUsedOptions.Contents).Count());
851851
Assert.AreEqual(movedRange.FirstCell(), ws.Cell(10, 8));
@@ -935,8 +935,15 @@ public void TestMergeRanges()
935935
ExceptionAssert.Throws<InvalidOperationException>(() => ExcelHelper.MergeRanges(range1, range3),
936936
"Ranges belong to different worksheets");
937937

938+
// ClosedXML >= 0.104.0: Ranges are no longer deleted in the usual way (https://github.com/ClosedXML/ClosedXML/issues/2429)
938939
range1.Delete(XLShiftDeletedCells.ShiftCellsLeft);
939940

941+
// Assert.AreEqual(range2, ExcelHelper.MergeRanges(range1, range2));
942+
// Assert.IsNull(ExcelHelper.MergeRanges(range1, null));
943+
944+
Assert.AreEqual(ws.Range(ws.Cell(3, 3), ws.Cell(6, 6)), ExcelHelper.MergeRanges(range1, range2));
945+
Assert.AreEqual(range1, ExcelHelper.MergeRanges(range1, null));
946+
940947
range1 = ws.Range(3, 3, 5, 5);
941948
range2.Delete(XLShiftDeletedCells.ShiftCellsLeft);
942949

‎ExcelReportGenerator.Tests/ExcelReportGenerator.Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1717
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
1818
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
20-
<PackageReference Include="NSubstitute" Version="5.1.0" />
21-
<PackageReference Include="NUnit" Version="4.0.1" />
22-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
23-
<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
20+
<PackageReference Include="NSubstitute" Version="5.3.0" />
21+
<PackageReference Include="NUnit" Version="4.3.2" />
22+
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
23+
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

‎ExcelReportGenerator.Tests/GlobalSetup.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ public class GlobalSetup
88
[OneTimeSetUp]
99
public void SetUp()
1010
{
11-
var culture = new CultureInfo("ka-GE");
11+
var culture = new CultureInfo("ru-RU");
1212

1313
CultureInfo.CurrentCulture = culture;
1414
CultureInfo.CurrentUICulture = culture;
1515

16-
culture.DateTimeFormat.ShortTimePattern = "H:mm:ss";
17-
culture.DateTimeFormat.LongTimePattern = "H:mm:ss";
18-
1916
Thread.CurrentThread.CurrentCulture = culture;
2017
Thread.CurrentThread.CurrentUICulture = culture;
2118
}

0 commit comments

Comments
 (0)