Format with dotnet format

Shane32 · Dec 8, 2023 · 7552718 · 7552718
1 parent 68a4c01
commit 7552718
Show file tree

Hide file tree

Showing 17 changed files with 248 additions and 171 deletions.
diff --git a/src/Shane32.ExcelLinq.Tests/Builders/Column.cs b/src/Shane32.ExcelLinq.Tests/Builders/Column.cs
@@ -69,12 +69,8 @@ public void CantAddDuplicateColumnName()
             var builder = new ExcelModelBuilder();
             var sheetBuilder = builder.Sheet<Class1>();
             var columnBuilder = sheetBuilder.Column(x => x.StringColumn, "Column1");
-            Assert.ThrowsException<ArgumentException>(() => {
-                columnBuilder.AlternateName("Column1");
-            });
-            Assert.ThrowsException<ArgumentException>(() => {
-                columnBuilder.AlternateName("COLUMN1");
-            });
+            Assert.ThrowsException<ArgumentException>(() => columnBuilder.AlternateName("Column1"));
+            Assert.ThrowsException<ArgumentException>(() => columnBuilder.AlternateName("COLUMN1"));
         }
 
         [TestMethod]
@@ -83,9 +79,7 @@ public void CantAddDuplicateColumnTwice()
             var builder = new ExcelModelBuilder();
             var sheetBuilder = builder.Sheet<Class1>();
             var columnBuilder = sheetBuilder.Column(x => x.StringColumn, "Column1");
-            Assert.ThrowsException<InvalidOperationException>(() => {
-                sheetBuilder.Column(x => x.StringColumn, "Column2");
-            });
+            Assert.ThrowsException<InvalidOperationException>(() => sheetBuilder.Column(x => x.StringColumn, "Column2"));
         }
 
         [TestMethod]

diff --git a/src/Shane32.ExcelLinq.Tests/Builders/Sheet.cs b/src/Shane32.ExcelLinq.Tests/Builders/Sheet.cs
@@ -65,22 +65,18 @@ public void AddSheetMultipleNames()
         public void CantAddNullSheetName()
         {
             var builder = new ExcelModelBuilder();
-            Assert.ThrowsException<ArgumentNullException>(() => { builder.Sheet<Class1>(null); });
+            Assert.ThrowsException<ArgumentNullException>(() => builder.Sheet<Class1>(null));
             var sheet = builder.Sheet<Class1>();
-            Assert.ThrowsException<ArgumentNullException>(() => { sheet.AlternateName(null); });
+            Assert.ThrowsException<ArgumentNullException>(() => sheet.AlternateName(null));
         }
 
         [TestMethod]
         public void CantAddDuplicateSheetName()
         {
             var builder = new ExcelModelBuilder();
             var sheetBuilder = builder.Sheet<Class1>("Sheet1");
-            Assert.ThrowsException<ArgumentException>(() => {
-                sheetBuilder.AlternateName("Sheet1");
-            });
-            Assert.ThrowsException<ArgumentException>(() => {
-                sheetBuilder.AlternateName("SHEET1");
-            });
+            Assert.ThrowsException<ArgumentException>(() => sheetBuilder.AlternateName("Sheet1"));
+            Assert.ThrowsException<ArgumentException>(() => sheetBuilder.AlternateName("SHEET1"));
         }
 
         [TestMethod]

diff --git a/src/Shane32.ExcelLinq.Tests/General/EndToEnd.cs b/src/Shane32.ExcelLinq.Tests/General/EndToEnd.cs
@@ -55,7 +55,8 @@ public void ReadAndWrite()
             Assert.AreEqual(xl.GetSheet<Class1>().Count, xl2.GetSheet<Class1>().Count);
         }
 
-        public void ReadSample1File_test(TestFileContext xl) {
+        public void ReadSample1File_test(TestFileContext xl)
+        {
             var sheet1 = xl.GetSheet<TestFileContext.Sheet1>();
             var sheet2 = xl.GetSheet<Class1>();
             Assert.AreEqual(2, sheet1.Count);

diff --git a/src/Shane32.ExcelLinq.Tests/General/General.cs b/src/Shane32.ExcelLinq.Tests/General/General.cs
@@ -66,15 +66,11 @@ public void Constructor_Default()
             var mock = new Mock<ExcelContext>();
             mock.CallBase = true;
             mock.Protected().Setup("OnModelCreating", ItExpr.IsAny<ExcelModelBuilder>()).Callback<ExcelModelBuilder>(
-                (builder) => {
-                    builder.Sheet<Class1>();
-                }).Verifiable();
+                (builder) => builder.Sheet<Class1>()).Verifiable();
             var context = mock.Object;
             Assert.IsInstanceOfType(context.GetSheet<Class1>(), typeof(List<Class1>));
             Assert.AreEqual(0, context.GetSheet<Class1>().Count);
-            Assert.ThrowsException<KeyNotFoundException>(() => {
-                context.GetSheet<Class2>();
-            });
+            Assert.ThrowsException<KeyNotFoundException>(() => context.GetSheet<Class2>());
             mock.Verify();
         }
 
@@ -134,7 +130,8 @@ public void ModelNotYetValid()
 
         private class ExcelContextModelNotYetValid : ExcelContext
         {
-            protected override void OnModelCreating(ExcelModelBuilder modelBuilder) {
+            protected override void OnModelCreating(ExcelModelBuilder modelBuilder)
+            {
                 Assert.ThrowsException<InvalidOperationException>(() => Model);
                 Assert.ThrowsException<InvalidOperationException>(() => GetSheet<Class1>());
             }
@@ -170,6 +167,9 @@ public void Constructor_Stream()
             var mock = new Mock<ExcelContext>(stream);
             mock.CallBase = true;
             mock.Protected().Setup("OnModelCreating", ItExpr.IsAny<ExcelModelBuilder>()).Callback<ExcelModelBuilder>(
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(net48)'
+Before:
                 (builder) => {
                     builder.Sheet<Class1>("Sheet1");
                 }).Verifiable();
@@ -178,11 +178,30 @@ public void Constructor_Stream()
                 workbook => {
                     return new List<IList>(new IList[] { class1Data });
                 }).Verifiable();
-            var context = mock.Object;
+After:
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+*/
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            var class1Data = new List<Class1>();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { class1Data })).Verifiable();
+            var class1Data = new List<Class1>();
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(net48)'
+Before:
             Assert.AreEqual(class1Data, context.GetSheet<Class1>());
             Assert.ThrowsException<KeyNotFoundException>(() => {
                 context.GetSheet<Class2>();
             });
+After:
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { class1Data })).Verifiable();
+            var context = mock.Object;
+            Assert.AreEqual(class1Data, context.GetSheet<Class1>());
+            Assert.ThrowsException<KeyNotFoundException>(() => context.GetSheet<Class2>());
+*/
+            Assert.AreEqual(class1Data, context.GetSheet<Class1>());
+            Assert.ThrowsException<KeyNotFoundException>(() => context.GetSheet<Class2>());
             mock.Verify();
         }
 
@@ -226,13 +245,9 @@ public void Constructor_Stream_InvalidOnReadFile_1()
             var mock = new Mock<ExcelContext>(stream);
             mock.CallBase = true;
             mock.Protected().Setup("OnModelCreating", ItExpr.IsAny<ExcelModelBuilder>()).Callback<ExcelModelBuilder>(
-                (builder) => {
-                    builder.Sheet<Class1>("Sheet1");
-                }).Verifiable();
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
             mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
-                workbook => {
-                    return null;
-                }).Verifiable();
+                workbook => null).Verifiable();
             AssertThrowsInnerException<InvalidOperationException>(() => {
                 var context = mock.Object;
             });
@@ -250,13 +265,9 @@ public void Constructor_Stream_InvalidOnReadFile_2()
             var mock = new Mock<ExcelContext>(stream);
             mock.CallBase = true;
             mock.Protected().Setup("OnModelCreating", ItExpr.IsAny<ExcelModelBuilder>()).Callback<ExcelModelBuilder>(
-                (builder) => {
-                    builder.Sheet<Class1>("Sheet1");
-                }).Verifiable();
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
             mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
-                workbook => {
-                    return new List<IList>(); //wrong number of sheets
-                }).Verifiable();
+                workbook => new List<IList>()).Verifiable();
             AssertThrowsInnerException<InvalidOperationException>(() => {
                 var context = mock.Object;
             });
@@ -274,13 +285,9 @@ public void Constructor_Stream_InvalidOnReadFile_3()
             var mock = new Mock<ExcelContext>(stream);
             mock.CallBase = true;
             mock.Protected().Setup("OnModelCreating", ItExpr.IsAny<ExcelModelBuilder>()).Callback<ExcelModelBuilder>(
-                (builder) => {
-                    builder.Sheet<Class1>("Sheet1");
-                }).Verifiable();
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
             mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
-                workbook => {
-                    return new List<IList>(new IList[] { null }); //sheet is null
-                }).Verifiable();
+                workbook => new List<IList>(new IList[] { null })).Verifiable();
             AssertThrowsInnerException<InvalidOperationException>(() => {
                 var context = mock.Object;
             });
@@ -298,13 +305,84 @@ public void Constructor_Stream_InvalidOnReadFile_4()
             var mock = new Mock<ExcelContext>(stream);
             mock.CallBase = true;
             mock.Protected().Setup("OnModelCreating", ItExpr.IsAny<ExcelModelBuilder>()).Callback<ExcelModelBuilder>(
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(netcoreapp3.1)'
+Before:
                 (builder) => {
                     builder.Sheet<Class1>("Sheet1");
                 }).Verifiable();
             mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
                 workbook => {
                     return new List<IList>(new IList[] { new List<Class2>() }); //wrong type of sheet
                 }).Verifiable();
+After:
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { new List<Class2>() })).Verifiable();
+*/
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(net5.0)'
+Before:
+                (builder) => {
+                    builder.Sheet<Class1>("Sheet1");
+                }).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => {
+                    return new List<IList>(new IList[] { new List<Class2>() }); //wrong type of sheet
+                }).Verifiable();
+After:
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { new List<Class2>() })).Verifiable();
+*/
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(net6.0)'
+Before:
+                (builder) => {
+                    builder.Sheet<Class1>("Sheet1");
+                }).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => {
+                    return new List<IList>(new IList[] { new List<Class2>() }); //wrong type of sheet
+                }).Verifiable();
+After:
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { new List<Class2>() })).Verifiable();
+*/
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(net462)'
+Before:
+                (builder) => {
+                    builder.Sheet<Class1>("Sheet1");
+                }).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => {
+                    return new List<IList>(new IList[] { new List<Class2>() }); //wrong type of sheet
+                }).Verifiable();
+After:
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { new List<Class2>() })).Verifiable();
+*/
+
+/* Unmerged change from project 'Shane32.ExcelLinq.Tests(net48)'
+Before:
+                (builder) => {
+                    builder.Sheet<Class1>("Sheet1");
+                }).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => {
+                    return new List<IList>(new IList[] { new List<Class2>() }); //wrong type of sheet
+                }).Verifiable();
+After:
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { new List<Class2>() })).Verifiable();
+*/
+                (builder) => builder.Sheet<Class1>("Sheet1")).Verifiable();
+            mock.Protected().Setup<List<IList>>("OnReadFile", ItExpr.IsAny<ExcelWorkbook>()).Returns<ExcelWorkbook>(
+                workbook => new List<IList>(new IList[] { new List<Class2>() })).Verifiable();
             AssertThrowsInnerException<InvalidOperationException>(() => {
                 var context = mock.Object;
             });
@@ -315,11 +393,10 @@ private void AssertThrowsInnerException<T>(Action action) where T : Exception
             try {
                 action();
                 Assert.Fail("No exception was thrown");
-            }
-            catch (TargetInvocationException e) {
+            } catch (TargetInvocationException e) {
                 Assert.IsInstanceOfType(e.InnerException, typeof(T));
             }
         }
-        
+
     }
 }
diff --git a/src/Shane32.ExcelLinq.Tests/ModelInterfaces/IExcelModel.cs b/src/Shane32.ExcelLinq.Tests/ModelInterfaces/IExcelModel.cs
@@ -37,19 +37,15 @@ public void NullSheetType()
         {
             var context = new MyContext();
             Assert.ThrowsException<ArgumentNullException>(() => context.Model.Sheets[(Type)null]);
-            Assert.ThrowsException<ArgumentNullException>(() => {
-                context.Model.Sheets.TryGetValue((Type)null, out var value);
-            });
+            Assert.ThrowsException<ArgumentNullException>(() => context.Model.Sheets.TryGetValue((Type)null, out var value));
         }
 
         [TestMethod]
         public void NullSheetName()
         {
             var context = new MyContext();
             Assert.ThrowsException<ArgumentNullException>(() => context.Model.Sheets[(string)null]);
-            Assert.ThrowsException<ArgumentNullException>(() => {
-                context.Model.Sheets.TryGetValue((string)null, out var value);
-            });
+            Assert.ThrowsException<ArgumentNullException>(() => context.Model.Sheets.TryGetValue((string)null, out var value));
         }
 
         [TestMethod]
@@ -60,7 +56,8 @@ public void EnumerateSheets()
             var sheets = model.Sheets.ToList();
             var enumerator = ((IEnumerable)model.Sheets).GetEnumerator();
             var testCount = 0;
-            while (enumerator.MoveNext()) testCount++;
+            while (enumerator.MoveNext())
+                testCount++;
             Assert.AreEqual(2, testCount);
             Assert.AreEqual(2, sheets.Count);
             Assert.IsNotNull(sheets[0]);

diff --git a/src/Shane32.ExcelLinq.Tests/ModelInterfaces/ISheetModel.cs b/src/Shane32.ExcelLinq.Tests/ModelInterfaces/ISheetModel.cs
@@ -20,7 +20,8 @@ public void EnumerateColumns()
             var sheetModel = new MyContext().Model.Sheets[typeof(Class1)];
             var enumerator = ((IEnumerable)sheetModel.Columns).GetEnumerator();
             var testCount = 0;
-            while (enumerator.MoveNext()) testCount++;
+            while (enumerator.MoveNext())
+                testCount++;
             Assert.AreEqual(2, testCount);
             var columns = sheetModel.Columns.ToList();
             Assert.AreEqual(2, columns.Count);
@@ -69,9 +70,7 @@ public void NullColumnName()
             var context = new MyContext();
             var columns = context.Model.Sheets["Class1"].Columns;
             Assert.ThrowsException<ArgumentNullException>(() => columns[(string)null]);
-            Assert.ThrowsException<ArgumentNullException>(() => {
-                columns.TryGetValue((string)null, out var value);
-            });
+            Assert.ThrowsException<ArgumentNullException>(() => columns.TryGetValue((string)null, out var value));
         }
 
         private class MyContext : ExcelContext

diff --git a/src/Shane32.ExcelLinq.Tests/Models/Class1.cs b/src/Shane32.ExcelLinq.Tests/Models/Class1.cs
@@ -2,7 +2,7 @@
 
 namespace Shane32.ExcelLinq.Tests.Models
 {
-    class Class1
+    internal class Class1
     {
         public string StringColumn;
         public int IntColumn;

diff --git a/src/Shane32.ExcelLinq.Tests/Models/Class2.cs b/src/Shane32.ExcelLinq.Tests/Models/Class2.cs
@@ -2,7 +2,7 @@
 
 namespace Shane32.ExcelLinq.Tests.Models
 {
-    class Class2
+    internal class Class2
     {
         public string StringColumn { get; set; }
         public int? IntColumn { get; set; }

diff --git a/src/Shane32.ExcelLinq.Tests/Models/Class3.cs b/src/Shane32.ExcelLinq.Tests/Models/Class3.cs
@@ -1,6 +1,6 @@
 namespace Shane32.ExcelLinq.Tests.Models
 {
-    class Class3
+    internal class Class3
     {
         public int Invalid1 { get; }
         public int Invalid2 { set { } }

diff --git a/src/Shane32.ExcelLinq.Tests/Models/TestFileContext.cs b/src/Shane32.ExcelLinq.Tests/Models/TestFileContext.cs
@@ -88,7 +88,8 @@ protected override void OnModelCreating(ExcelModelBuilder builder)
         protected override object OnReadRow(ExcelRange range, ISheetModel model, IColumnModel[] columnMapping)
         {
             //skip rows where the first column is blank
-            if (range.Worksheet.Cells[range.Start.Row, 1].Value == null) return null;
+            if (range.Worksheet.Cells[range.Start.Row, 1].Value == null)
+                return null;
 
             return base.OnReadRow(range, model, columnMapping);
         }

diff --git a/src/Shane32.ExcelLinq.Tests/Reading/OnReadFile.cs b/src/Shane32.ExcelLinq.Tests/Reading/OnReadFile.cs
@@ -214,9 +214,7 @@ public void MissingSheet()
         public void InvalidParametersThrows()
         {
             var context = new SampleContext();
-            Assert.ThrowsException<ArgumentNullException>(() => {
-                context.TestOnReadFile(null);
-            });
+            Assert.ThrowsException<ArgumentNullException>(() => context.TestOnReadFile(null));
         }
     }
 }