Rename SideBySide to IntegrationTests.

This name better describes the purpose of the tests.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

.ci/build-steps.yml

@@ -4,7 +4,7 @@ steps:
   inputs:
     sourceFolder: '.ci/config'
     contents: 'config.json'
-    targetFolder: 'tests/SideBySide'
+    targetFolder: 'tests/IntegrationTests'
 - task: UseDotNet@2
   displayName: 'Install .NET Core'
   inputs:
@@ -47,37 +47,37 @@ steps:
     targetPath: 'tests/Conformance.Tests/bin/Release/net7.0/publish'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Publish SideBySide (3.1)'
+  displayName: 'Publish IntegrationTests (3.1)'
   inputs:
     command: 'publish'
-    arguments: '-c Release -f netcoreapp3.1 --no-build tests/SideBySide/SideBySide.csproj'
+    arguments: '-c Release -f netcoreapp3.1 --no-build tests/IntegrationTests/IntegrationTests.csproj'
     publishWebProjects: false
     zipAfterPublish: false
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: 'SideBySide-netcoreapp3.1-$(Agent.OS)'
-    targetPath: 'tests/SideBySide/bin/Release/netcoreapp3.1/publish'
+    artifactName: 'IntegrationTests-netcoreapp3.1-$(Agent.OS)'
+    targetPath: 'tests/IntegrationTests/bin/Release/netcoreapp3.1/publish'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Publish SideBySide (7.0)'
+  displayName: 'Publish IntegrationTests (7.0)'
   inputs:
     command: 'publish'
-    arguments: '-c Release -f net7.0 --no-build tests/SideBySide/SideBySide.csproj'
+    arguments: '-c Release -f net7.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
     publishWebProjects: false
     zipAfterPublish: false
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: 'SideBySide-net7.0-$(Agent.OS)'
-    targetPath: 'tests/SideBySide/bin/Release/net7.0/publish'
+    artifactName: 'IntegrationTests-net7.0-$(Agent.OS)'
+    targetPath: 'tests/IntegrationTests/bin/Release/net7.0/publish'
 
 - task: DotNetCoreCLI@2
-  displayName: 'Publish SideBySide (6.0)'
+  displayName: 'Publish IntegrationTests (6.0)'
   inputs:
     command: 'publish'
-    arguments: '-c Release -f net6.0 --no-build tests/SideBySide/SideBySide.csproj'
+    arguments: '-c Release -f net6.0 --no-build tests/IntegrationTests/IntegrationTests.csproj'
     publishWebProjects: false
     zipAfterPublish: false
 - task: PublishPipelineArtifact@0
   inputs:
-    artifactName: 'SideBySide-net6.0-$(Agent.OS)'
-    targetPath: 'tests/SideBySide/bin/Release/net6.0/publish'
+    artifactName: 'IntegrationTests-net6.0-$(Agent.OS)'
+    targetPath: 'tests/IntegrationTests/bin/Release/net6.0/publish'

.ci/sidebyside-test-steps.yml renamed to .ci/integration-test-steps.yml

@@ -13,14 +13,14 @@ steps:
 - task: DownloadPipelineArtifact@0
   condition: always()
   inputs:
-    artifactName: ${{ format('SideBySide-{0}-$(Agent.OS)', parameters.platform) }}
+    artifactName: ${{ format('IntegrationTests-{0}-$(Agent.OS)', parameters.platform) }}
     targetPath: ${{ format('$(Build.BinariesDirectory)/{0}', parameters.platform) }}
 - task: DotNetCoreCLI@2
   displayName: ${{ format('{0} {1} Tests', parameters.platform, parameters.description) }}
   inputs:
     command: 'custom'
     custom: 'vstest'
-    arguments: ${{ format('$(Build.BinariesDirectory)/{0}/SideBySide.dll /logger:trx', parameters.platform) }}
+    arguments: ${{ format('$(Build.BinariesDirectory)/{0}/IntegrationTests.dll /logger:trx', parameters.platform) }}
   env:
     DATA__UNSUPPORTEDFEATURES: ${{ parameters.unsupportedFeatures }}
     DATA__CONNECTIONSTRING: ${{ parameters.connectionString }}

.ci/integration-tests-steps.yml

@@ -25,35 +25,35 @@ steps:
   parameters:
     image: ${{ parameters.image }}
     connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600'
-- template: 'sidebyside-test-steps.yml'
+- template: 'integration-test-steps.yml'
   parameters:
     image: ${{ parameters.image }}
     unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
     connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
     platform: 'netcoreapp3.1'
     description: 'No SSL'
-- template: 'sidebyside-test-steps.yml'
+- template: 'integration-test-steps.yml'
   parameters:
     image: ${{ parameters.image }}
     unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
     connectionString: server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600;certificate file=$(Build.Repository.LocalPath)/.ci/server/certs/ssl-client.pfx;${{ parameters.connectionStringExtra }}
     platform: 'net7.0'
     description: 'SSL'
-- template: 'sidebyside-test-steps.yml'
+- template: 'integration-test-steps.yml'
   parameters:
     image: ${{ parameters.image }}
     unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
     connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600'
     platform: 'net6.0'
     description: 'Compression'
-- template: 'sidebyside-test-steps.yml'
+- template: 'integration-test-steps.yml'
   parameters:
     image: ${{ parameters.image }}
     unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
     connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
     platform: 'net6.0'
     description: 'No SSL'
-- template: 'sidebyside-test-steps.yml'
+- template: 'integration-test-steps.yml'
   parameters:
     image: ${{ parameters.image }}
     unsupportedFeatures: ${{ parameters.unsupportedFeatures }}

.ci/run-tests.bat

@@ -1,5 +1,5 @@
 @echo off
-echo Executing tests with No Compression, No SSL && copy /y .ci\config\config.json tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
-echo Executing tests with Compression, No SSL && copy /y .ci\config\config.compression.json tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
-echo Executing tests with No Compression, SSL && copy /y .ci\config\config.ssl.json tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
-echo Executing tests with Compression, SSL && copy /y ".ci\config\config.compression+ssl.json" tests\SideBySide\config.json && dotnet test tests/SideBySide/SideBySide.csproj --configuration Release
+echo Executing tests with No Compression, No SSL && copy /y .ci\config\config.json tests\IntegrationTests\config.json && dotnet test tests/IntegrationTests/IntegrationTests.csproj --configuration Release
+echo Executing tests with Compression, No SSL && copy /y .ci\config\config.compression.json tests\IntegrationTests\config.json && dotnet test tests/IntegrationTests/IntegrationTests.csproj --configuration Release
+echo Executing tests with No Compression, SSL && copy /y .ci\config\config.ssl.json tests\IntegrationTests\config.json && dotnet test tests/IntegrationTests/IntegrationTests.csproj --configuration Release
+echo Executing tests with Compression, SSL && copy /y ".ci\config\config.compression+ssl.json" tests\IntegrationTests\config.json && dotnet test tests/IntegrationTests/IntegrationTests.csproj --configuration Release

.ci/test.ps1

@@ -24,9 +24,9 @@ if ($LASTEXITCODE -ne 0){
 }
 popd
 
-pushd .\tests\SideBySide
+pushd .\tests\IntegrationTests
 
-echo "Executing tests with No Compression, No SSL"
+echo "Executing integration tests with No Compression, No SSL"
 Copy-Item -Force ..\..\.ci\config\config.json config.json
 dotnet test -c Release -f net462
 if ($LASTEXITCODE -ne 0){
@@ -37,7 +37,7 @@ if ($LASTEXITCODE -ne 0){
     exit $LASTEXITCODE;
 }
 
-echo "Executing tests with Compression, No SSL"
+echo "Executing integration tests with Compression, No SSL"
 Copy-Item -Force ..\..\.ci\config\config.compression.json config.json
 dotnet test -c Release -f netcoreapp3.1
 if ($LASTEXITCODE -ne 0){

MySqlConnector.sln

@@ -6,7 +6,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MySqlConnector", "src\MySql
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MySqlConnector.Tests", "tests\MySqlConnector.Tests\MySqlConnector.Tests.csproj", "{5E4FF768-D007-4D66-8220-AE789CC614C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SideBySide", "tests\SideBySide\SideBySide.csproj", "{407C2AC9-0CCA-4D6B-8698-362976D97730}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "tests\IntegrationTests\IntegrationTests.csproj", "{407C2AC9-0CCA-4D6B-8698-362976D97730}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conformance.Tests", "tests\Conformance.Tests\Conformance.Tests.csproj", "{CC0DA702-43E8-471E-9320-F36685C540A1}"
 EndProject

README.md

@@ -68,7 +68,7 @@ dotnet restore
 dotnet test tests\MySqlConnector.Tests
 ```
 
-To run the side-by-side tests, see [the instructions](tests/README.md).
+To run the integration tests, see [the instructions](tests/README.md).
 
 ## Goals
 

azure-pipelines.yml

@@ -17,16 +17,16 @@ jobs:
   steps:
   - template: '.ci/build-steps.yml'
   - task: DotNetCoreCLI@2
-    displayName: 'Publish SideBySide (net472)'
+    displayName: 'Publish IntegrationTests (net472)'
     inputs:
       command: 'publish'
-      arguments: '-c Release -f net472 tests/SideBySide/SideBySide.csproj'
+      arguments: '-c Release -f net472 tests/IntegrationTests/IntegrationTests.csproj'
       publishWebProjects: false
       zipAfterPublish: false
   - task: PublishPipelineArtifact@0
     inputs:
-      artifactName: 'SideBySide-net472-$(Agent.OS)'
-      targetPath: 'tests/SideBySide/bin/Release/net472/publish'
+      artifactName: 'IntegrationTests-net472-$(Agent.OS)'
+      targetPath: 'tests/IntegrationTests/bin/Release/net472/publish'
 
 - job: windows_mysql_data
   displayName: 'MySql.Data Tests'
@@ -39,7 +39,7 @@ jobs:
     inputs:
       sourceFolder: '.ci/config'
       contents: 'config.json'
-      targetFolder: 'tests/SideBySide'
+      targetFolder: 'tests/IntegrationTests'
   - task: UseDotNet@2
     displayName: 'Install .NET Core 6.0'
     inputs:
@@ -58,7 +58,7 @@ jobs:
     displayName: 'MySql.Data integration tests'
     inputs:
       command: 'test'
-      arguments: 'tests\SideBySide\SideBySide.csproj -c MySqlData'
+      arguments: 'tests\IntegrationTests\IntegrationTests.csproj -c MySqlData'
       testRunTitle: 'MySql.Data integration tests'
     env:
       DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,StreamingResults,UnixDomainSocket'
@@ -125,16 +125,16 @@ jobs:
     displayName: 'Copy Azure config'
     inputs:
       targetType: inline
-      script: Copy-Item -Path ".\.ci\config\config.ssl.json" -Destination ".\tests\SideBySide\config.json"
+      script: Copy-Item -Path ".\.ci\config\config.ssl.json" -Destination ".\tests\IntegrationTests\config.json"
   - task: DotNetCoreCLI@2
     displayName: 'Restore packages'
     inputs:
       command: 'restore'
   - task: DotNetCoreCLI@2
-    displayName: 'Side by Side tests (net6.0)'
+    displayName: 'Integration tests (net6.0)'
     inputs:
       command: 'test'
-      projects: 'tests/SideBySide/SideBySide.csproj'
+      projects: 'tests/IntegrationTests/IntegrationTests.csproj'
       arguments: '-c Release -f net6.0 --no-restore'
       testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'Azure', 'net6.0', 'SSL') }}
     env:
@@ -162,21 +162,21 @@ jobs:
     inputs:
       sourceFolder: '.ci/config'
       contents: 'config.json'
-      targetFolder: 'tests/SideBySide'
+      targetFolder: 'tests/IntegrationTests'
   - task: PowerShell@2
     displayName: 'Remove target frameworks'
     inputs:
       targetType: 'inline'
-      script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net7.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
+      script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>net472;net7.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
   - task: DotNetCoreCLI@2
     displayName: 'Restore packages'
     inputs:
       command: 'restore'
   - task: DotNetCoreCLI@2
-    displayName: 'Side by Side tests (net472/net7.0)'
+    displayName: 'Integration tests (net472/net7.0)'
     inputs:
       command: 'test'
-      projects: 'tests/SideBySide/SideBySide.csproj'
+      projects: 'tests/IntegrationTests/IntegrationTests.csproj'
       arguments: '-c Release --no-restore'
       testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net472/net7.0', 'No SSL') }}
     env:
@@ -203,22 +203,22 @@ jobs:
     displayName: 'Install .NET Core'
     inputs:
       version: $(DotNetCoreSdkVersion)
-  - script: copy .ci\config\config.json tests\SideBySide\config.json
+  - script: copy .ci\config\config.json tests\IntegrationTests\config.json
     displayName: 'Copy config.json'
   - task: PowerShell@2
     displayName: 'Remove target frameworks'
     inputs:
       targetType: 'inline'
-      script: '((Get-Content .\tests\SideBySide\SideBySide.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>'')) | Set-Content .\tests\SideBySide\SideBySide.csproj'
+      script: '((Get-Content .\tests\IntegrationTests\IntegrationTests.csproj -Raw) -replace(''<TargetFrameworks>.*</TargetFrameworks>'', ''<TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>'')) | Set-Content .\tests\IntegrationTests\IntegrationTests.csproj'
   - task: DotNetCoreCLI@2
     displayName: 'Restore packages'
     inputs:
       command: 'restore'
   - task: DotNetCoreCLI@2
-    displayName: 'Side by Side tests (netcoreapp3.1/net6.0)'
+    displayName: 'Integration tests (netcoreapp3.1/net6.0)'
     inputs:
       command: 'test'
-      projects: 'tests/SideBySide/SideBySide.csproj'
+      projects: 'tests/IntegrationTests/IntegrationTests.csproj'
       arguments: '-c Release --no-restore'
       testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'netcoreapp3.1/net6.0', 'No SSL') }}
     env:

src/MySqlConnector/MySqlConnector.csproj

@@ -33,7 +33,7 @@
 
   <ItemGroup>
     <InternalsVisibleTo Include="MySqlConnector.Tests" Key="00240000048000001402000006020000002400005253413100100000010001000521c81bf0f0ec7b261bb89bb583611d3767205d542c16c9353e317455acf612d3ec3dd03b77e7e6fda1aa8f15c58576d90dae0fb9f4fd4bd48709ae199b8c771963fa67d70b35f7ed2fbb6c60423935adfae0606716ea6ce31a1fcd56fdb206fc0c3b1205ec6ba56fb20c14c42105a601ddd0bfaea7207d535b29a39ffe82f00880f4f64f86e6bcf26eb5242a133bad9d7a32e3126036b68b13b413ce4097dfc18d9a5b1e494f1aed54dc84d7089fd0d931a49e679fdc7c8f07a5121df38ec27c2c9993a8f8f136b2937849aed32aef7324a5b7e482dc2eb693c7988f6074e82e75a41dd001587be4d79108588b25d40ed9aeb30ff921edaf509c94f71428e48219ba940f5f10c061421dc0c006e09feadec30df20b2d13d02c3ce4ceb32b6fbefd254288d45f3bb2c425b197e19699d7efdfc7aba5dd45b727bc98abd866d2f6e69e33a64e4b5a5ab1e4d749266c7bf285550da9fb036f10eff76b697de9c5ed8de4a3cdbca1174543540bed6c3a95641cfdacbac834896639f8a75ed1fb9cfd9983d83d0b43b76bd3894bd2b3da0dd23d1e0362985217f087acce1a7f56546c214890acae8fc60e27890ff31c38578f85e220342061a1a5c867362a14aafdffa003dc13af064f5f860d1757883ea5237feed3a6228c86200062bd88f5592d5c399ef270a562d458ae8eac5eaa382b5bcc3f64298cc34b4598f0b33d7943b8" />
-    <InternalsVisibleTo Include="SideBySide" Key="00240000048000001402000006020000002400005253413100100000010001000521c81bf0f0ec7b261bb89bb583611d3767205d542c16c9353e317455acf612d3ec3dd03b77e7e6fda1aa8f15c58576d90dae0fb9f4fd4bd48709ae199b8c771963fa67d70b35f7ed2fbb6c60423935adfae0606716ea6ce31a1fcd56fdb206fc0c3b1205ec6ba56fb20c14c42105a601ddd0bfaea7207d535b29a39ffe82f00880f4f64f86e6bcf26eb5242a133bad9d7a32e3126036b68b13b413ce4097dfc18d9a5b1e494f1aed54dc84d7089fd0d931a49e679fdc7c8f07a5121df38ec27c2c9993a8f8f136b2937849aed32aef7324a5b7e482dc2eb693c7988f6074e82e75a41dd001587be4d79108588b25d40ed9aeb30ff921edaf509c94f71428e48219ba940f5f10c061421dc0c006e09feadec30df20b2d13d02c3ce4ceb32b6fbefd254288d45f3bb2c425b197e19699d7efdfc7aba5dd45b727bc98abd866d2f6e69e33a64e4b5a5ab1e4d749266c7bf285550da9fb036f10eff76b697de9c5ed8de4a3cdbca1174543540bed6c3a95641cfdacbac834896639f8a75ed1fb9cfd9983d83d0b43b76bd3894bd2b3da0dd23d1e0362985217f087acce1a7f56546c214890acae8fc60e27890ff31c38578f85e220342061a1a5c867362a14aafdffa003dc13af064f5f860d1757883ea5237feed3a6228c86200062bd88f5592d5c399ef270a562d458ae8eac5eaa382b5bcc3f64298cc34b4598f0b33d7943b8" />
+    <InternalsVisibleTo Include="IntegrationTests" Key="00240000048000001402000006020000002400005253413100100000010001000521c81bf0f0ec7b261bb89bb583611d3767205d542c16c9353e317455acf612d3ec3dd03b77e7e6fda1aa8f15c58576d90dae0fb9f4fd4bd48709ae199b8c771963fa67d70b35f7ed2fbb6c60423935adfae0606716ea6ce31a1fcd56fdb206fc0c3b1205ec6ba56fb20c14c42105a601ddd0bfaea7207d535b29a39ffe82f00880f4f64f86e6bcf26eb5242a133bad9d7a32e3126036b68b13b413ce4097dfc18d9a5b1e494f1aed54dc84d7089fd0d931a49e679fdc7c8f07a5121df38ec27c2c9993a8f8f136b2937849aed32aef7324a5b7e482dc2eb693c7988f6074e82e75a41dd001587be4d79108588b25d40ed9aeb30ff921edaf509c94f71428e48219ba940f5f10c061421dc0c006e09feadec30df20b2d13d02c3ce4ceb32b6fbefd254288d45f3bb2c425b197e19699d7efdfc7aba5dd45b727bc98abd866d2f6e69e33a64e4b5a5ab1e4d749266c7bf285550da9fb036f10eff76b697de9c5ed8de4a3cdbca1174543540bed6c3a95641cfdacbac834896639f8a75ed1fb9cfd9983d83d0b43b76bd3894bd2b3da0dd23d1e0362985217f087acce1a7f56546c214890acae8fc60e27890ff31c38578f85e220342061a1a5c867362a14aafdffa003dc13af064f5f860d1757883ea5237feed3a6228c86200062bd88f5592d5c399ef270a562d458ae8eac5eaa382b5bcc3f64298cc34b4598f0b33d7943b8" />
     <Using Include="System.Data" />
     <Using Include="System.Data.Common" />
   </ItemGroup>