* Use OAuth2 for EasyNetQ.Management.Client in OAuth2 tests.

Author: lukebakken

projects/Test/Common/TestConnectionRecoveryBase.cs

@@ -40,8 +40,9 @@
 
 namespace Test
 {
-    public class TestConnectionRecoveryBase : IntegrationFixture
+    public class TestConnectionRecoveryBase : IntegrationFixture, IDisposable
     {
+        private readonly Util _util = new Util();
         protected readonly byte[] _messageBody;
         protected const ushort TotalMessageCount = 16384;
         protected const ushort CloseAtCount = 16;
@@ -52,6 +53,8 @@ public TestConnectionRecoveryBase(ITestOutputHelper output)
             _messageBody = GetRandomBody(4096);
         }
 
+        public void Dispose() => _util.Dispose();
+
         protected Task AssertConsumerCountAsync(string q, int count)
         {
             return WithTemporaryChannelAsync(async ch =>
@@ -166,7 +169,7 @@ internal async Task<AutorecoveringConnection> CreateAutorecoveringConnectionWith
 
         protected Task CloseConnectionAsync(IConnection conn)
         {
-            return Util.CloseConnectionAsync(conn);
+            return _util.CloseConnectionAsync(conn);
         }
 
         protected Task CloseAndWaitForRecoveryAsync()

projects/Test/Common/Util.cs

@@ -8,41 +8,41 @@
 
 namespace Test
 {
-    public static class Util
+    public class Util : IDisposable
     {
-        private static readonly ManagementClient s_managementClient;
+        private readonly ManagementClient _managementClient;
         private static readonly bool s_isWindows = false;
 
         static Util()
         {
-            var managementUri = new Uri("http://localhost:15672");
-            s_managementClient = new ManagementClient(managementUri, "guest", "guest");
             s_isWindows = InitIsWindows();
         }
 
-        public static string Now => DateTime.UtcNow.ToString("o", CultureInfo.InvariantCulture);
-
-        public static bool IsWindows => s_isWindows;
+        public Util() : this("guest", "guest")
+        {
+        }
 
-        private static bool InitIsWindows()
+        public Util(string managementUsername, string managementPassword)
         {
-            PlatformID platform = Environment.OSVersion.Platform;
-            if (platform == PlatformID.Win32NT)
+            if (string.IsNullOrEmpty(managementUsername))
             {
-                return true;
+                throw new ArgumentNullException(nameof(managementUsername));
             }
 
-            string os = Environment.GetEnvironmentVariable("OS");
-            if (os != null)
+            if (string.IsNullOrEmpty(managementPassword))
             {
-                os = os.Trim();
-                return os == "Windows_NT";
+                throw new ArgumentNullException(nameof(managementPassword));
             }
 
-            return false;
+            var managementUri = new Uri("http://localhost:15672");
+            _managementClient = new ManagementClient(managementUri, managementUsername, managementPassword);
         }
 
-        public static async Task CloseConnectionAsync(IConnection conn)
+        public static string Now => DateTime.UtcNow.ToString("o", CultureInfo.InvariantCulture);
+
+        public static bool IsWindows => s_isWindows;
+
+        public async Task CloseConnectionAsync(IConnection conn)
         {
             ushort tries = 1;
             EasyNetQ.Management.Client.Model.Connection connectionToClose = null;
@@ -61,7 +61,7 @@ public static async Task CloseConnectionAsync(IConnection conn)
 
                         await Task.Delay(TimeSpan.FromSeconds(delaySeconds));
 
-                        connections = await s_managementClient.GetConnectionsAsync();
+                        connections = await _managementClient.GetConnectionsAsync();
                     } while (connections.Count == 0);
 
                     connectionToClose = connections.Where(c0 =>
@@ -79,7 +79,7 @@ public static async Task CloseConnectionAsync(IConnection conn)
                 {
                     try
                     {
-                        await s_managementClient.CloseConnectionAsync(connectionToClose);
+                        await _managementClient.CloseConnectionAsync(connectionToClose);
                         return;
                     }
                     catch (UnexpectedHttpStatusCodeException)
@@ -94,5 +94,25 @@ public static async Task CloseConnectionAsync(IConnection conn)
                 throw new InvalidOperationException($"Could not delete connection: '{conn.ClientProvidedName}'");
             }
         }
+
+        public void Dispose() => _managementClient.Dispose();
+
+        private static bool InitIsWindows()
+        {
+            PlatformID platform = Environment.OSVersion.Platform;
+            if (platform == PlatformID.Win32NT)
+            {
+                return true;
+            }
+
+            string os = Environment.GetEnvironmentVariable("OS");
+            if (os != null)
+            {
+                os = os.Trim();
+                return os == "Windows_NT";
+            }
+
+            return false;
+        }
     }
 }

projects/Test/OAuth2/TestOAuth2.cs

@@ -137,6 +137,7 @@ public class TestOAuth2 : IAsyncLifetime
         private readonly OAuth2ClientCredentialsProvider _credentialsProvider;
         private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
 
+        private Util? _util;
         private IConnection? _connection;
         private CredentialsRefresher? _credentialsRefresher;
 
@@ -206,6 +207,12 @@ private Task OnCredentialsRefreshedAsync(Credentials? credentials, Exception? ex
                 Assert.Fail("credentials arg is unexpectedly null!");
             }
 
+            if (_util != null)
+            {
+                _util.Dispose();
+            }
+            _util = new Util(credentials.UserName, credentials.Password);
+
             return _connection.UpdateSecretAsync(credentials.Password, "Token refresh", cancellationToken);
         }
 
@@ -231,7 +238,8 @@ public async void IntegrationTest()
 
                             if (i == 2)
                             {
-                                closeConnectionTask = Util.CloseConnectionAsync(_connection);
+                                Assert.NotNull(_util);
+                                closeConnectionTask = _util.CloseConnectionAsync(_connection);
                             }
 
                             await Task.Delay(delaySpan);