Skip to content

Commit ea2e94b

Browse files
bgraingerbgrainger
committed
Rename 'BASELINE' to 'MYSQL_DATA'.
MySql.Data has not served as a "baseline" for tests for a long time. Signed-off-by: Bradley Grainger <[email protected]>
1 parent 5cb2444 commit ea2e94b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+329
-329
lines changed

‎azure-pipelines.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
artifactName: 'SideBySide-net472-$(Agent.OS)'
2929
targetPath: 'tests/SideBySide/bin/Release/net472/publish'
3030

31-
- job: windows_baseline
32-
displayName: 'Baseline'
31+
- job: windows_mysql_data
32+
displayName: 'MySql.Data Tests'
3333
pool:
3434
vmimage: 'windows-2019'
3535
steps:
@@ -49,17 +49,17 @@ jobs:
4949
inputs:
5050
version: $(DotNetCoreSdkVersion)
5151
- task: DotNetCoreCLI@2
52-
displayName: 'Unit tests'
52+
displayName: 'MySql.Data unit tests'
5353
inputs:
5454
command: 'test'
55-
arguments: 'tests\MySqlConnector.Tests\MySqlConnector.Tests.csproj -c Baseline'
56-
testRunTitle: 'Baseline unit tests'
55+
arguments: 'tests\MySqlConnector.Tests\MySqlConnector.Tests.csproj -c MySqlData'
56+
testRunTitle: 'MySql.Data unit tests'
5757
- task: DotNetCoreCLI@2
58-
displayName: 'Baseline tests'
58+
displayName: 'MySql.Data integration tests'
5959
inputs:
6060
command: 'test'
61-
arguments: 'tests\SideBySide\SideBySide.csproj -c Baseline'
62-
testRunTitle: 'Baseline tests'
61+
arguments: 'tests\SideBySide\SideBySide.csproj -c MySqlData'
62+
testRunTitle: 'MySql.Data integration tests'
6363
env:
6464
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,StreamingResults,UnixDomainSocket'
6565
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=root;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
@@ -72,7 +72,7 @@ jobs:
7272
inputs:
7373
testResultsFormat: VSTest
7474
testResultsFiles: '**/*.trx'
75-
testRunTitle: 'Baseline Tests'
75+
testRunTitle: 'MySql.Data Tests'
7676
failTaskOnFailedTests: true
7777

7878
- job: linux_unit_tests

‎tests/MySqlConnector.Tests/DbProviderFactoryTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if BASELINE
1+
#if MYSQL_DATA
22
using MySql.Data.MySqlClient;
33
using MySqlConnectorFactory = MySql.Data.MySqlClient.MySqlClientFactory;
44
#endif

‎tests/MySqlConnector.Tests/MySqlAttributeCollectionTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if BASELINE
1+
#if MYSQL_DATA
22
using MySql.Data.MySqlClient;
33
#endif
44
using System;
@@ -51,7 +51,7 @@ public void SetAttribute()
5151
Assert.Equal("value2", attribute.Value);
5252
}
5353

54-
#if !BASELINE
54+
#if !MYSQL_DATA
5555
[Fact]
5656
public void SetAttributeTwice()
5757
{
@@ -65,7 +65,7 @@ public void SetAttributeTwice()
6565

6666
private void AddAttribute()
6767
{
68-
#if BASELINE
68+
#if MYSQL_DATA
6969
m_collection.SetAttribute(m_attribute);
7070
#else
7171
m_collection.Add(m_attribute);
@@ -74,7 +74,7 @@ private void AddAttribute()
7474

7575
private void AssertEmpty()
7676
{
77-
#if BASELINE
77+
#if MYSQL_DATA
7878
Assert.Equal(0, m_collection.Count);
7979
#else
8080
Assert.Empty(m_collection);
@@ -83,7 +83,7 @@ private void AssertEmpty()
8383

8484
private MySqlAttribute AssertSingle()
8585
{
86-
#if BASELINE
86+
#if MYSQL_DATA
8787
Assert.Equal(1, m_collection.Count);
8888
return m_collection[0];
8989
#else

‎tests/MySqlConnector.Tests/MySqlAttributeTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if BASELINE
1+
#if MYSQL_DATA
22
using MySql.Data.MySqlClient;
33
#endif
44
using System;
@@ -12,7 +12,7 @@ public class MySqlAttributeTests
1212
public void Construct()
1313
{
1414
var attribute = new MySqlAttribute();
15-
#if BASELINE
15+
#if MYSQL_DATA
1616
Assert.Null(attribute.AttributeName);
1717
#else
1818
Assert.Equal("", attribute.AttributeName);

‎tests/MySqlConnector.Tests/MySqlConnectionStringBuilderTests.cs

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.ComponentModel;
33
using System.Globalization;
44
using System.Linq;
5-
#if BASELINE
5+
#if MYSQL_DATA
66
using MySql.Data.MySqlClient;
77
#endif
88
using Xunit;
@@ -20,7 +20,7 @@ public void Defaults()
2020
Assert.False(csb.AllowUserVariables);
2121
Assert.False(csb.AllowZeroDateTime);
2222
Assert.True(csb.AutoEnlist);
23-
#if BASELINE
23+
#if MYSQL_DATA
2424
Assert.Null(csb.CertificateFile);
2525
Assert.Null(csb.CertificatePassword);
2626
Assert.Null(csb.CertificateThumbprint);
@@ -34,7 +34,7 @@ public void Defaults()
3434
Assert.Equal("", csb.CharacterSet);
3535
Assert.Equal(0u, csb.ConnectionLifeTime);
3636
Assert.Equal(MySqlConnectionProtocol.Sockets, csb.ConnectionProtocol);
37-
#if BASELINE
37+
#if MYSQL_DATA
3838
Assert.False(csb.ConnectionReset);
3939
#else
4040
Assert.True(csb.ConnectionReset);
@@ -45,12 +45,12 @@ public void Defaults()
4545
#endif
4646
Assert.Equal(15u, csb.ConnectionTimeout);
4747
Assert.False(csb.ConvertZeroDateTime);
48-
#if !BASELINE
48+
#if !MYSQL_DATA
4949
Assert.Equal(MySqlDateTimeKind.Unspecified, csb.DateTimeKind);
5050
#endif
5151
Assert.Equal("", csb.Database);
5252
Assert.Equal(30u, csb.DefaultCommandTimeout);
53-
#if !BASELINE
53+
#if !MYSQL_DATA
5454
Assert.Equal("", csb.ApplicationName);
5555
Assert.Equal(180u, csb.ConnectionIdleTimeout);
5656
Assert.False(csb.ForceSynchronous);
@@ -65,19 +65,19 @@ public void Defaults()
6565
Assert.Equal(0u, csb.MinimumPoolSize);
6666
Assert.Equal("", csb.Password);
6767
Assert.Equal("MYSQL", csb.PipeName);
68-
#if !BASELINE
68+
#if !MYSQL_DATA
6969
Assert.False(csb.NoBackslashEscapes);
7070
Assert.Equal(MySqlServerRedirectionMode.Disabled, csb.ServerRedirectionMode);
7171
#endif
7272
Assert.False(csb.OldGuids);
7373
Assert.False(csb.PersistSecurityInfo);
74-
#if !BASELINE
74+
#if !MYSQL_DATA
7575
Assert.True(csb.Pipelining);
7676
#endif
7777
Assert.True(csb.Pooling);
7878
Assert.Equal(3306u, csb.Port);
7979
Assert.Equal("", csb.Server);
80-
#if !BASELINE
80+
#if !MYSQL_DATA
8181
Assert.Equal("", csb.ServerRsaPublicKeyFile);
8282
Assert.Equal("", csb.ServerSPN);
8383
Assert.Equal("", csb.SslCa);
@@ -96,7 +96,7 @@ public void Defaults()
9696
Assert.False(csb.UseCompression);
9797
Assert.Equal("", csb.UserID);
9898
Assert.False(csb.UseAffectedRows);
99-
#if !BASELINE
99+
#if !MYSQL_DATA
100100
Assert.True(csb.UseXaTransactions);
101101
#endif
102102
}
@@ -123,11 +123,11 @@ public void ParseConnectionString()
123123
"connection lifetime=15;" +
124124
"ConnectionReset=false;" +
125125
"Convert Zero Datetime=true;" +
126-
#if !BASELINE
126+
#if !MYSQL_DATA
127127
"datetimekind=utc;" +
128128
#endif
129129
"default command timeout=123;" +
130-
#if !BASELINE
130+
#if !MYSQL_DATA
131131
"application name=My Test Application;" +
132132
"cancellation timeout = -1;" +
133133
"connectionidletimeout=30;" +
@@ -171,7 +171,7 @@ public void ParseConnectionString()
171171
Assert.True(csb.AllowUserVariables);
172172
Assert.True(csb.AllowZeroDateTime);
173173
Assert.False(csb.AutoEnlist);
174-
#if !BASELINE
174+
#if !MYSQL_DATA
175175
Assert.Equal(-1, csb.CancellationTimeout);
176176
// Connector/NET treats "CertificateFile" (client certificate) and "SslCa" (server CA) as aliases
177177
Assert.Equal("file.pfx", csb.CertificateFile);
@@ -185,12 +185,12 @@ public void ParseConnectionString()
185185
Assert.False(csb.ConnectionReset);
186186
Assert.Equal(30u, csb.ConnectionTimeout);
187187
Assert.True(csb.ConvertZeroDateTime);
188-
#if !BASELINE
188+
#if !MYSQL_DATA
189189
Assert.Equal(MySqlDateTimeKind.Utc, csb.DateTimeKind);
190190
#endif
191191
Assert.Equal("schema_name", csb.Database);
192192
Assert.Equal(123u, csb.DefaultCommandTimeout);
193-
#if !BASELINE
193+
#if !MYSQL_DATA
194194
Assert.Equal("My Test Application", csb.ApplicationName);
195195
Assert.Equal(30u, csb.ConnectionIdleTimeout);
196196
#pragma warning disable 618
@@ -226,7 +226,7 @@ public void ParseConnectionString()
226226
Assert.Equal("client-cert.pem", csb.SslCert);
227227
Assert.Equal("client-key.pem", csb.SslKey);
228228
Assert.Equal(MySqlSslMode.VerifyCA, csb.SslMode);
229-
#if BASELINE
229+
#if MYSQL_DATA
230230
Assert.Equal("Tls12, Tls13", csb.TlsVersion);
231231
#else
232232
Assert.Equal("TLS 1.2, TLS 1.3", csb.TlsVersion);
@@ -235,7 +235,7 @@ public void ParseConnectionString()
235235
Assert.True(csb.UseCompression);
236236
Assert.Equal("username", csb.UserID);
237237

238-
#if !BASELINE
238+
#if !MYSQL_DATA
239239
Assert.Equal("Server=db-server;Port=1234;User ID=username;Password=Pass1234;Database=schema_name;Load Balance=Random;" +
240240
"Connection Protocol=Pipe;Pipe Name=MyPipe;SSL Mode=VerifyCA;Certificate File=file.pfx;Certificate Password=Pass2345;" +
241241
"Certificate Store Location=CurrentUser;Certificate Thumbprint=thumbprint123;SSL Cert=client-cert.pem;SSL Key=client-key.pem;" +
@@ -259,7 +259,7 @@ public void EnumInvalidOperation()
259259
Assert.Throws<ArgumentException>(() => new MySqlConnectionStringBuilder("ssl mode=invalid;"));
260260
}
261261

262-
#if !BASELINE
262+
#if !MYSQL_DATA
263263
[Fact]
264264
public void ConstructWithNull()
265265
{
@@ -391,7 +391,7 @@ public void SetCharacterSetToNull()
391391
Assert.Equal("", csb.ConnectionString);
392392
}
393393

394-
#if !BASELINE
394+
#if !MYSQL_DATA
395395
[Fact]
396396
public void SetApplicationNameToNull()
397397
{
@@ -418,7 +418,7 @@ public void SetServerSPNToNull()
418418
#endif
419419

420420
[Theory]
421-
#if !BASELINE
421+
#if !MYSQL_DATA
422422
[InlineData("Tls", "0")]
423423
[InlineData("Tls1", "0")]
424424
[InlineData("Tlsv1", "0")]
@@ -441,7 +441,7 @@ public void SetServerSPNToNull()
441441
[InlineData("Tlsv1.3", "3")]
442442
[InlineData("TLS 1.3", "3")]
443443
[InlineData("TLS v1.3", "3")]
444-
#if !BASELINE
444+
#if !MYSQL_DATA
445445
[InlineData("Tls,Tls", "0")]
446446
[InlineData("Tls1.1,Tls v1.1, TLS 1.1", "1")]
447447
[InlineData("Tls12,Tls10", "0,2")]
@@ -451,7 +451,7 @@ public void SetServerSPNToNull()
451451
public void ParseTlsVersion(string input, string expected)
452452
{
453453
var csb = new MySqlConnectionStringBuilder { TlsVersion = input };
454-
#if !BASELINE
454+
#if !MYSQL_DATA
455455
string[] normalizedVersions = new[] { "TLS 1.0", "TLS 1.1", "TLS 1.2", "TLS 1.3" };
456456
#else
457457
string[] normalizedVersions = new[] { "Tls", "Tls11", "Tls12", "Tls13" };
@@ -469,7 +469,7 @@ public void ParseInvalidTlsVersion()
469469
}
470470

471471
[Theory]
472-
#if BASELINE
472+
#if MYSQL_DATA
473473
[InlineData("AllowPublicKeyRetrieval", false)]
474474
#else
475475
[InlineData("Allow Public Key Retrieval", false)]
@@ -484,7 +484,7 @@ public void ParseInvalidTlsVersion()
484484
[InlineData("Connection Lifetime", 30u)]
485485
[InlineData("Connection Protocol", MySqlConnectionProtocol.NamedPipe)]
486486
[InlineData("Connection Reset", true)]
487-
#if BASELINE
487+
#if MYSQL_DATA
488488
[InlineData("Connect Timeout", 10u)]
489489
#else
490490
[InlineData("Connection Timeout", 10u)]
@@ -504,7 +504,7 @@ public void ParseInvalidTlsVersion()
504504
[InlineData("Port", 3307u)]
505505
[InlineData("Server", "localhost")]
506506
[InlineData("SSL Mode", MySqlSslMode.Required)]
507-
#if BASELINE
507+
#if MYSQL_DATA
508508
[InlineData("TLS version", "Tls12")]
509509
#else
510510
[InlineData("TLS Version", "TLS 1.2")]
@@ -513,7 +513,7 @@ public void ParseInvalidTlsVersion()
513513
[InlineData("Use Affected Rows", false)]
514514
[InlineData("Use Compression", true)]
515515
[InlineData("User ID", "user")]
516-
#if !BASELINE
516+
#if !MYSQL_DATA
517517
// misspelled
518518
[InlineData("Allow Load Local Infile", true)]
519519

@@ -544,14 +544,14 @@ public void ParseInvalidTlsVersion()
544544
public void NamedProperty(string propertyName, object value)
545545
{
546546
var stringValue = Convert.ToString(value, CultureInfo.InvariantCulture);
547-
#if BASELINE
547+
#if MYSQL_DATA
548548
// fix some properties that are spelt differently
549549
propertyName = propertyName.Replace("SSL ", "Ssl ").Replace("DateTime", "Datetime");
550550
#endif
551551
for (var i = 0; i < 2; i++)
552552
{
553553
var csb = new MySqlConnectionStringBuilder();
554-
#if !BASELINE
554+
#if !MYSQL_DATA
555555
Assert.False(csb.ContainsKey(propertyName));
556556
Assert.False(csb.TryGetValue(propertyName, out var setValue));
557557
Assert.Null(setValue);
@@ -573,14 +573,14 @@ public void NamedProperty(string propertyName, object value)
573573
Assert.True(csb.ContainsKey(propertyName));
574574

575575
Assert.True(csb.TryGetValue(propertyName, out setValue));
576-
#if !BASELINE
576+
#if !MYSQL_DATA
577577
Assert.Equal(stringValue, setValue);
578578
#else
579579
Assert.Equal(value, setValue);
580580
#endif
581581

582582
var propertyDescriptorValue = propertyDescriptor.GetValue(csb);
583-
#if !BASELINE
583+
#if !MYSQL_DATA
584584
Assert.Equal(stringValue, propertyDescriptorValue);
585585
#else
586586
Assert.Equal(value, propertyDescriptorValue);

‎tests/MySqlConnector.Tests/MySqlConnector.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup Condition=" '$(Configuration)' != 'Baseline' ">
3+
<PropertyGroup Condition=" '$(Configuration)' != 'MySqlData' ">
44
<TargetFrameworks>net7.0</TargetFrameworks>
55
</PropertyGroup>
66

7-
<PropertyGroup Condition=" '$(Configuration)' == 'Baseline' ">
7+
<PropertyGroup Condition=" '$(Configuration)' == 'MySqlData' ">
88
<TargetFrameworks>net472</TargetFrameworks>
9-
<DefineConstants>BASELINE</DefineConstants>
9+
<DefineConstants>MYSQL_DATA</DefineConstants>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
@@ -27,11 +27,11 @@
2727
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
2828
</ItemGroup>
2929

30-
<ItemGroup Condition=" '$(Configuration)' != 'Baseline' ">
30+
<ItemGroup Condition=" '$(Configuration)' != 'MySqlData' ">
3131
<ProjectReference Include="..\..\src\MySqlConnector\MySqlConnector.csproj" />
3232
</ItemGroup>
3333

34-
<ItemGroup Condition=" '$(Configuration)' == 'Baseline' ">
34+
<ItemGroup Condition=" '$(Configuration)' == 'MySqlData' ">
3535
<PackageReference Include="MySql.Data" Version="8.0.30" />
3636
<Compile Remove="ByteBufferWriterTests.cs;CachedProcedureTests.cs;CancellationTests.cs;ConnectionTests.cs;FakeMySqlServer.cs;FakeMySqlServerConnection.cs;LoadBalancerTests.cs;MySqlDecimalTests.cs;MySqlExceptionTests.cs;MySqlParameterCollectionNameToIndexTests.cs;NormalizeTests.cs;ServerVersionTests.cs;StatementPreparerTests.cs;TypeMapperTests.cs;UtilityTests.cs" />
3737
</ItemGroup>

0 commit comments

Comments
 (0)