Skip to content

Commit 50ad871

Browse files
committed
Moved the OTel tests to the SequentialIntegration project to simplify project structure.
1 parent d9a7ff6 commit 50ad871

File tree

6 files changed

+3
-125
lines changed

6 files changed

+3
-125
lines changed

RabbitMQDotNetClient.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ToxiproxyNetCore", "project
4242
EndProject
4343
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RabbitMQ.Client.OpenTelemetry", "projects\RabbitMQ.Client.OpenTelemetry\RabbitMQ.Client.OpenTelemetry.csproj", "{16BF2086-AC7D-4EC3-8660-CC16E663ACB1}"
4444
EndProject
45-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTel", "projects\Test\OTel\OTel.csproj", "{33E86EAF-C269-4336-8E5C-71418AE360A2}"
46-
EndProject
4745
Global
4846
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4947
Debug|Any CPU = Debug|Any CPU
@@ -98,10 +96,6 @@ Global
9896
{16BF2086-AC7D-4EC3-8660-CC16E663ACB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
9997
{16BF2086-AC7D-4EC3-8660-CC16E663ACB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
10098
{16BF2086-AC7D-4EC3-8660-CC16E663ACB1}.Release|Any CPU.Build.0 = Release|Any CPU
101-
{33E86EAF-C269-4336-8E5C-71418AE360A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102-
{33E86EAF-C269-4336-8E5C-71418AE360A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
103-
{33E86EAF-C269-4336-8E5C-71418AE360A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
104-
{33E86EAF-C269-4336-8E5C-71418AE360A2}.Release|Any CPU.Build.0 = Release|Any CPU
10599
EndGlobalSection
106100
GlobalSection(SolutionProperties) = preSolution
107101
HideSolutionNode = FALSE
@@ -116,7 +110,6 @@ Global
116110
{F25725D7-2978-45F4-B90F-25D6F8B71C9E} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
117111
{C11F25F4-7EA1-4874-9E25-DEB42E3A7C67} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
118112
{AB5B7C53-D7EC-4985-A6DE-70178E4B688A} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
119-
{33E86EAF-C269-4336-8E5C-71418AE360A2} = {EFD4BED5-13A5-4D9C-AADF-CAB7E1573704}
120113
EndGlobalSection
121114
GlobalSection(ExtensibilityGlobals) = postSolution
122115
SolutionGuid = {3C6A0C44-FA63-4101-BBF9-2598641167D1}

projects/RabbitMQ.Client/RabbitMQ.Client.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<InternalsVisibleTo Include="Integration" />
5656
<InternalsVisibleTo Include="SequentialIntegration" />
5757
<InternalsVisibleTo Include="Benchmarks" />
58-
<InternalsVisibleTo Include="OTel" />
5958
</ItemGroup>
6059

6160
<ItemGroup>

projects/Test/OTel/OTel.csproj

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

projects/Test/OTel/SequentialIntegrationFixture.cs

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

projects/Test/SequentialIntegration/SequentialIntegration.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<ProjectReference Include="../../RabbitMQ.Client/RabbitMQ.Client.csproj" />
19+
<ProjectReference Include="../../RabbitMQ.Client.OpenTelemetry/RabbitMQ.Client.OpenTelemetry.csproj" />
2020
<ProjectReference Include="../Common/Common.csproj" />
2121
</ItemGroup>
2222

@@ -36,6 +36,7 @@
3636
<ItemGroup>
3737
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
3838
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
39+
<PackageReference Include="OpenTelemetry.Exporter.InMemory" Version="1.8.0" />
3940
<PackageReference Include="xunit" Version="2.7.0" />
4041
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" PrivateAssets="all" />
4142
</ItemGroup>

projects/Test/OTel/TestOpenTelemetry.cs renamed to projects/Test/SequentialIntegration/TestOpenTelemetry.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@
4141
using RabbitMQ.Client;
4242
using RabbitMQ.Client.Events;
4343
using RabbitMQ.Client.OpenTelemetry;
44-
using Test.OpenTelemetry.SequentialIntegration;
4544
using Xunit;
4645
using Xunit.Abstractions;
4746
using Xunit.Sdk;
4847

49-
namespace Test.OpenTelemetry
48+
namespace Test.SequentialIntegration
5049
{
5150
public class TestOpenTelemetry : SequentialIntegrationFixture
5251
{

0 commit comments

Comments
 (0)