Bump NUnit.Analyzers from 3.9.0 to 3.10.0 (#229)

* Bump NUnit.Analyzers from 3.9.0 to 3.10.0 Bumps [NUnit.Analyzers](https://github.com/nunit/nunit.analyzers) from 3.9.0 to 3.10.0. - [Release notes](https://github.com/nunit/nunit.analyzers/releases) - [Changelog](https://github.com/nunit/nunit.analyzers/blob/master/CHANGES.txt) - [Commits](nunit/nunit.analyzers@3.9.0...3.10.0) --- updated-dependencies: - dependency-name: NUnit.Analyzers dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * NUnit update 2 - no more string.Format --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: jas88 <[email protected]>
HicServices · Nov 29, 2023 · c22df1e · c22df1e
1 parent adf0ead
commit c22df1e
Show file tree

Hide file tree

Showing 19 changed files with 227 additions and 250 deletions.
diff --git a/FAnsiSql/FAnsi.csproj b/FAnsiSql/FAnsi.csproj
@@ -40,7 +40,7 @@
     </PackageReference>
     <PackageReference Include="MySqlConnector" Version="2.3.1" />
     <PackageReference Include="Npgsql" Version="8.0.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="3.9.0">
+    <PackageReference Include="NUnit.Analyzers" Version="3.10.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Tests/FAnsiTests/Aggregation/AggregationTests.cs b/Tests/FAnsiTests/Aggregation/AggregationTests.cs
@@ -88,7 +88,7 @@ private void SetupDatabaseTable(bool easy, string name)
 
     protected void AssertHasRow(DataTable dt, params object[] cells)
     {
-        Assert.That(dt.Rows.Cast<DataRow>().Any(r=>IsMatch(r,cells)),"Did not find expected row:{0}", string.Join("|",cells));
+        Assert.That(dt.Rows.Cast<DataRow>().Any(r => IsMatch(r, cells)),$"Did not find expected row:{string.Join("|", cells)}");
     }
 
     /// <summary>

diff --git a/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs b/Tests/FAnsiTests/Aggregation/CalendarWithPivotAggregationTests.cs
@@ -74,7 +74,7 @@ 2010	0	0	            0	0
 
             Assert.That(dt.Rows, Has.Count.EqualTo(10)); //there are 10 years between 2001 and 2010 even though not all years are represented in the data
 
-            // only validate hard output, we got rows on easy thats enough for now
+            // only validate hard output, we got rows on easy that's enough for now
             if (easy)
                 return;
 

diff --git a/Tests/FAnsiTests/All.cs b/Tests/FAnsiTests/All.cs
@@ -8,18 +8,18 @@ public class All
     /// <summary>
     /// <see cref="TestCaseSourceAttribute"/> for tests that should run on all DBMS
     /// </summary>
-    public static DatabaseType[] DatabaseTypes = {
+    public static DatabaseType[] DatabaseTypes = [
         DatabaseType.MicrosoftSQLServer,
         DatabaseType.MySql,
         DatabaseType.Oracle,
         DatabaseType.PostgreSql
-    };
+    ];
 
     /// <summary>
     /// <see cref="TestCaseSourceAttribute"/> for tests that should run on all DBMS
     /// with both permutations of true/false.  Matches exhaustively method signature (DatabaseType,bool)
     /// </summary>
-    public static object[] DatabaseTypesWithBoolFlags = {
+    public static object[] DatabaseTypesWithBoolFlags = [
         new object[] {DatabaseType.MicrosoftSQLServer,true},
         new object[] {DatabaseType.MySql,true},
         new object[] {DatabaseType.Oracle,true},
@@ -28,14 +28,14 @@ public class All
         new object[] {DatabaseType.MySql,false},
         new object[] {DatabaseType.Oracle,false},
         new object[] {DatabaseType.PostgreSql,false}
-    };
+    ];
 
 
     /// <summary>
     /// <see cref="TestCaseSourceAttribute"/> for tests that should run on all DBMS
     /// with all permutations of true/false for 2 args.  Matches exhaustively method signature (DatabaseType,bool,bool)
     /// </summary>
-    public static object[] DatabaseTypesWithTwoBoolFlags = {
+    public static object[] DatabaseTypesWithTwoBoolFlags = [
         new object[] {DatabaseType.MicrosoftSQLServer,true,true},
         new object[] {DatabaseType.MicrosoftSQLServer,true,false},
         new object[] {DatabaseType.MicrosoftSQLServer,false,true},
@@ -56,5 +56,5 @@ public class All
         new object[] {DatabaseType.PostgreSql,true,false},
         new object[] {DatabaseType.PostgreSql,false,true},
         new object[] {DatabaseType.PostgreSql,false,false}
-    };
+    ];
 }
diff --git a/Tests/FAnsiTests/CrossPlatformTests.cs b/Tests/FAnsiTests/CrossPlatformTests.cs
@@ -38,7 +38,7 @@ public void TestTableCreation_NullTableName(DatabaseType type)
     public void DateColumnTests_NoTime(DatabaseType type, object input)
     {
         var db = GetTestDatabase(type);
-        var tbl = db.CreateTable("MyTable",new []{new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))});
+        var tbl = db.CreateTable("MyTable",[new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))]);
 
         tbl.Insert(new Dictionary<string, object> { { "MyDate", input } });
 
@@ -71,7 +71,7 @@ public void DateColumnTests_NoTime(DatabaseType type, object input)
     public void DateColumnTests_UkUsFormat_Explicit(DatabaseType type, object input, string culture)
     {
         var db = GetTestDatabase(type);
-        var tbl = db.CreateTable("MyTable",new []{new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))});
+        var tbl = db.CreateTable("MyTable",[new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))]);
 
         var cultureInfo = new CultureInfo (culture);
 
@@ -112,10 +112,10 @@ public void DateColumnTests_UkUsFormat_Explicit(DatabaseType type, object input,
     public void DateColumnTests_PrimaryKeyColumn(DatabaseType type, object input, string culture)
     {
         var db = GetTestDatabase(type);
-        var tbl = db.CreateTable("MyTable",new []{
+        var tbl = db.CreateTable("MyTable",[
             new DatabaseColumnRequest("MyDate",new DatabaseTypeRequest(typeof(DateTime)))
                 {IsPrimaryKey = true }
-        });
+        ]);
 
         //then bulk insert, both need to work
         using (var blk = tbl.BeginBulkInsert(new CultureInfo(culture)))
@@ -149,7 +149,7 @@ public void DateColumnTests_PrimaryKeyColumn(DatabaseType type, object input, st
     public void DateColumnTests_TimeOnly_Midnight(DatabaseType type, object input)
     {
         var db = GetTestDatabase(type);
-        var tbl = db.CreateTable("MyTable", new[] { new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan))) });
+        var tbl = db.CreateTable("MyTable", [new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan)))]);
 
         tbl.Insert(new Dictionary<string, object> { { "MyTime", input } });
 
@@ -170,7 +170,7 @@ public void DateColumnTests_TimeOnly_Midnight(DatabaseType type, object input)
             type == DatabaseType.Oracle
             ? new[] { (DateTime)result.Rows[0][0], (DateTime)result.Rows[1][0] }.Select(dt => dt.TimeOfDay)
                 .Cast<object>().ToArray()
-            : new[] { result.Rows[0][0], result.Rows[1][0] };
+            : [result.Rows[0][0], result.Rows[1][0]];
 
         Assert.Multiple(() =>
         {
@@ -224,7 +224,7 @@ public void TestOracleTimespans()
     public void DateColumnTests_TimeOnly_Afternoon(DatabaseType type, object input)
     {
         var db = GetTestDatabase(type);
-        var tbl = db.CreateTable("MyTable", new[] { new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan))) });
+        var tbl = db.CreateTable("MyTable", [new DatabaseColumnRequest("MyTime", new DatabaseTypeRequest(typeof(TimeSpan)))]);
 
         tbl.Insert(new Dictionary<string, object> { { "MyTime", input } });
 
@@ -318,21 +318,21 @@ public void ForeignKeyCreationTest(DatabaseType type)
     {
         var database = GetTestDatabase(type);
 
-        var tblParent = database.CreateTable("Parent", new[]
-        {
+        var tblParent = database.CreateTable("Parent",
+        [
             new DatabaseColumnRequest("ID",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey =  true},
             new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),10)) //varchar(10)
-        });
+        ]);
 
         var parentIdPkCol = tblParent.DiscoverColumn("ID");
 
         var parentIdFkCol = new DatabaseColumnRequest("Parent_ID", new DatabaseTypeRequest(typeof (int)));
 
-        var tblChild = database.CreateTable("Child", new[]
-        {
+        var tblChild = database.CreateTable("Child",
+        [
             parentIdFkCol,
             new DatabaseColumnRequest("ChildName",new DatabaseTypeRequest(typeof(string),10)) //varchar(10)
-        }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn>
+        ], new Dictionary<DatabaseColumnRequest, DiscoveredColumn>
         {
             {parentIdFkCol, parentIdPkCol}
         },true);
@@ -398,25 +398,25 @@ public void ForeignKeyCreationTest_TwoColumns(DatabaseType type, bool cascadeDel
     {
         var database = GetTestDatabase(type);
 
-        var tblParent = database.CreateTable("Parent", new[]
-        {
+        var tblParent = database.CreateTable("Parent",
+        [
             new DatabaseColumnRequest("ID1",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey =  true}, //varchar(10)
             new DatabaseColumnRequest("ID2",new DatabaseTypeRequest(typeof(int))){IsPrimaryKey =  true}, //varchar(10)
             new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),10)) //varchar(10)
-        });
+        ]);
 
         var parentIdPkCol1 = tblParent.DiscoverColumn("ID1");
         var parentIdPkCol2 = tblParent.DiscoverColumn("ID2");
 
         var parentIdFkCol1 = new DatabaseColumnRequest("Parent_ID1", new DatabaseTypeRequest(typeof(int)));
         var parentIdFkCol2 = new DatabaseColumnRequest("Parent_ID2", new DatabaseTypeRequest(typeof(int)));
 
-        var tblChild = database.CreateTable("Child", new[]
-        {
+        var tblChild = database.CreateTable("Child",
+        [
             parentIdFkCol1,
             parentIdFkCol2,
             new DatabaseColumnRequest("ChildName",new DatabaseTypeRequest(typeof(string),10)) //varchar(10)
-        }, new Dictionary<DatabaseColumnRequest, DiscoveredColumn>
+        ], new Dictionary<DatabaseColumnRequest, DiscoveredColumn>
         {
             {parentIdFkCol1,parentIdPkCol1},
             {parentIdFkCol2,parentIdPkCol2}
@@ -483,15 +483,15 @@ public void CreateMaxVarcharColumns(DatabaseType type)
     {
         var database = GetTestDatabase(type);
 
-        var tbl = database.CreateTable("TestDistincting", new[]
-        {
+        var tbl = database.CreateTable("TestDistincting",
+        [
             new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),int.MaxValue)), //varchar(max)
             new DatabaseColumnRequest("Field2",new DatabaseTypeRequest(typeof(string))), //varchar(???)
             new DatabaseColumnRequest("Field3",new DatabaseTypeRequest(typeof(string),1000)), //varchar(???)
             new DatabaseColumnRequest("Field4",new DatabaseTypeRequest(typeof(string),5000)), //varchar(???)
             new DatabaseColumnRequest("Field5",new DatabaseTypeRequest(typeof(string),10000)), //varchar(???)
             new DatabaseColumnRequest("Field6",new DatabaseTypeRequest(typeof(string),10)) //varchar(10)
-        });
+        ]);
 
         Assert.Multiple(() =>
         {
@@ -556,10 +556,10 @@ public void AddColumnTest(DatabaseType type,bool useTransaction)
         var database = GetTestDatabase(type);
 
         //create a single column table with primary key
-        var tbl = database.CreateTable("TestDistincting", new[]
-        {
+        var tbl = database.CreateTable("TestDistincting",
+        [
             new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),100)){IsPrimaryKey = true} //varchar(max)
-        });
+        ]);
 
         Assert.Multiple(() =>
         {
@@ -646,12 +646,12 @@ public void TestDistincting(DatabaseType type,bool useTransaction, bool dodgyNam
         var database = GetTestDatabase(type);
 
         // JS 2023-05-11 4000 characters, because SELECT DISTINCT doesn't work on CLOB (Oracle)
-        var tbl = database.CreateTable(dodgyNames?",,":"Field3",new []
-        {
+        var tbl = database.CreateTable(dodgyNames?",,":"Field3",
+        [
             new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),4000)), //varchar(max)
             new DatabaseColumnRequest("Field2",new DatabaseTypeRequest(typeof(DateTime))),
             new DatabaseColumnRequest(dodgyNames?",,,,":"Field3",new DatabaseTypeRequest(typeof(int)))
-        });
+        ]);
 
         using var dt = new DataTable();
         dt.Columns.Add("Field1");
@@ -802,12 +802,12 @@ public void HorribleDatabaseAndTableNames(DatabaseType type,string horribleDatab
 
         try
         {
-            var tbl = database.CreateTable(horribleTableName, new[]
-            {
+            var tbl = database.CreateTable(horribleTableName,
+            [
                 new DatabaseColumnRequest("Field1",new DatabaseTypeRequest(typeof(string),int.MaxValue)), //varchar(max)
                 new DatabaseColumnRequest("Field2",new DatabaseTypeRequest(typeof(DateTime))),
                 new DatabaseColumnRequest("Field3",new DatabaseTypeRequest(typeof(int))){AllowNulls=false}
-            });
+            ]);
 
             using var dt = new DataTable();
             dt.Columns.Add("Field1");
@@ -882,19 +882,19 @@ public void UnsupportedEntityNames(DatabaseType type, string horribleDatabaseNam
         //CreateTable with illegal name
         StringAssert.IsMatch(
             "Table .* contained unsupported .* characters",
-            Assert.Throws<RuntimeNameException>(()=> database.CreateTable(horribleTableName, new DatabaseColumnRequest[]
-            {
+            Assert.Throws<RuntimeNameException>(()=> database.CreateTable(horribleTableName,
+            [
                 new("a", new DatabaseTypeRequest(typeof(string), 10))
-            }))
+            ]))
                 ?.Message);
 
         //CreateTable with (column) illegal name
         StringAssert.IsMatch(
             "Column .* contained unsupported .* characters",
-            Assert.Throws<RuntimeNameException>(()=> database.CreateTable("f", new DatabaseColumnRequest[]
-            {
+            Assert.Throws<RuntimeNameException>(()=> database.CreateTable("f",
+            [
                 new(columnName, new DatabaseTypeRequest(typeof(string), 10))
-            }))
+            ]))
                 ?.Message);
 
         AssertCanCreateDatabases();
@@ -959,8 +959,8 @@ public void CreateTable_AutoIncrementColumnTest(DatabaseType type)
     {
         var database = GetTestDatabase(type);
 
-        var tbl =  database.CreateTable("MyTable", new[]
-        {
+        var tbl =  database.CreateTable("MyTable",
+        [
             new DatabaseColumnRequest("IdColumn", new DatabaseTypeRequest(typeof (int)))
             {
                 AllowNulls = false,
@@ -969,7 +969,7 @@ public void CreateTable_AutoIncrementColumnTest(DatabaseType type)
             },
             new DatabaseColumnRequest("Name",new DatabaseTypeRequest(typeof(string),100))
 
-        });
+        ]);
 
         using var dt = new DataTable();
         dt.Columns.Add("Name");
@@ -999,15 +999,15 @@ public void CreateTable_DefaultTest_Date(DatabaseType type)
     {
         var database = GetTestDatabase(type);
 
-        var tbl = database.CreateTable("MyTable", new[]
-        {
+        var tbl = database.CreateTable("MyTable",
+        [
             new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100)),
             new DatabaseColumnRequest("myDt", new DatabaseTypeRequest(typeof (DateTime)))
             {
                 AllowNulls = false,
                 Default = MandatoryScalarFunctions.GetTodaysDate
             }
-        });
+        ]);
         DateTime currentValue;
 
         using (var insert = tbl.BeginBulkInsert())
@@ -1055,15 +1055,15 @@ public void CreateTable_DefaultTest_Guid(DatabaseType type)
             }
         }
 
-        var tbl = database.CreateTable("MyTable", new[]
-        {
+        var tbl = database.CreateTable("MyTable",
+        [
             new DatabaseColumnRequest("Name", new DatabaseTypeRequest(typeof(string),100)),
             new DatabaseColumnRequest("MyGuid", new DatabaseTypeRequest(typeof (string)))
             {
                 AllowNulls = false,
                 Default = MandatoryScalarFunctions.GetGuid
             }
-        });
+        ]);
 
         using (var insert = tbl.BeginBulkInsert())
         {
@@ -1088,12 +1088,12 @@ public void Test_BulkInserting_LotsOfDates(DatabaseType type)
         var culture = new CultureInfo("en-gb");
         var db = GetTestDatabase(type);
 
-        var tbl = db.CreateTable("LotsOfDatesTest",new DatabaseColumnRequest[]
-        {
+        var tbl = db.CreateTable("LotsOfDatesTest",
+        [
             new("ID",new DatabaseTypeRequest(typeof(int))),
             new("MyDate",new DatabaseTypeRequest(typeof(DateTime))),
             new("MyString",new DatabaseTypeRequest(typeof(string),int.MaxValue))
-        });
+        ]);
 
         //test basic insert
         foreach(var s in someDates)
@@ -1127,7 +1127,7 @@ public void Test_BulkInserting_LotsOfDates(DatabaseType type)
         Assert.That(tbl.GetRowCount(), Is.EqualTo(someDates.Length*2));
     }
 
-    private readonly string [] someDates = {
+    private readonly string [] someDates = [
         "22\\5\\19",
         "22/5/19",
         "22-5-19",
@@ -1368,7 +1368,7 @@ public void Test_BulkInserting_LotsOfDates(DatabaseType type)
         "08:59:36 AM",
         "08:59:36",
         "08:59:36 AM"
-    };
+    ];
 
 
 

diff --git a/Tests/FAnsiTests/Database/DatabaseLevelTests.cs b/Tests/FAnsiTests/Database/DatabaseLevelTests.cs
@@ -41,7 +41,7 @@ public void Test_CreateSchema(DatabaseType type)
         if (type is DatabaseType.MicrosoftSQLServer or DatabaseType.PostgreSql)
         {
             var tbl = db.CreateTable("Heyyy",
-                new[] {new DatabaseColumnRequest("fff", new DatabaseTypeRequest(typeof(string), 10))},"Fr ank");
+                [new DatabaseColumnRequest("fff", new DatabaseTypeRequest(typeof(string), 10))],"Fr ank");
 
             Assert.That(tbl.Exists());