Merge branch 'develop' into refactor/netbhv-netobj-prop

Author: TwoTenPvP

com.unity.multiplayer.mlapi/Tests/Runtime/MultiInstance/MultiInstanceHelpers.cs

@@ -6,14 +6,18 @@
 using NUnit.Framework;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using Object = UnityEngine.Object;
 
 namespace MLAPI.RuntimeTests
 {
     /// <summary>
     /// Provides helpers for running multi instance tests.
     /// </summary>
-    internal static class MultiInstanceHelpers
+    public static class MultiInstanceHelpers
     {
+
+        public static List<NetworkManager> NetworkManagerInstances = new List<NetworkManager>();
+
         /// <summary>
         /// Creates NetworkingManagers and configures them for use in a multi instance setting.
         /// </summary>
@@ -28,11 +32,10 @@ public static bool Create(int clientCount, out NetworkManager server, out Networ
             {
                 // Create gameObject
                 var go = new GameObject("NetworkManager - Client - " + i);
-
                 // Create networkManager component
                 clients[i] = go.AddComponent<NetworkManager>();
 
-                // Set config
+                // Set the NetworkConfig
                 clients[i].NetworkConfig = new NetworkConfig()
                 {
                     // Set the current scene to prevent unexpected log messages which would trigger a failure
@@ -42,14 +45,17 @@ public static bool Create(int clientCount, out NetworkManager server, out Networ
                 };
             }
 
+            NetworkManagerInstances = new List<NetworkManager>(clients);
+
             {
                 // Create gameObject
                 var go = new GameObject("NetworkManager - Server");
 
                 // Create networkManager component
                 server = go.AddComponent<NetworkManager>();
+                NetworkManagerInstances.Insert(0, server);
 
-                // Set config
+                // Set the NetworkConfig
                 server.NetworkConfig = new NetworkConfig()
                 {
                     // Set the current scene to prevent unexpected log messages which would trigger a failure
@@ -62,6 +68,25 @@ public static bool Create(int clientCount, out NetworkManager server, out Networ
             return true;
         }
 
+
+        public static void ShutdownAndClean()
+        {
+            // Shutdown the server which forces clients to disconnect
+            foreach (var networkManager in NetworkManagerInstances)
+            {
+                if (networkManager.IsServer)
+                {
+                    networkManager.StopHost();
+                }
+            }
+
+            // Destroy the network manager instances
+            foreach (var networkManager in NetworkManagerInstances)
+            {
+                Object.Destroy(networkManager.gameObject);
+            }
+        }
+
         /// <summary>
         /// Starts NetworkManager instances created by the Create method.
         /// </summary>
@@ -170,6 +195,52 @@ public static IEnumerator WaitForClientConnected(NetworkManager client, Coroutin
             }
         }
 
+        public static IEnumerator WaitForClientsConnected(NetworkManager[] clients, CoroutineResultWrapper<bool> result = null, int maxFrames = 64)
+        {
+            // Make sure none are the host client
+            foreach (var client in clients)
+            {
+                if (client.IsServer)
+                {
+                    throw new InvalidOperationException("Cannot wait for connected as server");
+                }
+            }
+
+
+            int startFrame = Time.frameCount;
+            var allConnected = true;
+            while (Time.frameCount - startFrame <= maxFrames)
+            {
+                allConnected = true;
+                foreach (var client in clients)
+                {
+                    if (!client.IsConnectedClient)
+                    {
+                        allConnected = false;
+                        break;
+                    }
+                }
+                if (allConnected)
+                {
+                    break;
+                }
+                int nextFrameId = Time.frameCount + 1;
+                yield return new WaitUntil(() => Time.frameCount >= nextFrameId);
+            }
+
+            if (result != null)
+            {
+                result.Result = allConnected;
+            }
+            else
+            {
+                foreach (var client in clients)
+                {
+                    Assert.True(client.IsConnectedClient, $"Client {client.LocalClientId} never connected");
+                }
+            }
+        }
+
         /// <summary>
         /// Waits on the server side for 1 client to be connected
         /// </summary>
@@ -199,7 +270,40 @@ public static IEnumerator WaitForClientConnectedToServer(NetworkManager server,
             }
             else
             {
-                Assert.True(res, "Client never connected to server");
+                Assert.True(res, "A Client never connected to server");
+            }
+        }
+
+        /// <summary>
+        /// Waits on the server side for 1 client to be connected
+        /// </summary>
+        /// <param name="server">The server</param>
+        /// <param name="result">The result. If null, it will automatically assert</param>
+        /// <param name="maxFrames">The max frames to wait for</param>
+        public static IEnumerator WaitForClientsConnectedToServer(NetworkManager server, int clientCount, CoroutineResultWrapper<bool> result = null, int maxFrames = 64)
+        {
+            if (!server.IsServer)
+            {
+                throw new InvalidOperationException("Cannot wait for connected as client");
+            }
+
+            int startFrame = Time.frameCount;
+
+            while (Time.frameCount - startFrame <= maxFrames && server.ConnectedClients.Count != clientCount)
+            {
+                int nextFrameId = Time.frameCount + 1;
+                yield return new WaitUntil(() => Time.frameCount >= nextFrameId);
+            }
+
+            bool res = server.ConnectedClients.Count == clientCount;
+
+            if (result != null)
+            {
+                result.Result = res;
+            }
+            else
+            {
+                Assert.True(res, "A client never connected to server");
             }
         }
 

com.unity.multiplayer.mlapi/Tests/Runtime/Transport/SIPTransport.cs

@@ -44,24 +44,35 @@ public override void DisconnectLocalClient()
         {
             Type = NetworkEvent.Disconnect,
             Channel = NetworkChannel.Internal,
-            ConnectionId = m_LocalConnection.ConnectionId,
+            ConnectionId = m_LocalConnection != null ? m_LocalConnection.ConnectionId : ServerClientId,
             Data = new ArraySegment<byte>()
         });
 
-        // Inject local disconnect
-        m_LocalConnection.IncomingBuffer.Enqueue(new Event
+        if (m_LocalConnection != null)
         {
-            Type = NetworkEvent.Disconnect,
-            Channel = NetworkChannel.Internal,
-            ConnectionId = m_LocalConnection.ConnectionId,
-            Data = new ArraySegment<byte>()
-        });
+            // Inject local disconnect
+            m_LocalConnection.IncomingBuffer.Enqueue(new Event
+            {
+                Type = NetworkEvent.Disconnect,
+                Channel = NetworkChannel.Internal,
+                ConnectionId = m_LocalConnection.ConnectionId,
+                Data = new ArraySegment<byte>()
+            });
+
+            if (s_Server != null && m_LocalConnection != null)
+            {
+                // Remove the connection
+                s_Server.Transport.m_Clients.Remove(m_LocalConnection.ConnectionId);
+            }
 
-        // Remove the connection
-        s_Server.Transport.m_Clients.Remove(m_LocalConnection.ConnectionId);
+            if (m_LocalConnection.ConnectionId == ServerClientId)
+            {
+                s_Server = null;
+            }
 
-        // Remove the local connection
-        m_LocalConnection = null;
+            // Remove the local connection
+            m_LocalConnection = null;
+        }
     }
 
     // Called by server
@@ -115,6 +126,12 @@ public override void Shutdown()
                 Data = new ArraySegment<byte>()
             });
         }
+        
+        if (m_LocalConnection != null && m_LocalConnection.ConnectionId == ServerClientId)
+        {
+            s_Server = null;
+        }
+        
 
         // TODO: Cleanup
     }