Skip to content

Commit f2af484

Browse files
traf72traf72
committed
Fix grammatical error in names
1 parent ade35d2 commit f2af484

File tree

29 files changed

+130
-130
lines changed

29 files changed

+130
-130
lines changed

‎ExcelReportGenerator.Tests/CustomAsserts/ExcelAssert.cs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace ExcelReportGenerator.Tests.CustomAsserts;
55

66
public class ExcelAssert
77
{
8-
public static void AreWorksheetsContentEquals(IXLWorksheet expected, IXLWorksheet actual)
8+
public static void AreWorksheetsContentEqual(IXLWorksheet expected, IXLWorksheet actual)
99
{
1010
if (expected == actual)
1111
{
@@ -98,22 +98,22 @@ string GetErrorMessage(string propName) =>
9898
Assert.AreEqual(expectedCell.DataType, actualCell.DataType,
9999
$"Cell {expectedCell.Address} DataType failed.");
100100
Assert.AreEqual(expectedCell.Active, actualCell.Active, $"Cell {expectedCell.Address} Active failed.");
101-
AreColumnsEquals(expectedCell.WorksheetColumn(), actualCell.WorksheetColumn(),
101+
AreColumnsEqual(expectedCell.WorksheetColumn(), actualCell.WorksheetColumn(),
102102
$"Column {actualCell.WorksheetColumn().RangeAddress} {{0}} failed.");
103-
AreRowEquals(expectedCell.WorksheetRow(), actualCell.WorksheetRow(),
103+
AreRowEqual(expectedCell.WorksheetRow(), actualCell.WorksheetRow(),
104104
$"Row {actualCell.WorksheetRow().RangeAddress} {{0}} failed.");
105-
AreCellsStyleEquals(expectedCell.Style, actualCell.Style,
105+
AreCellsStyleEqual(expectedCell.Style, actualCell.Style,
106106
$"Cell {expectedCell.Address} Style {{0}} failed.");
107-
AreCellsCommentEquals(expectedCell.GetComment(), actualCell.GetComment(),
107+
AreCellsCommentEqual(expectedCell.GetComment(), actualCell.GetComment(),
108108
$"Cell {expectedCell.Address} Comment {{0}} failed.");
109109
}
110110

111-
AreMergedRangesEquals(expected.MergedRanges, actual.MergedRanges);
112-
AreNamedRangesEquals(expected.NamedRanges, actual.NamedRanges);
113-
ArePageSetupEquals(expected.PageSetup, actual.PageSetup, "PageSetup {0} failed.");
111+
AreMergedRangesEqual(expected.MergedRanges, actual.MergedRanges);
112+
AreNamedRangesEqual(expected.NamedRanges, actual.NamedRanges);
113+
ArePageSetupEqual(expected.PageSetup, actual.PageSetup, "PageSetup {0} failed.");
114114
}
115115

116-
public static void AreWorkbooksContentEquals(XLWorkbook expected, XLWorkbook actual)
116+
public static void AreWorkbooksContentEqual(XLWorkbook expected, XLWorkbook actual)
117117
{
118118
if (expected == actual)
119119
{
@@ -127,14 +127,14 @@ public static void AreWorkbooksContentEquals(XLWorkbook expected, XLWorkbook act
127127
}
128128

129129
Assert.AreEqual(expected.NamedRanges.Count(), actual.NamedRanges.Count(), "Workbook named ranges count failed");
130-
AreNamedRangesEquals(expected.NamedRanges, actual.NamedRanges);
130+
AreNamedRangesEqual(expected.NamedRanges, actual.NamedRanges);
131131
for (var i = 0; i < expected.Worksheets.Count; i++)
132132
{
133-
AreWorksheetsContentEquals(expected.Worksheet(i + 1), actual.Worksheet(i + 1));
133+
AreWorksheetsContentEqual(expected.Worksheet(i + 1), actual.Worksheet(i + 1));
134134
}
135135
}
136136

137-
public static void AreColumnsEquals(IXLColumn expected, IXLColumn actual, string message = null)
137+
public static void AreColumnsEqual(IXLColumn expected, IXLColumn actual, string message = null)
138138
{
139139
if (expected.Equals(actual))
140140
{
@@ -147,7 +147,7 @@ public static void AreColumnsEquals(IXLColumn expected, IXLColumn actual, string
147147
Assert.AreEqual(expected.Width, actual.Width, 1e-6, string.Format(message, "Width"));
148148
}
149149

150-
public static void AreRowEquals(IXLRow expected, IXLRow actual, string message = null)
150+
public static void AreRowEqual(IXLRow expected, IXLRow actual, string message = null)
151151
{
152152
if (expected.Equals(actual))
153153
{
@@ -160,7 +160,7 @@ public static void AreRowEquals(IXLRow expected, IXLRow actual, string message =
160160
Assert.AreEqual(expected.Height, actual.Height, 1e-6, string.Format(message, "Height"));
161161
}
162162

163-
public static void AreCellsStyleEquals(IXLStyle expected, IXLStyle actual, string message = null)
163+
public static void AreCellsStyleEqual(IXLStyle expected, IXLStyle actual, string message = null)
164164
{
165165
if (expected.Equals(actual))
166166
{
@@ -177,7 +177,7 @@ public static void AreCellsStyleEquals(IXLStyle expected, IXLStyle actual, strin
177177
Assert.AreEqual(expected.Protection, actual.Protection, string.Format(message, "Protection"));
178178
}
179179

180-
public static void AreCellsCommentEquals(IXLComment expected, IXLComment actual, string message = null)
180+
public static void AreCellsCommentEqual(IXLComment expected, IXLComment actual, string message = null)
181181
{
182182
if (expected == actual)
183183
{
@@ -190,7 +190,7 @@ public static void AreCellsCommentEquals(IXLComment expected, IXLComment actual,
190190
Assert.AreEqual(expected.Count, actual.Count, string.Format(message, "Count"));
191191
}
192192

193-
private static void AreMergedRangesEquals(IXLRanges expected, IXLRanges actual)
193+
private static void AreMergedRangesEqual(IXLRanges expected, IXLRanges actual)
194194
{
195195
Assert.AreEqual(expected.Count(), actual.Count(), "Worksheet merged ranges count failed");
196196
var expectedArray = expected
@@ -215,7 +215,7 @@ private static void AreMergedRangesEquals(IXLRanges expected, IXLRanges actual)
215215
}
216216
}
217217

218-
public static void AreNamedRangesEquals(IXLNamedRanges expected, IXLNamedRanges actual)
218+
public static void AreNamedRangesEqual(IXLNamedRanges expected, IXLNamedRanges actual)
219219
{
220220
Assert.AreEqual(expected.Count(), actual.Count(), "Worksheet named ranges count failed");
221221
foreach (var expectedNamedRange in expected)
@@ -237,7 +237,7 @@ public static void AreNamedRangesEquals(IXLNamedRanges expected, IXLNamedRanges
237237
}
238238
}
239239

240-
public static void ArePageSetupEquals(IXLPageSetup expected, IXLPageSetup actual, string message = null)
240+
public static void ArePageSetupEqual(IXLPageSetup expected, IXLPageSetup actual, string message = null)
241241
{
242242
if (expected == actual)
243243
{

‎ExcelReportGenerator.Tests/Rendering/DefaultReportGeneratorTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public void TestRender()
303303

304304
reportGenerator.Render(wb);
305305

306-
ExcelAssert.AreWorkbooksContentEquals(
306+
ExcelAssert.AreWorkbooksContentEqual(
307307
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest), nameof(TestRender)), wb);
308308

309309
// wb.SaveAs("test.xlsx");
@@ -339,7 +339,7 @@ public void TestRenderWithEvents()
339339

340340
reportGenerator.Render(wb);
341341

342-
ExcelAssert.AreWorkbooksContentEquals(
342+
ExcelAssert.AreWorkbooksContentEqual(
343343
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest), nameof(TestRenderWithEvents)), wb);
344344

345345
//wb.SaveAs("test.xlsx");
@@ -413,7 +413,7 @@ public void TestRenderPartialWorksheets()
413413

414414
reportGenerator.Render(wb, new[] {sheet1});
415415

416-
ExcelAssert.AreWorkbooksContentEquals(
416+
ExcelAssert.AreWorkbooksContentEqual(
417417
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest), nameof(TestRenderPartialWorksheets)),
418418
wb);
419419

@@ -441,7 +441,7 @@ public void TestRenderWithCustomVariableAndFunctionProviders()
441441

442442
reportGenerator.Render(wb);
443443

444-
ExcelAssert.AreWorkbooksContentEquals(
444+
ExcelAssert.AreWorkbooksContentEqual(
445445
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest),
446446
nameof(TestRenderWithCustomVariableAndFunctionProviders)), wb);
447447

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/ExcelDataSourcePanelTest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public void TestGroupResultVertical()
231231
SetResultRange(panel, range);
232232
method.Invoke(panel, null);
233233

234-
ExcelAssert.AreWorkbooksContentEquals(
234+
ExcelAssert.AreWorkbooksContentEqual(
235235
TestHelper.GetExpectedWorkbook(nameof(ExcelDataSourcePanelTest), nameof(TestGroupResultVertical)), wb);
236236

237237
//wb.SaveAs("test.xlsx");
@@ -302,7 +302,7 @@ public void TestGroupResultVertical_WithoutGroupingBlankValues()
302302
SetResultRange(panel, range);
303303
method.Invoke(panel, null);
304304

305-
ExcelAssert.AreWorkbooksContentEquals(
305+
ExcelAssert.AreWorkbooksContentEqual(
306306
TestHelper.GetExpectedWorkbook(nameof(ExcelDataSourcePanelTest), nameof(TestGroupResultVertical_WithoutGroupingBlankValues)), wb);
307307

308308
//wb.SaveAs("test.xlsx");
@@ -425,7 +425,7 @@ public void TestGroupResultHorizontal()
425425
SetResultRange(panel, range);
426426
method.Invoke(panel, null);
427427

428-
ExcelAssert.AreWorkbooksContentEquals(
428+
ExcelAssert.AreWorkbooksContentEqual(
429429
TestHelper.GetExpectedWorkbook(nameof(ExcelDataSourcePanelTest), nameof(TestGroupResultHorizontal)), wb);
430430

431431
//wb.SaveAs("test.xlsx");
@@ -497,7 +497,7 @@ public void TestGroupResultHorizontal_WithoutGroupingBlankValues()
497497
SetResultRange(panel, range);
498498
method.Invoke(panel, null);
499499

500-
ExcelAssert.AreWorkbooksContentEquals(
500+
ExcelAssert.AreWorkbooksContentEqual(
501501
TestHelper.GetExpectedWorkbook(nameof(ExcelDataSourcePanelTest), nameof(TestGroupResultHorizontal_WithoutGroupingBlankValues)), wb);
502502

503503
//wb.SaveAs("test.xlsx");

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanelDataReaderRenderTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void TestRenderDataReader()
4444

4545
Assert.AreEqual(ws.Range(2, 2, 9, 7), panel.ResultRange);
4646

47-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
47+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
4848
nameof(DataSourceDynamicPanelDataReaderRenderTest),
4949
nameof(TestRenderDataReader)), ws.Workbook);
5050

@@ -86,7 +86,7 @@ public void TestRenderDataReader_HorizontalPanel()
8686

8787
Assert.AreEqual(ws.Range(2, 2, 7, 7), panel.ResultRange);
8888

89-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
89+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
9090
nameof(DataSourceDynamicPanelDataReaderRenderTest),
9191
nameof(TestRenderDataReader_HorizontalPanel)), ws.Workbook);
9292

@@ -120,7 +120,7 @@ public void TestRenderEmptyDataReader()
120120

121121
Assert.AreEqual(ws.Range(2, 2, 3, 7), panel.ResultRange);
122122

123-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
123+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
124124
nameof(DataSourceDynamicPanelDataReaderRenderTest),
125125
nameof(TestRenderEmptyDataReader)), ws.Workbook);
126126

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void TestRenderDataSetWithEvents()
4444

4545
Assert.AreEqual(ws.Range(2, 2, 7, 8), panel.ResultRange);
4646

47-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
47+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
4848
nameof(DataSourceDynamicPanelDataSetRenderTest),
4949
nameof(TestRenderDataSetWithEvents)), ws.Workbook);
5050

@@ -85,7 +85,7 @@ public void TestRenderDataSetWithEvents_HorizontalPanel()
8585

8686
Assert.AreEqual(ws.Range(2, 2, 8, 6), panel.ResultRange);
8787

88-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
88+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
8989
nameof(DataSourceDynamicPanelDataSetRenderTest),
9090
nameof(TestRenderDataSetWithEvents_HorizontalPanel)), ws.Workbook);
9191

@@ -142,7 +142,7 @@ public void TestDynamicPanelAfterRenderEvent()
142142

143143
Assert.AreEqual(ws.Range(2, 2, 6, 7), panel.ResultRange);
144144

145-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
145+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
146146
nameof(DataSourceDynamicPanelDataSetRenderTest),
147147
nameof(TestDynamicPanelAfterRenderEvent)), ws.Workbook);
148148

@@ -167,7 +167,7 @@ public void TestRenderEmptyDataSet()
167167

168168
Assert.AreEqual(ws.Range(2, 2, 3, 7), panel.ResultRange);
169169

170-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
170+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
171171
nameof(DataSourceDynamicPanelDataSetRenderTest),
172172
nameof(TestRenderEmptyDataSet)), ws.Workbook);
173173

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanelDataTableRenderTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public void TestRenderDataTable()
3434

3535
Assert.AreEqual(ws.Range(2, 2, 6, 7), panel.ResultRange);
3636

37-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
37+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
3838
nameof(DataSourceDynamicPanelDataTableRenderTest),
3939
nameof(TestRenderDataTable)), ws.Workbook);
4040

@@ -68,7 +68,7 @@ public void TestRenderEmptyDataTable()
6868

6969
Assert.AreEqual(ws.Range(2, 2, 3, 7), panel.ResultRange);
7070

71-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
71+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
7272
nameof(DataSourceDynamicPanelDataTableRenderTest),
7373
nameof(TestRenderEmptyDataTable)), ws.Workbook);
7474

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanelDictionaryRenderTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void TestRenderDictionary()
4141

4242
Assert.AreEqual(ws.Range(9, 2, 13, 3), panel2.ResultRange);
4343

44-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
44+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
4545
nameof(DataSourceDynamicPanelDictionaryRenderTest),
4646
nameof(TestRenderDictionary)), ws.Workbook);
4747

@@ -128,7 +128,7 @@ public void TestRenderDictionaryEnumerable()
128128

129129
Assert.AreEqual(ws.Range(7, 2, 11, 2), panel2.ResultRange);
130130

131-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
131+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
132132
nameof(DataSourceDynamicPanelDictionaryRenderTest),
133133
nameof(TestRenderDictionaryEnumerable)), ws.Workbook);
134134

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanelEnumerableRenderTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void TestRenderEnumerable()
2525

2626
Assert.AreEqual(ws.Range(2, 2, 6, 5), panel.ResultRange);
2727

28-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
28+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
2929
nameof(DataSourceDynamicPanelEnumerableRenderTest),
3030
nameof(TestRenderEnumerable)), ws.Workbook);
3131

@@ -50,7 +50,7 @@ public void TestRenderEmptyEnumerable()
5050

5151
Assert.AreEqual(ws.Range(2, 2, 3, 5), panel.ResultRange);
5252

53-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
53+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
5454
nameof(DataSourceDynamicPanelEnumerableRenderTest),
5555
nameof(TestRenderEmptyEnumerable)), ws.Workbook);
5656

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanelSingleItemRenderTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void TestRenderSingleItem()
2525

2626
Assert.AreEqual(ws.Range(2, 2, 4, 5), panel.ResultRange);
2727

28-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
28+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
2929
nameof(DataSourceDynamicPanelSingleItemRenderTest),
3030
nameof(TestRenderSingleItem)), ws.Workbook);
3131

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourceDynamicPanelRenderTests/DataSourceDynamicPanel_InsideDataSourcePanel_Test.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public void TestRender_DynamicPanel_In_DataSourcePanel_Vertical()
3737

3838
Assert.AreEqual(ws.Range(1, 2, 12, 3), parentPanel.ResultRange);
3939

40-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
40+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
4141
nameof(DataSourceDynamicPanel_InsideDataSourcePanel_Test),
4242
nameof(TestRender_DynamicPanel_In_DataSourcePanel_Vertical)), ws.Workbook);
4343

@@ -77,7 +77,7 @@ public void TestRender_DynamicPanel_In_DataSourcePanel_Horizontal()
7777

7878
Assert.AreEqual(ws.Range(2, 1, 3, 12), parentPanel.ResultRange);
7979

80-
ExcelAssert.AreWorkbooksContentEquals(TestHelper.GetExpectedWorkbook(
80+
ExcelAssert.AreWorkbooksContentEqual(TestHelper.GetExpectedWorkbook(
8181
nameof(DataSourceDynamicPanel_InsideDataSourcePanel_Test),
8282
nameof(TestRender_DynamicPanel_In_DataSourcePanel_Horizontal)), ws.Workbook);
8383

0 commit comments

Comments
 (0)