Use dotnet xunit for MySqlConnector.Tests.

Author: bgrainger

.ci/test.ps1

@@ -10,11 +10,13 @@ if ($LASTEXITCODE -ne 0){
     exit $LASTEXITCODE;
 }
 
-echo "Executing connection string tests"
-dotnet test tests\MySqlConnector.Tests\MySqlConnector.Tests.csproj -c Release
+echo "Executing unit tests"
+pushd tests\MySqlConnector.Tests
+dotnet xunit -c Release
 if ($LASTEXITCODE -ne 0){
     exit $LASTEXITCODE;
 }
+popd
 
 echo "Executing tests with No Compression, No SSL"
 Copy-Item -Force .ci\config\config.json tests\SideBySide\config.json

.travis.yml

@@ -25,7 +25,7 @@ before_install:
 
 script:
 - dotnet restore
-- dotnet test tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj -c Release -f netcoreapp2.0
+- pushd tests/MySqlConnector.Tests && dotnet xunit -c Release && popd
 - dotnet build tests/SideBySide/SideBySide.csproj -c Release -f netcoreapp2.0
 - echo 'Executing netcoreapp1.1.2 tests with No Compression, No SSL' && ./.ci/use-config.sh config.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test tests/SideBySide/SideBySide.csproj -c Release -f netcoreapp1.1.2
 - echo 'Executing netcoreapp2.0 tests with No Compression, No SSL' && ./.ci/use-config.sh config.json 172.17.0.1 3307 $NAME $FEATURES && time dotnet test tests/SideBySide/SideBySide.csproj -c Release -f netcoreapp2.0

tests/MySqlConnector.Tests/MySqlConnectionStringBuilderTests.cs

@@ -11,43 +11,43 @@ public void Defaults()
 		{
 			var csb = new MySqlConnectionStringBuilder();
 #if !BASELINE
-			Assert.Equal(false, csb.AllowPublicKeyRetrieval);
+			Assert.False(csb.AllowPublicKeyRetrieval);
 #endif
-			Assert.Equal(false, csb.AllowUserVariables);
-			Assert.Equal(true, csb.AutoEnlist);
-			Assert.Equal(null, csb.CertificateFile);
-			Assert.Equal(null, csb.CertificatePassword);
+			Assert.False(csb.AllowUserVariables);
+			Assert.True(csb.AutoEnlist);
+			Assert.Null(csb.CertificateFile);
+			Assert.Null(csb.CertificatePassword);
 			Assert.Equal("", csb.CharacterSet);
 #if BASELINE
-			Assert.Equal(false, csb.ConnectionReset);
+			Assert.False(csb.ConnectionReset);
 #else
 			Assert.Equal(0u, csb.ConnectionLifeTime);
-			Assert.Equal(true, csb.ConnectionReset);
+			Assert.True(csb.ConnectionReset);
 #endif
 			Assert.Equal(15u, csb.ConnectionTimeout);
-			Assert.Equal(false, csb.ConvertZeroDateTime);
+			Assert.False(csb.ConvertZeroDateTime);
 			Assert.Equal("", csb.Database);
 #if !BASELINE
-			Assert.Equal(false, csb.BufferResultSets);
+			Assert.False(csb.BufferResultSets);
 			Assert.Equal(180u, csb.ConnectionIdleTimeout);
-			Assert.Equal(false, csb.ForceSynchronous);
-			Assert.Equal(null, csb.CACertificateFile);
+			Assert.False(csb.ForceSynchronous);
+			Assert.Null(csb.CACertificateFile);
 #endif
 			Assert.Equal(0u, csb.Keepalive);
 			Assert.Equal(100u, csb.MaximumPoolSize);
 			Assert.Equal(0u, csb.MinimumPoolSize);
 			Assert.Equal("", csb.Password);
-			Assert.Equal(false, csb.OldGuids);
-			Assert.Equal(false, csb.PersistSecurityInfo);
-			Assert.Equal(true, csb.Pooling);
+			Assert.False(csb.OldGuids);
+			Assert.False(csb.PersistSecurityInfo);
+			Assert.True(csb.Pooling);
 			Assert.Equal(3306u, csb.Port);
 			Assert.Equal("", csb.Server);
 #if !BASELINE
-			Assert.Equal(null, csb.ServerRsaPublicKeyFile);
+			Assert.Null(csb.ServerRsaPublicKeyFile);
 #endif
 			Assert.Equal(MySqlSslMode.Preferred, csb.SslMode);
-			Assert.Equal(true, csb.TreatTinyAsBoolean);
-			Assert.Equal(false, csb.UseCompression);
+			Assert.True(csb.TreatTinyAsBoolean);
+			Assert.False(csb.UseCompression);
 			Assert.Equal("", csb.UserID);
 #if BASELINE
 			Assert.False(csb.UseAffectedRows);
@@ -94,37 +94,37 @@ public void ParseConnectionString()
 					"Uid=username;" +
 					"useaffectedrows=false"
 			};
-			Assert.Equal(true, csb.AllowUserVariables);
-			Assert.Equal(false, csb.AutoEnlist);
+			Assert.True(csb.AllowUserVariables);
+			Assert.False(csb.AutoEnlist);
 			Assert.Equal("file.pfx", csb.CertificateFile);
 			Assert.Equal("Pass1234", csb.CertificatePassword);
 			Assert.Equal("latin1", csb.CharacterSet);
 			Assert.Equal(15u, csb.ConnectionLifeTime);
-			Assert.Equal(false, csb.ConnectionReset);
+			Assert.False(csb.ConnectionReset);
 			Assert.Equal(30u, csb.ConnectionTimeout);
-			Assert.Equal(true, csb.ConvertZeroDateTime);
+			Assert.True(csb.ConvertZeroDateTime);
 			Assert.Equal("schema_name", csb.Database);
 #if !BASELINE
-			Assert.Equal(true, csb.BufferResultSets);
+			Assert.True(csb.BufferResultSets);
 			Assert.Equal(30u, csb.ConnectionIdleTimeout);
-			Assert.Equal(true, csb.ForceSynchronous);
+			Assert.True(csb.ForceSynchronous);
 			Assert.Equal("ca.pem", csb.CACertificateFile);
-			Assert.Equal(true, csb.AllowPublicKeyRetrieval);
+			Assert.True(csb.AllowPublicKeyRetrieval);
 			Assert.Equal("rsa.pem", csb.ServerRsaPublicKeyFile);
 #endif
 			Assert.Equal(90u, csb.Keepalive);
 			Assert.Equal(15u, csb.MaximumPoolSize);
 			Assert.Equal(5u, csb.MinimumPoolSize);
 			Assert.Equal("Pass1234", csb.Password);
-			Assert.Equal(true, csb.OldGuids);
-			Assert.Equal(true, csb.PersistSecurityInfo);
-			Assert.Equal(false, csb.Pooling);
+			Assert.True(csb.OldGuids);
+			Assert.True(csb.PersistSecurityInfo);
+			Assert.False(csb.Pooling);
 			Assert.Equal(1234u, csb.Port);
 			Assert.Equal("db-server", csb.Server);
-			Assert.Equal(false, csb.TreatTinyAsBoolean);
+			Assert.False(csb.TreatTinyAsBoolean);
 			Assert.Equal(MySqlSslMode.VerifyCA, csb.SslMode);
-			Assert.Equal(false, csb.UseAffectedRows);
-			Assert.Equal(true, csb.UseCompression);
+			Assert.False(csb.UseAffectedRows);
+			Assert.True(csb.UseCompression);
 			Assert.Equal("username", csb.UserID);
 		}
 

tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj

@@ -18,11 +18,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
-    <PackageReference Include="Microsoft.TestPlatform.TestHost" Version="15.0.0-*" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(Configuration)' != 'Baseline' ">

tests/MySqlConnector.Tests/Utf8Tests.cs

@@ -13,7 +13,6 @@ public class Utf8Tests
 		[InlineData("\u07FF", new byte[] { 0xDF, 0xBF })]
 		[InlineData("\u0800", new byte[] { 0xE0, 0xA0, 0x80 })]
 		[InlineData("\uFFFF", new byte[] { 0xEF, 0xBF, 0xBF })]
-		[InlineData("\uFFFF", new byte[] { 0xEF, 0xBF, 0xBF })]
 		[InlineData("\U00010000", new byte[] { 0xF0, 0x90, 0x80, 0x80 })]
 		[InlineData("\U0010FFF0\U0010FFF1", new byte[] { 0xF4, 0x8F, 0xBF, 0xB0, 0xF4, 0x8F, 0xBF, 0xB1 })]
 	    public void Encode(string input, byte[] expected)