* Update deps

* Modify `ConnectionRecoveryTests` to use `IntegrationTest` base class `_containerId` property.

Author: lukebakken

.gitignore

@@ -11,6 +11,7 @@ InternalTrace*
 *.lock.json
 nunit-agent*
 *.pyc
+test-diag.log
 test-output.log
 TestResults.xml
 TestResult.xml

Directory.Packages.props

@@ -8,11 +8,11 @@
     <!-- HAClient -->
     <PackageVersion Include="DotNext.Threading" Version="5.15.0" />
     <!-- Tests -->
-    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="Xunit.SkippableFact" Version="1.4.13" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="EasyNetQ.Management.Client" Version="3.0.0" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework)=='netstandard2.0'">
@@ -37,6 +37,6 @@
   <ItemGroup Condition="'$(IsPackable)'=='true'">
     <GlobalPackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <GlobalPackageReference Include="MinVer" Version="5.0.0" />
+    <GlobalPackageReference Include="MinVer" Version="6.0.0" />
   </ItemGroup>
 </Project>

Tests/ConnectionRecoveryTests.cs

@@ -44,7 +44,8 @@ public void Reset()
     public int CurrentAttempt => 1;
 }
 
-public class ConnectionRecoveryTests(ITestOutputHelper testOutputHelper) : IntegrationTest(testOutputHelper)
+public class ConnectionRecoveryTests(ITestOutputHelper testOutputHelper)
+    : IntegrationTest(testOutputHelper, setupConnectionAndManagement: false)
 {
     /// <summary>
     /// The normal close the status should be correct and error null
@@ -57,10 +58,11 @@ public class ConnectionRecoveryTests(ITestOutputHelper testOutputHelper) : Integ
     [InlineData(false)]
     public async Task NormalCloseTheStatusShouldBeCorrectAndErrorNull(bool activeRecovery)
     {
-        string localContainerId = $"{_containerId}_normal-close-connection-name";
+        Assert.Null(_connection);
+        Assert.Null(_management);
 
         IConnection connection = await AmqpConnection.CreateAsync(
-            ConnectionSettingBuilder.Create().ContainerId(localContainerId).RecoveryConfiguration(
+            ConnectionSettingBuilder.Create().ContainerId(_containerId).RecoveryConfiguration(
                 RecoveryConfiguration.Create().Activated(activeRecovery).Topology(false)).Build());
 
         TaskCompletionSource<bool> connectionClosedStateTcs = CreateTaskCompletionSource<bool>();
@@ -104,11 +106,11 @@ public async Task NormalCloseTheStatusShouldBeCorrectAndErrorNull(bool activeRec
     [Fact]
     public async Task UnexpectedCloseTheStatusShouldBeCorrectAndErrorNotNull()
     {
-
-        string localContainerId = $"{_containerId}_unexpected-close-connection-name";
+        Assert.Null(_connection);
+        Assert.Null(_management);
 
         IConnection connection = await AmqpConnection.CreateAsync(
-            ConnectionSettingBuilder.Create().ContainerId(localContainerId).RecoveryConfiguration(
+            ConnectionSettingBuilder.Create().ContainerId(_containerId).RecoveryConfiguration(
                 RecoveryConfiguration.Create().Activated(true).Topology(false)
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())).Build());
 
@@ -144,7 +146,7 @@ public async Task UnexpectedCloseTheStatusShouldBeCorrectAndErrorNotNull()
         };
 
         Assert.Equal(State.Open, connection.State);
-        await SystemUtils.WaitUntilConnectionIsKilled(localContainerId);
+        await SystemUtils.WaitUntilConnectionIsKilled(_containerId);
         await listErrorCountGreaterThanOrEqualToTwoTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
 
         Assert.Equal(State.Open, listFromStatus[0]);
@@ -177,10 +179,11 @@ public async Task UnexpectedCloseTheStatusShouldBeCorrectAndErrorNotNull()
     [Fact]
     public async Task OverrideTheBackOffWithBackOffDisabled()
     {
+        Assert.Null(_connection);
+        Assert.Null(_management);
 
-        string localContainerId = $"{_containerId}_override-backoff-disabled-connection-name";
         IConnection connection = await AmqpConnection.CreateAsync(
-            ConnectionSettingBuilder.Create().ContainerId(localContainerId).RecoveryConfiguration(
+            ConnectionSettingBuilder.Create().ContainerId(_containerId).RecoveryConfiguration(
                 RecoveryConfiguration.Create().Activated(true).Topology(false).BackOffDelayPolicy(
                     new FakeBackOffDelayPolicyDisabled())).Build());
 
@@ -211,7 +214,7 @@ public async Task OverrideTheBackOffWithBackOffDisabled()
         };
 
         Assert.Equal(State.Open, connection.State);
-        await SystemUtils.WaitUntilConnectionIsKilled(localContainerId);
+        await SystemUtils.WaitUntilConnectionIsKilled(_containerId);
 
         await listFromStatusCountGreaterOrEqualToTwo.Task.WaitAsync(TimeSpan.FromSeconds(5));
 
@@ -239,14 +242,16 @@ public async Task OverrideTheBackOffWithBackOffDisabled()
     [Fact]
     public async Task RecoveryTopologyShouldRecoverTheTempQueues()
     {
-        string localContainerId = $"{_containerId}_temp-queue-should-recover-connection-name";
+        Assert.Null(_connection);
+        Assert.Null(_management);
+
         string queueName = $"temp-queue-should-recover-{true}";
-        var connection = await AmqpConnection.CreateAsync(
+        IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(true))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
         TaskCompletionSource<bool> twoRecoveryEventsSeenTcs = CreateTaskCompletionSource<bool>();
         int recoveryEvents = 0;
@@ -262,7 +267,7 @@ public async Task RecoveryTopologyShouldRecoverTheTempQueues()
         await management.Queue().Name(queueName).AutoDelete(true).Exclusive(true).DeclareAsync();
         Assert.Equal(1, topologyListener.QueueCount());
 
-        await SystemUtils.WaitUntilConnectionIsKilled(localContainerId);
+        await SystemUtils.WaitUntilConnectionIsKilled(_containerId);
         await twoRecoveryEventsSeenTcs.Task.WaitAsync(TimeSpan.FromSeconds(10));
         await SystemUtils.WaitUntilFuncAsync(() => recoveryEvents == 2);
 
@@ -285,14 +290,16 @@ public async Task RecoveryTopologyShouldRecoverTheTempQueues()
     [Fact]
     public async Task RecoveryTopologyShouldNotRecoverTheTempQueues()
     {
+        Assert.Null(_connection);
+        Assert.Null(_management);
+
         string queueName = $"temp-queue-should-recover-{false}";
-        string localContainerId = $"{_containerId}_temp-queue-should-not-recover-connection-name";
-        var connection = await AmqpConnection.CreateAsync(
+        IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(false))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
         TaskCompletionSource<bool> oneRecoveryEventSeenTcs = CreateTaskCompletionSource<bool>();
         int recoveryEvents = 0;
@@ -308,7 +315,7 @@ public async Task RecoveryTopologyShouldNotRecoverTheTempQueues()
         await management.Queue().Name(queueName).AutoDelete(true).Exclusive(true).DeclareAsync();
         Assert.Equal(1, topologyListener.QueueCount());
 
-        await SystemUtils.WaitUntilConnectionIsKilled(localContainerId);
+        await SystemUtils.WaitUntilConnectionIsKilled(_containerId);
         await oneRecoveryEventSeenTcs.Task.WaitAsync(TimeSpan.FromSeconds(10));
 
         await SystemUtils.WaitUntilQueueDeletedAsync(queueName);
@@ -322,14 +329,16 @@ public async Task RecoveryTopologyShouldNotRecoverTheTempQueues()
     [InlineData(false)]
     public async Task RecoveryTopologyShouldRecoverExchanges(bool topologyEnabled)
     {
+        Assert.Null(_connection);
+        Assert.Null(_management);
+
         const string exchangeName = "exchange-should-recover";
-        string localContainerId = $"{_containerId}_exchange-should-recover-connection-name";
         IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(topologyEnabled))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
         TaskCompletionSource<bool> twoRecoveryEventsSeenTcs = CreateTaskCompletionSource<bool>();
         int recoveryEvents = 0;
@@ -351,7 +360,7 @@ public async Task RecoveryTopologyShouldRecoverExchanges(bool topologyEnabled)
         // the exchange is recovered.
         await SystemUtils.DeleteExchangeAsync("exchange-should-recover");
 
-        await SystemUtils.WaitUntilConnectionIsKilled(localContainerId);
+        await SystemUtils.WaitUntilConnectionIsKilled(_containerId);
 
         await twoRecoveryEventsSeenTcs.Task.WaitAsync(TimeSpan.FromSeconds(10));
 
@@ -379,13 +388,15 @@ public async Task RecoveryTopologyShouldRecoverExchanges(bool topologyEnabled)
     [InlineData(false)]
     public async Task RecoveryTopologyShouldRecoverBindings(bool topologyEnabled)
     {
-        string localContainerId = $"{_containerId}_binding-should-recover-connection-name";
-        var connection = await AmqpConnection.CreateAsync(
+        Assert.Null(_connection);
+        Assert.Null(_management);
+
+        IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(topologyEnabled))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
         TaskCompletionSource<bool> twoRecoveryEventsSeenTcs = CreateTaskCompletionSource<bool>();
         int recoveryEvents = 0;
@@ -398,14 +409,14 @@ public async Task RecoveryTopologyShouldRecoverBindings(bool topologyEnabled)
         };
         IManagement management = connection.Management();
         ITopologyListener topologyListener = ((IManagementTopology)management).TopologyListener();
-        var exSpec = management.Exchange().Name("exchange-should-recover-binding").AutoDelete(true)
+        IExchangeSpecification exSpec = management.Exchange().Name("exchange-should-recover-binding").AutoDelete(true)
             .Type(ExchangeType.DIRECT);
         await exSpec.DeclareAsync();
         Assert.Equal(1, topologyListener.ExchangeCount());
-        var queueSpec = management.Queue().Name("queue-should-recover-binding").AutoDelete(true).Exclusive(true);
+        IQueueSpecification queueSpec = management.Queue().Name("queue-should-recover-binding").AutoDelete(true).Exclusive(true);
         await queueSpec.DeclareAsync();
         Assert.Equal(1, topologyListener.QueueCount());
-        var bindingSpec =
+        IBindingSpecification bindingSpec =
             management.Binding().SourceExchange(exSpec).DestinationQueue(queueSpec).Key("key");
         await bindingSpec.BindAsync();
         Assert.Equal(1, topologyListener.BindingCount());
@@ -415,7 +426,7 @@ public async Task RecoveryTopologyShouldRecoverBindings(bool topologyEnabled)
         await SystemUtils.DeleteExchangeAsync("exchange-should-recover-binding");
 
         // The queue will be deleted due of the auto-delete flag
-        await SystemUtils.WaitUntilConnectionIsKilled(localContainerId);
+        await SystemUtils.WaitUntilConnectionIsKilled(_containerId);
         await twoRecoveryEventsSeenTcs.Task.WaitAsync(TimeSpan.FromSeconds(10));
 
         if (topologyEnabled)
@@ -458,28 +469,29 @@ await SystemUtils.WaitUntilBindingsBetweenExchangeAndQueueDontExistAsync("exchan
     [Fact]
     public async Task RemoveAQueueShouldRemoveTheBindings()
     {
-        string localContainerId = $"{_containerId}_remove-queue-should-remove-binding-connection-name";
+        Assert.Null(_connection);
+        Assert.Null(_management);
 
         IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(true))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
 
         IManagement management = connection.Management();
         ITopologyListener topologyListener = ((IManagementTopology)management).TopologyListener();
-        var exSpec = management.Exchange().Name("e-remove-a-should-remove-binding")
+        IExchangeSpecification exSpec = management.Exchange().Name("e-remove-a-should-remove-binding")
             .Type(ExchangeType.DIRECT);
 
         await exSpec.DeclareAsync();
 
-        var queueSpec = management.Queue().Name("q-remove-a-should-remove-binding")
+        IQueueSpecification queueSpec = management.Queue().Name("q-remove-a-should-remove-binding")
             .AutoDelete(true).Exclusive(true);
         await queueSpec.DeclareAsync();
 
-        var queueSpecWontDeleted = management.Queue().Name("q-remove-a-should-remove-binding-wont-delete")
+        IQueueSpecification queueSpecWontDeleted = management.Queue().Name("q-remove-a-should-remove-binding-wont-delete")
             .AutoDelete(true).Exclusive(true);
 
         await queueSpecWontDeleted.DeclareAsync();
@@ -519,28 +531,30 @@ await SystemUtils.WaitUntilBindingsBetweenExchangeAndQueueDontExistAsync("e-remo
     [Fact]
     public async Task RemoveAnExchangeShouldRemoveTheBindings()
     {
-        string localContainerId = $"{_containerId}_remove-exchange-should-remove-binding-connection-name";
-        var connection = await AmqpConnection.CreateAsync(
+        Assert.Null(_connection);
+        Assert.Null(_management);
+
+        IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(true))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
 
         IManagement management = connection.Management();
         ITopologyListener topologyListener = ((IManagementTopology)management).TopologyListener();
-        var exSpec = management.Exchange().Name("e-remove-exchange-should-remove-binding")
+        IExchangeSpecification exSpec = management.Exchange().Name("e-remove-exchange-should-remove-binding")
             .Type(ExchangeType.DIRECT);
 
         await exSpec.DeclareAsync();
 
-        var exSpecWontDeleted = management.Exchange().Name("e-remove-exchange-should-remove-binding-wont-delete")
+        IExchangeSpecification exSpecWontDeleted = management.Exchange().Name("e-remove-exchange-should-remove-binding-wont-delete")
             .Type(ExchangeType.DIRECT);
 
         await exSpecWontDeleted.DeclareAsync();
 
-        var queueSpec = management.Queue().Name("q-remove-exchange-should-remove-binding")
+        IQueueSpecification queueSpec = management.Queue().Name("q-remove-exchange-should-remove-binding")
             .AutoDelete(true).Exclusive(true);
         await queueSpec.DeclareAsync();
 
@@ -584,24 +598,26 @@ await SystemUtils.WaitUntilBindingsBetweenExchangeAndQueueDontExistAsync(
     [Fact]
     public async Task RemoveAnExchangeBoundToAnotherExchangeShouldRemoveTheBindings()
     {
-        string localContainerId = $"{_containerId}_remove-exchange-bound-to-another-exchange-should-remove-binding-connection-name";
-        var connection = await AmqpConnection.CreateAsync(
+        Assert.Null(_connection);
+        Assert.Null(_management);
+
+        IConnection connection = await AmqpConnection.CreateAsync(
             ConnectionSettingBuilder.Create()
                 .RecoveryConfiguration(RecoveryConfiguration.Create()
                     .BackOffDelayPolicy(new FakeFastBackOffDelay())
                     .Topology(true))
-                .ContainerId(localContainerId)
+                .ContainerId(_containerId)
                 .Build());
 
         IManagement management = connection.Management();
         ITopologyListener topologyListener = ((IManagementTopology)management).TopologyListener();
 
-        var exSpec = management.Exchange().Name("e-remove-exchange-bound-to-another-exchange-should-remove-binding")
+        IExchangeSpecification exSpec = management.Exchange().Name("e-remove-exchange-bound-to-another-exchange-should-remove-binding")
             .Type(ExchangeType.DIRECT);
 
         await exSpec.DeclareAsync();
 
-        var exSpecDestination = management.Exchange()
+        IExchangeSpecification exSpecDestination = management.Exchange()
             .Name("e-remove-exchange-bound-to-another-exchange-should-remove-binding-destination")
             .Type(ExchangeType.DIRECT);
 

Tests/IntegrationTest.cs

@@ -44,10 +44,11 @@ public IntegrationTest(ITestOutputHelper testOutputHelper,
     {
         _testOutputHelper = testOutputHelper;
         _setupConnectionAndManagement = setupConnectionAndManagement;
-        _queueName = $"{_testDisplayName}-queue-{Now}";
-        _exchangeName = $"{_testDisplayName}-exchange-{Now}";
 
         _testDisplayName = InitTestDisplayName();
+
+        _queueName = $"{_testDisplayName}-queue-{Now}";
+        _exchangeName = $"{_testDisplayName}-exchange-{Now}";
         _containerId = $"{_testDisplayName}:{Now}";
 
         if (SystemUtils.IsVerbose)
@@ -85,7 +86,7 @@ public virtual async Task DisposeAsync()
     {
         if (SystemUtils.IsVerbose)
         {
-            _testOutputHelper.WriteLine("{0} [DEBUG] [END] {1}", DateTime.Now, _testDisplayName);
+            _testOutputHelper.WriteLine("{0} [DEBUG] [START DISPOSE] {1}", DateTime.Now, _testDisplayName);
         }
 
         if (_management is not null && _management.State == State.Open)
@@ -120,6 +121,11 @@ public virtual async Task DisposeAsync()
             Assert.Equal(State.Closed, _connection.State);
             _connection.Dispose();
         }
+
+        if (SystemUtils.IsVerbose)
+        {
+            _testOutputHelper.WriteLine("{0} [DEBUG] [END DISPOSE] {1}", DateTime.Now, _testDisplayName);
+        }
     }
 
     protected static Random S_Random

build.ps1

@@ -32,7 +32,7 @@ if ($RunTests -or $RunTestsUntilFailure)
         Write-Host "Running tests: Build.csproj traversal (all frameworks)" -ForegroundColor "Magenta"
         if ($verbose)
         {
-            dotnet test $build_csproj_file --environment=RABBITMQ_CLIENT_TESTS_VERBOSE=true --no-build --logger 'console;verbosity=detailed'
+            dotnet test $build_csproj_file --diag test-diag.log --environment=RABBITMQ_CLIENT_TESTS_VERBOSE=true --no-build --logger 'console;verbosity=detailed'
         }
         else
         {