chore: bump NUnit from 3.14.0 to 4.0.0 (#709)

DubUrl.Adomd.Testing/DubUrl.Adomd.Testing.csproj

@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.0.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />

DubUrl.Adomd.Testing/Mapping/NativeMapperIntrospectorTest.cs

@@ -30,8 +30,11 @@ public void Locate_OneMapperClass_ClassReturned()
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(PowerBiDesktopMapper)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(PowerBiDesktopMapper)));
+        });
     }
 
     [Test]
@@ -42,10 +45,13 @@ public void Locate_OneMapperClassWithBrand_ClassReturned()
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).Slug, Is.EqualTo("powerbi"));
-        Assert.That(result.ElementAt(0).MainColor.Length, Is.EqualTo(7));
-        Assert.That(result.ElementAt(0).SecondaryColor.Length, Is.EqualTo(7));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).Slug, Is.EqualTo("powerbi"));
+            Assert.That(result.ElementAt(0).MainColor.Length, Is.EqualTo(7));
+            Assert.That(result.ElementAt(0).SecondaryColor.Length, Is.EqualTo(7));
+        });
     }
 
     [Test]

DubUrl.Extensions.Testing/DubUrl.Extensions.Testing.csproj

@@ -10,7 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.0.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />

DubUrl.OleDb.Testing/DubUrl.OleDb.Testing.csproj

@@ -2,7 +2,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.0.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />

DubUrl.OleDb.Testing/Rewriting/OleDbRewriterTest.cs

@@ -108,8 +108,11 @@ public void Map_UrlInfoWithUsernamePassword_Authentication()
 
         Assert.That(result, Is.Not.Null);
         Assert.That(result, Does.ContainKey(OleDbRewriter.USERNAME_KEYWORD));
-        Assert.That(result[OleDbRewriter.USERNAME_KEYWORD], Is.EqualTo("user"));
-        Assert.That(result, Does.ContainKey(OleDbRewriter.PASSWORD_KEYWORD));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result[OleDbRewriter.USERNAME_KEYWORD], Is.EqualTo("user"));
+            Assert.That(result, Does.ContainKey(OleDbRewriter.PASSWORD_KEYWORD));
+        });
         Assert.That(result[OleDbRewriter.PASSWORD_KEYWORD], Is.EqualTo("pwd"));
     }
 

DubUrl.OleDb.Testing/WrapperMapperIntrospectorTest.cs

@@ -40,9 +40,12 @@ public void LocateWrapper_TwoGenericMappersClassesForOneDatabase_WrapperReturned
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(2));
-        Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(OdbcMapper)));
-        Assert.That(result.ElementAt(1).MapperType, Is.EqualTo(typeof(OleDbMapper)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(2));
+            Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(OdbcMapper)));
+            Assert.That(result.ElementAt(1).MapperType, Is.EqualTo(typeof(OleDbMapper)));
+        });
     }
 
     [Test]
@@ -57,8 +60,11 @@ public void LocateWrapper_TwoGenericMappersClassesForOneDatabaseButAlternative_W
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(OdbcMapper)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(OdbcMapper)));
+        });
     }
 
 }

DubUrl.QA/BaseAdomdProvider.cs

@@ -20,7 +20,7 @@ namespace DubUrl.QA;
 public abstract class BaseAdomdProvider
 {
     protected SchemeMapperBuilder SchemeMapperBuilder { get; set; }
-    public virtual string SelectPrimitiveTemplate(string type) => "EVALUATE DATATABLE(\"value\", " + type + ", {{$value; format=\"value\"$}})";
+    protected virtual string SelectPrimitiveTemplate(string type) => "EVALUATE DATATABLE(\"value\", " + type + ", {{$value; format=\"value\"$}})";
 
     [OneTimeSetUp]
     public void SetupFixture()
@@ -68,10 +68,13 @@ protected virtual void QueryCustomerScalarValueWithReader(string sql)
         using var cmd = conn.CreateCommand();
         cmd.CommandText = sql;
         var reader = cmd.ExecuteReader();
-        Assert.That(reader.Read(), Is.True);
-        Assert.That(reader.GetInt32(0), Is.EqualTo(1));
-        Assert.That(reader.GetString(1), Is.EqualTo("Nikola Tesla"));
-        Assert.That(reader.GetDateTime(2), Is.EqualTo(new DateTime(1856, 10, 7)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(reader.Read(), Is.True);
+            Assert.That(reader.GetInt32(0), Is.EqualTo(1));
+            Assert.That(reader.GetString(1), Is.EqualTo("Nikola Tesla"));
+            Assert.That(reader.GetDateTime(2), Is.EqualTo(new DateTime(1856, 10, 7)));
+        });
         Assert.That(reader.Read(), Is.False);
     }
 
@@ -316,10 +319,13 @@ protected void QueryCustomerWithDapper(string sql)
         using var conn = connectionUrl.Open();
         var customers = conn.Query<Dapper.Customer>(sql).ToList();
         Assert.That(customers, Has.Count.EqualTo(5));
-        Assert.That(customers.Select(x => x.CustomerId).Distinct().ToList(), Has.Count.EqualTo(5));
-        Assert.That(customers.Any(x => string.IsNullOrEmpty(x.FullName)), Is.False);
-        Assert.That(customers.Select(x => x.BirthDate).Distinct().ToList(), Has.Count.EqualTo(5));
-        Assert.That(customers.Any(x => x.BirthDate == DateTime.MinValue), Is.False);
+        Assert.Multiple(() =>
+        {
+            Assert.That(customers.Select(x => x.CustomerId).Distinct().ToList(), Has.Count.EqualTo(5));
+            Assert.That(customers.Any(x => string.IsNullOrEmpty(x.FullName)), Is.False);
+            Assert.That(customers.Select(x => x.BirthDate).Distinct().ToList(), Has.Count.EqualTo(5));
+            Assert.That(customers.Any(x => x.BirthDate == DateTime.MinValue), Is.False);
+        });
     }
 
     [Test]
@@ -340,9 +346,12 @@ public virtual void QueryCustomerWithDapperRepository()
         var repo = provider.GetRequiredService<ICustomerRepository>();
         var customers = repo.GetAllAsync().Result;
         Assert.That(customers, Has.Count.EqualTo(5));
-        Assert.That(customers.Select(x => x.CustomerId).Distinct().ToList(), Has.Count.EqualTo(5));
-        Assert.That(customers.Any(x => string.IsNullOrEmpty(x.FullName)), Is.False);
-        Assert.That(customers.Select(x => x.BirthDate).Distinct().ToList(), Has.Count.EqualTo(5));
-        Assert.That(customers.Any(x => x.BirthDate == DateTime.MinValue), Is.False);
+        Assert.Multiple(() =>
+        {
+            Assert.That(customers.Select(x => x.CustomerId).Distinct().ToList(), Has.Count.EqualTo(5));
+            Assert.That(customers.Any(x => string.IsNullOrEmpty(x.FullName)), Is.False);
+            Assert.That(customers.Select(x => x.BirthDate).Distinct().ToList(), Has.Count.EqualTo(5));
+            Assert.That(customers.Any(x => x.BirthDate == DateTime.MinValue), Is.False);
+        });
     }
-}
+}

DubUrl.QA/DubUrl.QA.csproj

@@ -93,7 +93,7 @@
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.0.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />

DubUrl.Testing/DubUrl.Testing.csproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.0.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />

DubUrl.Testing/Locating/OdbcDriver/DriverLocatorFactoryTest.cs

@@ -47,8 +47,11 @@ public void Instantiate_MysqlWithEncoding_CorrectType(EncodingOption encoding)
 
         Assert.That(result, Is.Not.Null);
         Assert.That(result, Is.InstanceOf<IDriverLocator>());
-        Assert.That(result, Is.TypeOf<MySqlConnectorDriverLocator>());
-        Assert.That(((MySqlConnectorDriverLocator)result).Encoding, Is.EqualTo(encoding));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result, Is.TypeOf<MySqlConnectorDriverLocator>());
+            Assert.That(((MySqlConnectorDriverLocator)result).Encoding, Is.EqualTo(encoding));
+        });
     }
 
     [Test]
@@ -67,8 +70,11 @@ public void Instantiate_PostgresqlWithEncodingArchitecture_CorrectType(EncodingO
 
         Assert.That(result, Is.Not.Null);
         Assert.That(result, Is.InstanceOf<IDriverLocator>());
-        Assert.That(result, Is.TypeOf<PostgresqlDriverLocator>());
-        Assert.That(((PostgresqlDriverLocator)result).Encoding, Is.EqualTo(encoding));
-        Assert.That(((PostgresqlDriverLocator)result).Architecture, Is.EqualTo(architecture));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result, Is.TypeOf<PostgresqlDriverLocator>());
+            Assert.That(((PostgresqlDriverLocator)result).Encoding, Is.EqualTo(encoding));
+            Assert.That(((PostgresqlDriverLocator)result).Architecture, Is.EqualTo(architecture));
+        });
     }
 }

DubUrl.Testing/Locating/OdbcDriver/DriverLocatorIntrospectorTest.cs

@@ -15,8 +15,11 @@ public void Locate_RealTypes_BrandsAssociated()
     {
         var introspector = new DriverLocatorIntrospector();
         var result = introspector.Locate();
-        Assert.That(result.Any(x => !string.IsNullOrEmpty(x.Slug)), Is.True);
-        Assert.That(result.All(x => !string.IsNullOrEmpty(x.MainColor)), Is.True);
-        Assert.That(result.All(x => !string.IsNullOrEmpty(x.SecondaryColor)), Is.True);
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Any(x => !string.IsNullOrEmpty(x.Slug)), Is.True);
+            Assert.That(result.All(x => !string.IsNullOrEmpty(x.MainColor)), Is.True);
+            Assert.That(result.All(x => !string.IsNullOrEmpty(x.SecondaryColor)), Is.True);
+        });
     }
 }

DubUrl.Testing/Locating/RegexUtils/AnyOfCapture.cs

@@ -18,8 +18,11 @@ public void ToRegex_String_Matching(string[] options, string text)
     {
         var regex = new AnyOfCapture(options);
         var result = Regex.Match(text, regex.ToRegex());
-        Assert.That(result.Success, Is.True);
-        Assert.That(result.Groups[0].Captures[0].Value, Is.EqualTo(text));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Success, Is.True);
+            Assert.That(result.Groups[0].Captures[0].Value, Is.EqualTo(text));
+        });
     }
 
     [Test]

DubUrl.Testing/Locating/RegexUtils/CompositeRegex.cs

@@ -82,9 +82,12 @@ public void ToRegex_WordSpaceVersionSpaceAnyOfSpaceWord_ExpectedResult(string te
     {
         var regex = new CompositeRegex(new BaseRegex[] { new WordMatch("MariaDB"), new SpaceMatch(), new VersionCapture(), new SpaceMatch(), new AnyOfCapture(new[] { "ANSI", "Unicode" }), new SpaceMatch(), new WordMatch("Driver") });
         var result = Regex.Match(text, regex.ToRegex());
-        Assert.That(result.Success, Is.True);
-        Assert.That(result.Groups[1].Captures[0].Value, Is.EqualTo(version));
-        Assert.That(result.Groups[2].Captures[0].Value, Is.EqualTo(encoding));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Success, Is.True);
+            Assert.That(result.Groups[1].Captures[0].Value, Is.EqualTo(version));
+            Assert.That(result.Groups[2].Captures[0].Value, Is.EqualTo(encoding));
+        });
     }
 
 

DubUrl.Testing/Locating/RegexUtils/OptionalCapture.cs

@@ -19,7 +19,10 @@ public void ToRegex_String_Matching(string optional, string text, string capture
     {
         var regex = new OptionalCapture(optional);
         var result = Regex.Match(text, regex.ToRegex());
-        Assert.That(result.Success, Is.True);
-        Assert.That(result.Groups[0].Captures[0].Value, Is.EqualTo(capture));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Success, Is.True);
+            Assert.That(result.Groups[0].Captures[0].Value, Is.EqualTo(capture));
+        });
     }
 }

DubUrl.Testing/Locating/RegexUtils/VersionCapture.cs

@@ -23,8 +23,11 @@ public void ToRegex_String_Matching(string text)
     {
         var regex = new VersionCapture();
         var result = Regex.Match(text, regex.ToRegex());
-        Assert.That(result.Success, Is.True);
-        Assert.That(result.Groups[0].Captures[0].Value, Is.EqualTo(text));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Success, Is.True);
+            Assert.That(result.Groups[0].Captures[0].Value, Is.EqualTo(text));
+        });
     }
 
     [Test]

DubUrl.Testing/Mapping/Implementation/PostgresqlMapperTest.cs

@@ -31,7 +31,7 @@ public void GetDialect_None_DialectReturned()
         var result = mapper.GetDialect();
 
         Assert.That(result, Is.Not.Null.Or.Empty);
-        Assert.IsInstanceOf<PgsqlDialect>(result);
+        Assert.That(result, Is.InstanceOf<PgsqlDialect>());
         Assert.That(result.Aliases, Does.Contain("pgsql"));
         Assert.That(result.Aliases, Does.Contain("pg"));
     }

DubUrl.Testing/Mapping/Implementation/QuestDbMapperTest.cs

@@ -31,7 +31,7 @@ public void GetDialect_None_DialectReturned()
         var result = mapper.GetDialect();
 
         Assert.That(result, Is.Not.Null.Or.Empty);
-        Assert.IsInstanceOf<QuestDbDialect>(result);
+        Assert.That(result, Is.InstanceOf<QuestDbDialect>());
         Assert.That(result.Aliases, Does.Contain("quest"));
         Assert.That(result.Aliases, Does.Contain("questdb"));
     }

DubUrl.Testing/Mapping/NativeMapperIntrospectorTest.cs

@@ -31,8 +31,11 @@ public void Locate_OneMapperClass_ClassReturned()
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(MsSqlServerMapper)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(MsSqlServerMapper)));
+        });
     }
 
     [Test]
@@ -43,10 +46,13 @@ public void Locate_OneMapperClassWithBrand_ClassReturned()
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).Slug, Is.EqualTo("microsoftsqlserver"));
-        Assert.That(result.ElementAt(0).MainColor.Length, Is.EqualTo(7));
-        Assert.That(result.ElementAt(0).SecondaryColor.Length, Is.EqualTo(7));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).Slug, Is.EqualTo("microsoftsqlserver"));
+            Assert.That(result.ElementAt(0).MainColor.Length, Is.EqualTo(7));
+            Assert.That(result.ElementAt(0).SecondaryColor.Length, Is.EqualTo(7));
+        });
     }
 
     [Test]
@@ -68,8 +74,11 @@ public void Locate_TwoMapperClassesButOneAlternate_ClassesReturned()
         var result = introspector.Locate();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(MsSqlServerMapper)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(MsSqlServerMapper)));
+        });
     }
 
     [Test]
@@ -80,8 +89,11 @@ public void LocateAlternative_TwoMapperClassesButOneAlternate_ClassesReturned()
         var result = introspector.LocateAlternative();
 
         Assert.That(result, Is.Not.Null);
-        Assert.That(result.Count(), Is.EqualTo(1));
-        Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(MySqlDataMapper)));
+        Assert.Multiple(() =>
+        {
+            Assert.That(result.Count(), Is.EqualTo(1));
+            Assert.That(result.ElementAt(0).MapperType, Is.EqualTo(typeof(MySqlDataMapper)));
+        });
     }
 
     [Test]
@@ -92,8 +104,11 @@ public void Aliases_TwoMapperClassesIncludingAlternative_Equivalent()
         var alternative = introspector.LocateAlternative().ElementAt(0).Aliases;
         var primary = introspector.Locate().ElementAt(0).Aliases;
 
-        Assert.That(primary, Is.Not.Null.Or.Empty);
-        Assert.That(alternative, Is.Not.Null.Or.Empty);
+        Assert.Multiple(() =>
+        {
+            Assert.That(primary, Is.Not.Null.Or.Empty);
+            Assert.That(alternative, Is.Not.Null.Or.Empty);
+        });
         Assert.That(primary, Is.EqualTo(alternative));
     }
 
@@ -105,8 +120,11 @@ public void DatabaseName_TwoMapperClassesIncludingAlternative_Equivalent()
         var alternative = introspector.LocateAlternative().ElementAt(0).DatabaseName;
         var primary = introspector.Locate().ElementAt(0).DatabaseName;
 
-        Assert.That(primary, Is.Not.Null.Or.Empty);
-        Assert.That(alternative, Is.Not.Null.Or.Empty);
+        Assert.Multiple(() =>
+        {
+            Assert.That(primary, Is.Not.Null.Or.Empty);
+            Assert.That(alternative, Is.Not.Null.Or.Empty);
+        });
         Assert.That(primary, Is.EqualTo(alternative));
     }
 }