Skip to content

Commit 787c12e

Browse files
lukebakkenlukebakken
committed
* Merge AsyncIntegration tests into Integration.
* Move `TestConnectionFactory` to Integration * Move `TestExchangeDeclareAsync` to `TestExchangeDeclare`. * `AsyncIntegrationFixture` is now a placeholder. * Move `TestExtensionsAsync` to `TestExtensions` * Move `TestFloodPublishingAsync` to `TestFloodPublishing` * Remove the rest of `AsyncIntegration`.
1 parent 1fa0562 commit 787c12e

35 files changed

+1066
-1434
lines changed

‎.github/workflows/build-test.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
name: rabbitmq-dotnet-client-build-win32
3838
path: |
3939
projects/Test/Unit/bin
40-
projects/Test/AsyncIntegration/bin
4140
projects/Test/Integration/bin
4241
projects/Test/SequentialIntegration/bin
4342
projects/RabbitMQ.*/bin
@@ -67,8 +66,6 @@ jobs:
6766
- name: Install and Start RabbitMQ
6867
id: install-start-rabbitmq
6968
run: .\.ci\windows\gha-setup.ps1
70-
- name: Async Integration Tests
71-
run: dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' "${{ github.workspace }}\projects\Test\AsyncIntegration\AsyncIntegration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
7269
- name: Integration Tests
7370
run: dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=${{ steps.install-start-rabbitmq.outputs.path }}" --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' --environment 'PASSWORD=grapefruit' --environment SSL_CERTS_DIR="${{ github.workspace }}\.ci\certs" "${{ github.workspace }}\projects\Test\Integration\Integration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
7471
- name: Maybe upload RabbitMQ logs
@@ -146,7 +143,6 @@ jobs:
146143
name: rabbitmq-dotnet-client-build-ubuntu
147144
path: |
148145
projects/Test/Unit/bin
149-
projects/Test/AsyncIntegration/bin
150146
projects/Test/Integration/bin
151147
projects/Test/SequentialIntegration/bin
152148
projects/RabbitMQ.*/bin
@@ -170,11 +166,6 @@ jobs:
170166
- name: Start RabbitMQ
171167
id: start-rabbitmq
172168
run: ${{ github.workspace }}/.ci/ubuntu/gha-setup.sh
173-
- name: Async Integration Tests
174-
run: |
175-
dotnet test \
176-
--environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:${{ steps.start-rabbitmq.outputs.id }}" \
177-
"${{ github.workspace }}/projects/Test/AsyncIntegration/AsyncIntegration.csproj" --no-restore --no-build --logger 'console;verbosity=detailed'
178169
- name: Integration Tests
179170
run: |
180171
dotnet test \

‎Build.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ProjectReference Include="projects/Test/Common/Common.csproj" />
1313
<ProjectReference Include="projects/Test/Applications/CreateChannel/CreateChannel.csproj" />
1414
<ProjectReference Include="projects/Test/Applications/MassPublish/MassPublish.csproj" />
15-
<ProjectReference Include="projects/Test/AsyncIntegration/AsyncIntegration.csproj" />
1615
<ProjectReference Include="projects/Test/Integration/Integration.csproj" />
1716
<ProjectReference Include="projects/Test/SequentialIntegration/SequentialIntegration.csproj" />
1817
<ProjectReference Include="projects/Test/Unit/Unit.csproj" />

‎Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ build:
88

99
test:
1010
dotnet test $(CURDIR)/projects/Test/Unit/Unit.csproj --logger 'console;verbosity=detailed'
11-
dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" $(CURDIR)/projects/Test/AsyncIntegration/AsyncIntegration.csproj --logger 'console;verbosity=detailed'
1211
dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" $(CURDIR)/projects/Test/Integration/Integration.csproj --logger 'console;verbosity=detailed'
1312
dotnet test --environment "RABBITMQ_RABBITMQCTL_PATH=DOCKER:$$(docker inspect --format='{{.Id}}' $(RABBITMQ_DOCKER_NAME))" $(CURDIR)/projects/Test/SequentialIntegration/SequentialIntegration.csproj --logger 'console;verbosity=detailed'
1413

‎RabbitMQDotNetClient.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SequentialIntegration", "pr
3838
EndProject
3939
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "projects\Test\Common\Common.csproj", "{C11F25F4-7EA1-4874-9E25-DEB42E3A7C67}"
4040
EndProject
41-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AsyncIntegration", "projects\Test\AsyncIntegration\AsyncIntegration.csproj", "{D98F96C5-F7FB-45FC-92A0-9133850FB432}"
42-
EndProject
4341
Global
4442
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4543
Debug|Any CPU = Debug|Any CPU
@@ -86,10 +84,6 @@ Global
8684
{C11F25F4-7EA1-4874-9E25-DEB42E3A7C67}.Debug|Any CPU.Build.0 = Debug|Any CPU
8785
{C11F25F4-7EA1-4874-9E25-DEB42E3A7C67}.Release|Any CPU.ActiveCfg = Release|Any CPU
8886
{C11F25F4-7EA1-4874-9E25-DEB42E3A7C67}.Release|Any CPU.Build.0 = Release|Any CPU
89-
{D98F96C5-F7FB-45FC-92A0-9133850FB432}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
90-
{D98F96C5-F7FB-45FC-92A0-9133850FB432}.Debug|Any CPU.Build.0 = Debug|Any CPU
91-
{D98F96C5-F7FB-45FC-92A0-9133850FB432}.Release|Any CPU.ActiveCfg = Release|Any CPU
92-
{D98F96C5-F7FB-45FC-92A0-9133850FB432}.Release|Any CPU.Build.0 = Release|Any CPU
9387
EndGlobalSection
9488
GlobalSection(SolutionProperties) = preSolution
9589
HideSolutionNode = FALSE
@@ -103,7 +97,6 @@ Global
10397
{B01347D8-C327-471B-A1FE-7B86F7684A27} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
10498
{F25725D7-2978-45F4-B90F-25D6F8B71C9E} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
10599
{C11F25F4-7EA1-4874-9E25-DEB42E3A7C67} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
106-
{D98F96C5-F7FB-45FC-92A0-9133850FB432} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
107100
EndGlobalSection
108101
GlobalSection(ExtensibilityGlobals) = postSolution
109102
SolutionGuid = {3C6A0C44-FA63-4101-BBF9-2598641167D1}

‎build.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ if ($RunTests)
1717
$tests_dir = Join-Path -Path $PSScriptRoot -ChildPath 'projects' | Join-Path -ChildPath 'Test'
1818
$unit_csproj_file = Resolve-Path -LiteralPath (Join-Path -Path $tests_dir -ChildPath 'Unit' | Join-Path -ChildPath 'Unit.csproj')
1919
$integration_csproj_file = Resolve-Path -LiteralPath (Join-Path -Path $tests_dir -ChildPath 'Integration' | Join-Path -ChildPath 'Integration.csproj')
20-
$async_integration_csproj_file = Resolve-Path -LiteralPath (Join-Path -Path $tests_dir -ChildPath 'AsyncIntegration' | Join-Path -ChildPath 'AsyncIntegration.csproj')
2120
$sequential_integration_csproj_file = Resolve-Path -LiteralPath (Join-Path -Path $tests_dir -ChildPath 'SequentialIntegration' | Join-Path -ChildPath 'SequentialIntegration.csproj')
2221

23-
foreach ($csproj_file in $unit_csproj_file, $integration_csproj_file, $async_integration_csproj_file, $sequential_integration_csproj_file)
22+
foreach ($csproj_file in $unit_csproj_file, $integration_csproj_file, $sequential_integration_csproj_file)
2423
{
2524
Write-Host "[INFO] running Unit / Integration tests from '$csproj_file' (all frameworks)" -ForegroundColor "Magenta"
2625
dotnet test $csproj_file --environment 'RABBITMQ_LONG_RUNNING_TESTS=true' --no-restore --no-build --logger "console;verbosity=detailed"

‎projects/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
5757
<_Parameter1>Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
5858
</AssemblyAttribute>
59-
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
60-
<_Parameter1>AsyncIntegration, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
61-
</AssemblyAttribute>
6259
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
6360
<_Parameter1>Integration, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5</_Parameter1>
6461
</AssemblyAttribute>

‎projects/Test/AsyncIntegration/AsyncIntegrationFixture.cs

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎projects/Test/AsyncIntegration/TestBasicGetAsync.cs

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎projects/Test/AsyncIntegration/TestConnectionFactory.cs

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)