Ensure the connection tests correctly assert

Author: TWaalen

RCONServerLib.Tests/ConnectionTests.cs

@@ -1,4 +1,6 @@
-using System.Net;
+using System;
+using System.Net;
+using System.Threading;
 using Xunit;
 
 namespace RCONServerLib.Tests
@@ -11,17 +13,23 @@ public void TestAuthFail()
             var server = new RemoteConServer(IPAddress.Any, 27015);
             server.StartListening();
 
-            var client = new RemoteConClient();
-            client.OnAuthResult += success =>
+            bool authResult = false;
+            using (var waitEvent = new AutoResetEvent(false))
             {
-                Assert.False(success);
+                var client = new RemoteConClient();
+                client.OnAuthResult += success =>
+                {
+                    authResult = success;
+
+                    client.Disconnect();
+                    server.StopListening();
+                };
 
-                client.Disconnect();
-                server.StopListening();
-            };
+                client.Connect("127.0.0.1", 27015);
+                client.Authenticate("unitfail");
+            }
 
-            client.Connect("127.0.0.1", 27015);
-            client.Authenticate("unitfail");
+            Assert.False(authResult);
         }
 
         [Fact]
@@ -30,17 +38,25 @@ public void TestAuthSuccess()
             var server = new RemoteConServer(IPAddress.Any, 27015);
             server.StartListening();
 
-            var client = new RemoteConClient();
-            client.OnAuthResult += success =>
+            bool authResult = false;
+            using (var waitEvent = new AutoResetEvent(false))
             {
-                Assert.True(success);
+                var client = new RemoteConClient();
+                client.OnAuthResult += success =>
+                {
+                    authResult = success; 
+
+                    client.Disconnect();
+                    server.StopListening();
+                    waitEvent.Set();
+                };
 
-                client.Disconnect();
-                server.StopListening();
-            };
+                client.Connect("127.0.0.1", 27015);
+                client.Authenticate("changeme");
+                waitEvent.WaitOne();
+            }
 
-            client.Connect("127.0.0.1", 27015);
-            client.Authenticate("changeme");
+            Assert.True(authResult);
         }
 
         [Fact]
@@ -49,21 +65,28 @@ public void TestCommandFail()
             var server = new RemoteConServer(IPAddress.Any, 27015);
             server.StartListening();
 
-            var client = new RemoteConClient();
-            client.OnAuthResult += success =>
+            string commandResult = null;
+            using (var waitEvent = new AutoResetEvent(false))
             {
-                //Assert.True(success);
-                client.SendCommand("testing", result =>
+                var client = new RemoteConClient();
+                client.OnAuthResult += success =>
                 {
-                    Assert.Contains("invalid command", result);
-
-                    client.Disconnect();
-                    server.StopListening();
-                });
-            };
-
-            client.Connect("127.0.0.1", 27015);
-            client.Authenticate("changeme");
+                    client.SendCommand("testing", result =>
+                    {
+                        commandResult = result;
+
+                        client.Disconnect();
+                        server.StopListening();
+                        waitEvent.Set();
+                    });
+                };
+
+                client.Connect("127.0.0.1", 27015);
+                client.Authenticate("changeme");
+                waitEvent.WaitOne();
+            }
+
+            Assert.Contains("invalid command", commandResult);
         }
 
         [Fact]
@@ -72,21 +95,28 @@ public void TestCommandSuccess()
             var server = new RemoteConServer(IPAddress.Any, 27015);
             server.StartListening();
 
-            var client = new RemoteConClient();
-            client.OnAuthResult += success =>
+            string commandResult = null;
+            using (var waitEvent = new AutoResetEvent(false))
             {
-                //Assert.True(success);
-                client.SendCommand("hello", result =>
+                var client = new RemoteConClient();
+                client.OnAuthResult += success =>
                 {
-                    Assert.Contains("world", result);
-
-                    client.Disconnect();
-                    server.StopListening();
-                });
-            };
-
-            client.Connect("127.0.0.1", 27015);
-            client.Authenticate("changeme");
+                    client.SendCommand("hello", result =>
+                    {
+                        commandResult = result;
+
+                        client.Disconnect();
+                        server.StopListening();
+                        waitEvent.Set();
+                    });
+                };
+
+                client.Connect("127.0.0.1", 27015);
+                client.Authenticate("changeme");
+                waitEvent.WaitOne();
+            }
+
+            Assert.Contains("world", commandResult);
         }
     }
 }