Skip to content

Commit ccd1a47

Browse files
traf72traf72
committed
Use C#8 features and fix typos
1 parent d026187 commit ccd1a47

26 files changed

+97
-102
lines changed

‎ExcelReportGenerator.Samples/Extensions/DataReaderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public static class DataReaderExtensions
66
{
77
public static T GetValueSafe<T>(this IDataReader reader, int columnIndex)
88
{
9-
return reader.IsDBNull(columnIndex) ? default(T) : (T)reader.GetValue(columnIndex);
9+
return reader.IsDBNull(columnIndex) ? default : (T)reader.GetValue(columnIndex);
1010
}
1111
}
1212
}

‎ExcelReportGenerator.Tests/Configuration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static Configuration()
1515
_configuration = builder.Build();
1616
}
1717

18-
public static string TestDbConectionString
18+
public static string TestDbConnectionString
1919
{
2020
get
2121
{

‎ExcelReportGenerator.Tests/CustomAsserts/ExcelAssert.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static void AreColumnsEquals(IXLColumn expected, IXLColumn actual, string
7878
return;
7979
}
8080

81-
message = message ?? string.Empty;
81+
message ??= string.Empty;
8282
Assert.AreEqual(expected.IsHidden, actual.IsHidden, string.Format(message, "IsHidden"));
8383
Assert.AreEqual(expected.OutlineLevel, actual.OutlineLevel, string.Format(message, "OutlineLevel"));
8484
Assert.AreEqual(expected.Width, actual.Width, 1e-6, string.Format(message, "Width"));
@@ -91,7 +91,7 @@ public static void AreRowEquals(IXLRow expected, IXLRow actual, string message =
9191
return;
9292
}
9393

94-
message = message ?? string.Empty;
94+
message ??= string.Empty;
9595
Assert.AreEqual(expected.IsHidden, actual.IsHidden, string.Format(message, "IsHidden"));
9696
Assert.AreEqual(expected.OutlineLevel, actual.OutlineLevel, string.Format(message, "OutlineLevel"));
9797
Assert.AreEqual(expected.Height, actual.Height, 1e-6, string.Format(message, "Height"));
@@ -104,7 +104,7 @@ public static void AreCellsStyleEquals(IXLStyle expected, IXLStyle actual, strin
104104
return;
105105
}
106106

107-
message = message ?? string.Empty;
107+
message ??= string.Empty;
108108
Assert.AreEqual(expected.Border, actual.Border, string.Format(message, "Border"));
109109
Assert.AreEqual(expected.Alignment, actual.Alignment, string.Format(message, "Alignment"));
110110
Assert.AreEqual(expected.DateFormat, actual.DateFormat, string.Format(message, "DateFormat"));
@@ -121,7 +121,7 @@ public static void AreCellsCommentEquals(IXLComment expected, IXLComment actual,
121121
return;
122122
}
123123

124-
message = message ?? string.Empty;
124+
message ??= string.Empty;
125125
Assert.AreEqual(expected.Text, actual.Text, string.Format(message, "Text"));
126126
Assert.AreEqual(expected.Author, actual.Author, string.Format(message, "Author"));
127127
Assert.AreEqual(expected.Count, actual.Count, string.Format(message, "Count"));
@@ -172,7 +172,7 @@ public static void ArePageSetupEquals(IXLPageSetup expected, IXLPageSetup actual
172172
return;
173173
}
174174

175-
message = message ?? string.Empty;
175+
message ??= string.Empty;
176176

177177
Assert.AreEqual(expected.PagesTall, actual.PagesTall, string.Format(message, "PagesTall"));
178178
Assert.AreEqual(expected.PagesWide, actual.PagesWide, string.Format(message, "PagesWide"));

‎ExcelReportGenerator.Tests/Extensions/DataReaderExtensionsTest.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ExcelReportGenerator.Tests.Extensions
77
{
88
public class DataReaderExtensionsTest
99
{
10-
private readonly string _conStr = Configuration.TestDbConectionString;
10+
private readonly string _conStr = Configuration.TestDbConnectionString;
1111

1212
[Test]
1313
public void TestSafeGetValue()

‎ExcelReportGenerator.Tests/Rendering/DataProvider.cs‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class DataProvider
6060

6161
static DataProvider()
6262
{
63-
_conStr = Configuration.TestDbConectionString;
63+
_conStr = Configuration.TestDbConnectionString;
6464
}
6565

6666
public TestItem GetSingleItem()
@@ -131,28 +131,24 @@ public DataTable GetEmptyDataTable()
131131

132132
public DataSet GetAllCustomersDataSet()
133133
{
134-
using (var conn = new SqlConnection(_conStr))
135-
{
136-
conn.Open();
137-
var command = new SqlCommand(GetAllCustomersQuery(), conn);
138-
var adapter = new SqlDataAdapter(command);
139-
var ds = new DataSet();
140-
adapter.Fill(ds);
141-
return ds;
142-
}
134+
using var conn = new SqlConnection(_conStr);
135+
conn.Open();
136+
var command = new SqlCommand(GetAllCustomersQuery(), conn);
137+
var adapter = new SqlDataAdapter(command);
138+
var ds = new DataSet();
139+
adapter.Fill(ds);
140+
return ds;
143141
}
144142

145143
public DataSet GetEmptyDataSet()
146144
{
147-
using (var conn = new SqlConnection(_conStr))
148-
{
149-
conn.Open();
150-
var command = new SqlCommand(GetNoCustomersQuery(), conn);
151-
var adapter = new SqlDataAdapter(command);
152-
var ds = new DataSet();
153-
adapter.Fill(ds);
154-
return ds;
155-
}
145+
using var conn = new SqlConnection(_conStr);
146+
conn.Open();
147+
var command = new SqlCommand(GetNoCustomersQuery(), conn);
148+
var adapter = new SqlDataAdapter(command);
149+
var ds = new DataSet();
150+
adapter.Fill(ds);
151+
return ds;
156152
}
157153

158154
public IEnumerable<IDictionary<string, object>> GetDictionaryEnumerable()

‎ExcelReportGenerator.Tests/Rendering/DefaultReportGeneratorTest.cs‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ public void TestRender()
238238
XLWorkbook wb = report.Workbook;
239239
IXLWorksheet sheet1 = wb.AddWorksheet("Sheet1");
240240
IXLWorksheet sheet2 = wb.AddWorksheet("Sheet2");
241-
var reprotGenerator = new TestReportGenerator(report);
241+
var reportGenerator = new TestReportGenerator(report);
242242

243243
IXLRange parentRange = sheet1.Range(2, 2, 3, 5);
244244
parentRange.AddToNamed("d_Parent", XLScope.Worksheet);
@@ -306,7 +306,7 @@ public void TestRender()
306306
sheet2.Cell(2, 10).Value = "{sv:SheetName}";
307307
sheet2.Cell(3, 10).Value = "{sv:SheetNumber}";
308308

309-
reprotGenerator.Render(wb);
309+
reportGenerator.Render(wb);
310310

311311
ExcelAssert.AreWorkbooksContentEquals(
312312
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest), nameof(TestRender)), wb);
@@ -320,10 +320,10 @@ public void TestRenderWithEvents()
320320
var report = new TestReport();
321321
XLWorkbook wb = report.Workbook;
322322
IXLWorksheet sheet1 = wb.AddWorksheet("Sheet1");
323-
var reprotGenerator = new TestReportGenerator(report);
323+
var reportGenerator = new TestReportGenerator(report);
324324

325-
reprotGenerator.BeforeReportRender += (sender, args) => args.Workbook.AddWorksheet("DynamicSheet");
326-
reprotGenerator.BeforeWorksheetRender += (sender, args) =>
325+
reportGenerator.BeforeReportRender += (sender, args) => args.Workbook.AddWorksheet("DynamicSheet");
326+
reportGenerator.BeforeWorksheetRender += (sender, args) =>
327327
{
328328
if (args.Worksheet.Name == "DynamicSheet")
329329
{
@@ -332,7 +332,7 @@ public void TestRenderWithEvents()
332332
}
333333
};
334334

335-
reprotGenerator.AfterWorksheetRender += (sender, args) =>
335+
reportGenerator.AfterWorksheetRender += (sender, args) =>
336336
{
337337
if (args.Worksheet.Name == "Sheet1")
338338
{
@@ -342,7 +342,7 @@ public void TestRenderWithEvents()
342342

343343
sheet1.Cell(2, 2).Value = "{sv:SheetNumber}";
344344

345-
reprotGenerator.Render(wb);
345+
reportGenerator.Render(wb);
346346

347347
ExcelAssert.AreWorkbooksContentEquals(
348348
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest), nameof(TestRenderWithEvents)), wb);
@@ -357,7 +357,7 @@ public void TestRenderPartialWorksheets()
357357
XLWorkbook wb = report.Workbook;
358358
IXLWorksheet sheet1 = wb.AddWorksheet("Sheet1");
359359
IXLWorksheet sheet2 = wb.AddWorksheet("Sheet2");
360-
var reprotGenerator = new TestReportGenerator2(report);
360+
var reportGenerator = new TestReportGenerator2(report);
361361

362362
IXLRange parentRange = sheet1.Range(2, 2, 3, 5);
363363
parentRange.AddToNamed("d_Parent", XLScope.Worksheet);
@@ -416,7 +416,7 @@ public void TestRenderPartialWorksheets()
416416
sheet2.Cell(1, 1).Value = " { m:Format ( p:DateParam ) } ";
417417
sheet2.Cell(7, 1).Value = "{P:BoolParam}";
418418

419-
reprotGenerator.Render(wb, new[] {sheet1});
419+
reportGenerator.Render(wb, new[] {sheet1});
420420

421421
ExcelAssert.AreWorkbooksContentEquals(
422422
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest), nameof(TestRenderPartialWorksheets)),
@@ -431,7 +431,7 @@ public void TestRenderWithCustomVariableAndFunctionProviders()
431431
var report = new TestReport();
432432
XLWorkbook wb = report.Workbook;
433433
IXLWorksheet sheet1 = wb.AddWorksheet("Sheet1");
434-
var reprotGenerator = new TestReportGenerator(report)
434+
var reportGenerator = new TestReportGenerator(report)
435435
{
436436
SystemVariableProvider = new VariableProvider(),
437437
SystemFunctionsType = typeof(Functions),
@@ -444,7 +444,7 @@ public void TestRenderWithCustomVariableAndFunctionProviders()
444444
sheet1.Cell(2, 6).Value = "{sf:StaticFunc(p:IntParam)}";
445445
sheet1.Cell(2, 7).Value = "{sf:InstanceFunc(p:IntParam)}";
446446

447-
reprotGenerator.Render(wb);
447+
reportGenerator.Render(wb);
448448

449449
ExcelAssert.AreWorkbooksContentEquals(
450450
TestHelper.GetExpectedWorkbook(nameof(DefaultReportGeneratorTest),
@@ -461,10 +461,9 @@ public TestReportGenerator(object report) : base(report)
461461
{
462462
}
463463

464-
public override ITypeProvider TypeProvider => _typeProvider ?? (_typeProvider =
465-
new DefaultTypeProvider(
466-
new[] {Assembly.GetExecutingAssembly()},
467-
Report.GetType()));
464+
public override ITypeProvider TypeProvider => _typeProvider ??= new DefaultTypeProvider(
465+
new[] {Assembly.GetExecutingAssembly()},
466+
Report.GetType());
468467
}
469468

470469
private class TestReportGenerator2 : TestReportGenerator
@@ -476,8 +475,8 @@ public TestReportGenerator2(object report) : base(report)
476475
}
477476

478477
public override ITemplateProcessor TemplateProcessor =>
479-
_templateProcessor ?? (_templateProcessor = new TemplateProcessor(PropertyValueProvider,
480-
SystemVariableProvider, MethodCallValueProvider, DataItemValueProvider));
478+
_templateProcessor ??= new TemplateProcessor(PropertyValueProvider,
479+
SystemVariableProvider, MethodCallValueProvider, DataItemValueProvider);
481480
}
482481

483482
private class VariableProvider : SystemVariableProvider

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void TestRenderDictionaryEnumerable()
105105

106106
Assert.AreEqual(ws.Range(2, 2, 6, 4), panel1.ResultRange);
107107

108-
var dictWihtDecimalValues = new List<IDictionary<string, decimal>>
108+
var dictWithDecimalValues = new List<IDictionary<string, decimal>>
109109
{
110110
new Dictionary<string, decimal> { ["Value"] = 25.7m },
111111
new Dictionary<string, decimal> { ["Value"] = 250.7m },
@@ -119,7 +119,7 @@ public void TestRenderDictionaryEnumerable()
119119
ws.Cell(8, 2).Value = "{Data}";
120120
ws.Cell(9, 2).Value = "{Totals}";
121121

122-
var panel2 = new ExcelDataSourceDynamicPanel(dictWihtDecimalValues, ws.NamedRange("TestRange2"), report, report.TemplateProcessor);
122+
var panel2 = new ExcelDataSourceDynamicPanel(dictWithDecimalValues, ws.NamedRange("TestRange2"), report, report.TemplateProcessor);
123123
panel2.Render();
124124

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

‎ExcelReportGenerator.Tests/Rendering/Panels/ExcelPanels/PanelRenderTests/DataSourcePanelRenderTests/DataSourcePanelDictionaryRenderTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void TestRenderDictionaryEnumerable()
6464
var panel1 = new ExcelDataSourcePanel("m:DataProvider:GetDictionaryEnumerable()", ws.NamedRange("TestRange1"), report, report.TemplateProcessor);
6565
panel1.Render();
6666

67-
var dictWihtDecimalValues = new List<IDictionary<string, decimal>>
67+
var dictWithDecimalValues = new List<IDictionary<string, decimal>>
6868
{
6969
new Dictionary<string, decimal> { ["Value"] = 25.7m },
7070
new Dictionary<string, decimal> { ["Value"] = 250.7m },
@@ -76,7 +76,7 @@ public void TestRenderDictionaryEnumerable()
7676

7777
ws.Cell(2, 6).Value = "{di:Value}";
7878

79-
var panel2 = new ExcelDataSourcePanel(dictWihtDecimalValues, ws.NamedRange("TestRange2"), report, report.TemplateProcessor);
79+
var panel2 = new ExcelDataSourcePanel(dictWithDecimalValues, ws.NamedRange("TestRange2"), report, report.TemplateProcessor);
8080
panel2.Render();
8181

8282
Assert.AreEqual(ws.Range(2, 2, 4, 4), panel1.ResultRange);

‎ExcelReportGenerator.Tests/Rendering/Providers/ColumnsProvider/DataSetColumnsProviderTest.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class DataSetColumnsProviderTest
1313
[Test]
1414
public void TestGetColumnsList()
1515
{
16-
IGenericColumnsProvider<DataTable> dataTableColumsProvider = Substitute.For<IGenericColumnsProvider<DataTable>>();
16+
IGenericColumnsProvider<DataTable> dataTableColumnsProvider = Substitute.For<IGenericColumnsProvider<DataTable>>();
1717

1818
var dataTable1 = new DataTable("Table1");
1919
var dataTable2 = new DataTable("Table2");
@@ -22,21 +22,21 @@ public void TestGetColumnsList()
2222
Tables = { dataTable1, dataTable2 }
2323
};
2424

25-
IColumnsProvider columnsProvider = new DataSetColumnsProvider(dataTableColumsProvider);
25+
IColumnsProvider columnsProvider = new DataSetColumnsProvider(dataTableColumnsProvider);
2626
columnsProvider.GetColumnsList(dataSet);
27-
dataTableColumsProvider.Received(1).GetColumnsList(dataTable1);
27+
dataTableColumnsProvider.Received(1).GetColumnsList(dataTable1);
2828

29-
dataTableColumsProvider.ClearReceivedCalls();
29+
dataTableColumnsProvider.ClearReceivedCalls();
3030

31-
columnsProvider = new DataSetColumnsProvider(dataTableColumsProvider, "Table2");
31+
columnsProvider = new DataSetColumnsProvider(dataTableColumnsProvider, "Table2");
3232
columnsProvider.GetColumnsList(dataSet);
33-
dataTableColumsProvider.Received(1).GetColumnsList(dataTable2);
33+
dataTableColumnsProvider.Received(1).GetColumnsList(dataTable2);
3434

35-
dataTableColumsProvider.ClearReceivedCalls();
35+
dataTableColumnsProvider.ClearReceivedCalls();
3636

37-
columnsProvider = new DataSetColumnsProvider(dataTableColumsProvider, "BadTable");
37+
columnsProvider = new DataSetColumnsProvider(dataTableColumnsProvider, "BadTable");
3838
Assert.AreEqual(0, columnsProvider.GetColumnsList(dataSet).Count);
39-
dataTableColumsProvider.DidNotReceiveWithAnyArgs().GetColumnsList(Arg.Any<DataTable>());
39+
dataTableColumnsProvider.DidNotReceiveWithAnyArgs().GetColumnsList(Arg.Any<DataTable>());
4040
}
4141

4242
[Test]

‎ExcelReportGenerator.Tests/Rendering/Providers/ColumnsProvider/EnumerableColumnsProviderTest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ public class EnumerableColumnsProviderTest
1313
[Test]
1414
public void TestGetColumnsList()
1515
{
16-
IGenericColumnsProvider<Type> typeColumsProvider = Substitute.For<IGenericColumnsProvider<Type>>();
17-
IColumnsProvider columnsProvider = new EnumerableColumnsProvider(typeColumsProvider);
16+
IGenericColumnsProvider<Type> typeColumnsProvider = Substitute.For<IGenericColumnsProvider<Type>>();
17+
IColumnsProvider columnsProvider = new EnumerableColumnsProvider(typeColumnsProvider);
1818

1919
columnsProvider.GetColumnsList(columnsProvider.GetColumnsList(new ArrayList { new TypeColumnsProviderTest.TestType(), "str" }));
20-
typeColumsProvider.Received(1).GetColumnsList(typeof(TypeColumnsProviderTest.TestType));
20+
typeColumnsProvider.Received(1).GetColumnsList(typeof(TypeColumnsProviderTest.TestType));
2121

22-
typeColumsProvider.ClearReceivedCalls();
22+
typeColumnsProvider.ClearReceivedCalls();
2323

2424
columnsProvider.GetColumnsList(columnsProvider.GetColumnsList(new ArrayList { "str", new TypeColumnsProviderTest.TestType() }));
25-
typeColumsProvider.Received(1).GetColumnsList(typeof(string));
25+
typeColumnsProvider.Received(1).GetColumnsList(typeof(string));
2626
}
2727

2828
[Test]

0 commit comments

Comments
 (0)