test

Potentially last iteration on fixing/updating integration tests.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Tests/Runtime/Components/BufferDataValidationComponent.cs

@@ -38,8 +38,7 @@ internal class BufferDataValidationComponent : NetworkBehaviour
         private List<byte> m_SendBuffer;
         private List<byte> m_PreCalculatedBufferValues;
 
-        // Start is called before the first frame update
-        private void Start()
+        protected override void OnNetworkPreSpawn(ref NetworkManager networkManager)
         {
             m_WaitForValidation = false;
             m_CurrentBufferSize = BufferSizeStart;
@@ -49,6 +48,7 @@ private void Start()
             {
                 m_PreCalculatedBufferValues.Add((byte)Random.Range(0, 255));
             }
+            base.OnNetworkPreSpawn(ref networkManager);
         }
 
         /// <summary>
@@ -67,7 +67,12 @@ public bool IsTestComplete()
         // Update is called once per frame
         private void Update()
         {
-            if (NetworkManager.Singleton.IsListening && EnableTesting && !IsTestComplete() && !m_WaitForValidation)
+            if (!EnableTesting || !IsSpawned)
+            {
+                return;
+            }
+
+            if (!m_WaitForValidation && !IsTestComplete())
             {
                 m_SendBuffer.Clear();
                 //Keep the current contents of the bufffer and fill the buffer with the delta difference of the buffer's current size and new size from the m_PreCalculatedBufferValues
@@ -77,16 +82,16 @@ private void Update()
                 m_WaitForValidation = true;
 
                 //Send the buffer
-                SendBufferServerRpc(m_SendBuffer.ToArray());
+                SendBufferRpc(m_SendBuffer.ToArray());
             }
+
         }
 
         /// <summary>
-        /// Server side RPC for testing
+        /// Sends to self for buffer queue testing
         /// </summary>
-        /// <param name="parameters">server rpc parameters</param>
-        [ServerRpc]
-        private void SendBufferServerRpc(byte[] buffer)
+        [Rpc(SendTo.Me)]
+        private void SendBufferRpc(byte[] buffer)
         {
             TestFailed = !NetworkManagerHelper.BuffersMatch(0, buffer.Length, buffer, m_SendBuffer.ToArray());
             if (!TestFailed)

com.unity.netcode.gameobjects/Tests/Runtime/Components/NetworkVariableTestComponent.cs

@@ -242,7 +242,7 @@ internal class NetworkVariableTestComponent : NetworkBehaviour
         private float m_WaitForChangesTimeout;
 
         // Start is called before the first frame update
-        private void InitializeTest()
+        public void InitializeTest()
         {
             // Generic Constructor Test Coverage
             m_NetworkVariableBool = new NetworkVariable<bool>();
@@ -358,7 +358,7 @@ public bool IsTestComplete()
 
         public void Awake()
         {
-            InitializeTest();
+            //InitializeTest();
         }
 
         public void AssertAllValuesAreCorrect()
@@ -423,56 +423,52 @@ public void AssertAllValuesAreCorrect()
         // Update is called once per frame
         private void Update()
         {
-            if (EnableTesting)
+            if (!EnableTesting || !IsSpawned)
             {
-                //Added timeout functionality for near future changes to NetworkVariables
-                if (!m_FinishedTests && m_ChangesAppliedToNetworkVariables)
-                {
-                    //We finish testing if all NetworkVariables changed their value or we timed out waiting for
-                    //all NetworkVariables to change their value
-                    m_FinishedTests = DidAllValuesChange() || (m_WaitForChangesTimeout < Time.realtimeSinceStartup);
-                }
-                else
+                return;
+            }
+
+            if (!m_ChangesAppliedToNetworkVariables)
+            {
+                //Now change all of the values to make sure we are at least testing the local callback
+                m_NetworkVariableBool.Value = false;
+                m_NetworkVariableByte.Value = 255;
+                m_NetworkVariableColor.Value = new Color(100, 100, 100);
+                m_NetworkVariableColor32.Value = new Color32(100, 100, 100, 100);
+                m_NetworkVariableDouble.Value = 1000;
+                m_NetworkVariableFloat.Value = 1000.0f;
+                m_NetworkVariableInt.Value = 1000;
+                m_NetworkVariableLong.Value = 100000;
+                m_NetworkVariableSByte.Value = -127;
+                m_NetworkVariableQuaternion.Value = new Quaternion(100, 100, 100, 100);
+                m_NetworkVariablePose.Value = new Pose(new Vector3(100, 100, 100), new Quaternion(100, 100, 100, 100));
+                m_NetworkVariableShort.Value = short.MaxValue;
+                m_NetworkVariableVector4.Value = new Vector4(1000, 1000, 1000, 1000);
+                m_NetworkVariableVector3.Value = new Vector3(1000, 1000, 1000);
+                m_NetworkVariableVector2.Value = new Vector2(1000, 1000);
+                m_NetworkVariableRay.Value = new Ray(Vector3.one, Vector3.right);
+                m_NetworkVariableULong.Value = ulong.MaxValue;
+                m_NetworkVariableUInt.Value = uint.MaxValue;
+                m_NetworkVariableUShort.Value = ushort.MaxValue;
+                m_NetworkVariableFixedString32.Value = new FixedString32Bytes("FixedString32Bytes");
+                m_NetworkVariableFixedString64.Value = new FixedString64Bytes("FixedString64Bytes");
+                m_NetworkVariableFixedString128.Value = new FixedString128Bytes("FixedString128Bytes");
+                m_NetworkVariableFixedString512.Value = new FixedString512Bytes("FixedString512Bytes");
+                m_NetworkVariableFixedString4096.Value = new FixedString4096Bytes("FixedString4096Bytes");
+                m_NetworkVariableManaged.Value = new ManagedNetworkSerializableType
                 {
-                    if (NetworkManager != null && NetworkManager.IsListening)
-                    {
-                        //Now change all of the values to make sure we are at least testing the local callback
-                        m_NetworkVariableBool.Value = false;
-                        m_NetworkVariableByte.Value = 255;
-                        m_NetworkVariableColor.Value = new Color(100, 100, 100);
-                        m_NetworkVariableColor32.Value = new Color32(100, 100, 100, 100);
-                        m_NetworkVariableDouble.Value = 1000;
-                        m_NetworkVariableFloat.Value = 1000.0f;
-                        m_NetworkVariableInt.Value = 1000;
-                        m_NetworkVariableLong.Value = 100000;
-                        m_NetworkVariableSByte.Value = -127;
-                        m_NetworkVariableQuaternion.Value = new Quaternion(100, 100, 100, 100);
-                        m_NetworkVariablePose.Value = new Pose(new Vector3(100, 100, 100), new Quaternion(100, 100, 100, 100));
-                        m_NetworkVariableShort.Value = short.MaxValue;
-                        m_NetworkVariableVector4.Value = new Vector4(1000, 1000, 1000, 1000);
-                        m_NetworkVariableVector3.Value = new Vector3(1000, 1000, 1000);
-                        m_NetworkVariableVector2.Value = new Vector2(1000, 1000);
-                        m_NetworkVariableRay.Value = new Ray(Vector3.one, Vector3.right);
-                        m_NetworkVariableULong.Value = ulong.MaxValue;
-                        m_NetworkVariableUInt.Value = uint.MaxValue;
-                        m_NetworkVariableUShort.Value = ushort.MaxValue;
-                        m_NetworkVariableFixedString32.Value = new FixedString32Bytes("FixedString32Bytes");
-                        m_NetworkVariableFixedString64.Value = new FixedString64Bytes("FixedString64Bytes");
-                        m_NetworkVariableFixedString128.Value = new FixedString128Bytes("FixedString128Bytes");
-                        m_NetworkVariableFixedString512.Value = new FixedString512Bytes("FixedString512Bytes");
-                        m_NetworkVariableFixedString4096.Value = new FixedString4096Bytes("FixedString4096Bytes");
-                        m_NetworkVariableManaged.Value = new ManagedNetworkSerializableType
-                        {
-                            Str = "ManagedNetworkSerializableType",
-                            Ints = new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000 },
-                            Embedded = new EmbeddedManagedNetworkSerializableType { Int = 20000 }
-                        };
-
-                        //Set the timeout (i.e. how long we will wait for all NetworkVariables to have registered their changes)
-                        m_WaitForChangesTimeout = Time.realtimeSinceStartup + 0.50f;
-                        m_ChangesAppliedToNetworkVariables = true;
-                    }
-                }
+                    Str = "ManagedNetworkSerializableType",
+                    Ints = new[] { 1000, 2000, 3000, 4000, 5000, 6000, 7000, 8000, 9000, 10000 },
+                    Embedded = new EmbeddedManagedNetworkSerializableType { Int = 20000 }
+                };
+
+                //Set the timeout (i.e. how long we will wait for all NetworkVariables to have registered their changes)
+                m_WaitForChangesTimeout = Time.realtimeSinceStartup + 0.50f;
+                m_ChangesAppliedToNetworkVariables = true;
+            }
+            else if (!m_FinishedTests)
+            {
+                m_FinishedTests = DidAllValuesChange() || (m_WaitForChangesTimeout < Time.realtimeSinceStartup);
             }
         }
     }

com.unity.netcode.gameobjects/Tests/Runtime/NetworkVariable/NetworkVariableTests.cs

@@ -251,9 +251,17 @@ public NetworkVariableTests(Serialization serialization)
             m_EnsureLengthSafety = serialization == Serialization.EnsureLengthSafety;
         }
 
+        private bool m_CanStart = false;
+
         protected override bool CanStartServerAndClients()
         {
-            return false;
+            return m_CanStart;
+        }
+
+        protected override void OnInlineSetup()
+        {
+            m_CanStart = false;
+            base.OnInlineSetup();
         }
 
         protected override void OnOneTimeSetup()
@@ -343,21 +351,44 @@ private void InitializeServerAndClients(HostOrServer useHost)
         [Test]
         public void AllNetworkVariableTypes([Values] HostOrServer useHost)
         {
+            var prefabToSpawn = CreateNetworkObjectPrefab("NetVarTest");
+            prefabToSpawn.AddComponent<NetworkVariableTestComponent>();
+
+            m_CanStart = true;
+            StartServerAndClientsWithTimeTravel();
+            var authority = GetAuthorityNetworkManager();
+
+            // Shutdown the other clients
+            foreach(var networkManager in m_NetworkManagers)
+            {
+                if (networkManager == authority)
+                {
+                    continue;
+                }
+                StopOneClientWithTimeTravel(networkManager);
+            }
+
             // Create, instantiate, and host
             // This would normally go in Setup, but since every other test but this one
             //  uses NetworkManagerHelper, and it does its own NetworkManager setup / teardown,
             //  for now we put this within this one test until we migrate it to MIH
-            Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out NetworkManager server, useHost == HostOrServer.Host ? NetworkManagerHelper.NetworkManagerOperatingMode.Host : NetworkManagerHelper.NetworkManagerOperatingMode.Server));
+            //Assert.IsTrue(NetworkManagerHelper.StartNetworkManager(out NetworkManager server, useHost == HostOrServer.Host ? NetworkManagerHelper.NetworkManagerOperatingMode.Host : NetworkManagerHelper.NetworkManagerOperatingMode.Server));
 
-            Assert.IsTrue(server.IsHost == (useHost == HostOrServer.Host), $"{nameof(useHost)} does not match the server.IsHost value!");
+            //Assert.IsTrue(server.IsHost == (useHost == HostOrServer.Host), $"{nameof(useHost)} does not match the server.IsHost value!");
 
-            Guid gameObjectId = NetworkManagerHelper.AddGameNetworkObject("NetworkVariableTestComponent");
+            //Guid gameObjectId = NetworkManagerHelper.AddGameNetworkObject("NetworkVariableTestComponent");
 
-            var networkVariableTestComponent = NetworkManagerHelper.AddComponentToObject<NetworkVariableTestComponent>(gameObjectId);
+            //var networkVariableTestComponent = NetworkManagerHelper.AddComponentToObject<NetworkVariableTestComponent>(gameObjectId);
 
-            NetworkManagerHelper.SpawnNetworkObject(gameObjectId);
+            //NetworkManagerHelper.SpawnNetworkObject(gameObjectId);
+            
+            var instance = SpawnObject(prefabToSpawn, authority);
+            var networkVariableTestComponent = instance.GetComponent<NetworkVariableTestComponent>();
+
+            Assert.IsTrue(networkVariableTestComponent.IsSpawned, $"Failed to spawn {instance.name}!");
 
             // Start Testing
+            networkVariableTestComponent.InitializeTest();
             networkVariableTestComponent.EnableTesting = true;
 
             var success = WaitForConditionOrTimeOutWithTimeTravel(() => true == networkVariableTestComponent.IsTestComplete());
@@ -370,12 +401,15 @@ public void AllNetworkVariableTypes([Values] HostOrServer useHost)
             networkVariableTestComponent.AssertAllValuesAreCorrect();
 
             // Disable this once we are done.
-            networkVariableTestComponent.gameObject.SetActive(false);
+
+            
+
 
             // This would normally go in Teardown, but since every other test but this one
             //  uses NetworkManagerHelper, and it does its own NetworkManager setup / teardown,
             //  for now we put this within this one test until we migrate it to MIH
-            NetworkManagerHelper.ShutdownNetworkManager();
+            StopOneClientWithTimeTravel(authority);
+            //NetworkManagerHelper.ShutdownNetworkManager();
         }
 
         [Test]

com.unity.netcode.gameobjects/Tests/Runtime/Prefabs/NetworkPrefabHandlerSynchronizationTests.cs

@@ -35,7 +35,10 @@ public IEnumerator NetworkPrefabHandlerSpawnAndSynchronizeTests()
 
             var networkObjectToSpawnOnClient = m_ClientSideValidPrefab.GetComponent<NetworkObject>();
             nonAuthority.PrefabHandler.AddHandler(m_ClientSideExceptionPrefab, new NetworkPrefabExceptionThrower());
-            nonAuthority.PrefabHandler.AddHandler(m_ValidPrefab, new NetworkPrefabInstanceHandler(networkObjectToSpawnOnClient));
+            var prefabHandlerObject = new GameObject();
+            var prefabHandler = prefabHandlerObject.AddComponent<NetworkPrefabInstanceHandler>();
+            prefabHandler.Initialize(nonAuthority, m_ValidPrefab.GetComponent<NetworkObject>());
+            //nonAuthority.PrefabHandler.AddHandler(m_ValidPrefab, new NetworkPrefabInstanceHandler(networkObjectToSpawnOnClient));
 
             var authority = GetAuthorityNetworkManager();
 
@@ -60,8 +63,14 @@ public IEnumerator NetworkPrefabHandlerSpawnAndSynchronizeTests()
 
             // Create a new client and register the same PrefabHandlers on the client
             var newClient = CreateNewClient();
+            var prefabHandlerObject2 = new GameObject();
+            var prefabHandler2 = prefabHandlerObject2.AddComponent<NetworkPrefabExceptionThrower>();
+
             newClient.PrefabHandler.AddHandler(m_ClientSideExceptionPrefab, new NetworkPrefabExceptionThrower());
-            newClient.PrefabHandler.AddHandler(m_ValidPrefab, new NetworkPrefabInstanceHandler(networkObjectToSpawnOnClient));
+
+            var prefabHandlerObject3 = new GameObject();
+            var prefabHandler3 = prefabHandlerObject3.AddComponent<NetworkPrefabInstanceHandler>();
+            prefabHandler3.Initialize(nonAuthority, networkObjectToSpawnOnClient);
 
             // Expect assertions from the new client
             LogAssert.Expect(LogType.Exception, "Exception: exception while instantiating");
@@ -92,6 +101,8 @@ public IEnumerator NetworkPrefabHandlerSpawnAndSynchronizeTests()
                     Assert.That(networkManager.SpawnManager.SpawnedObjects.ContainsKey(exceptionObject.NetworkObjectId), Is.False, "Non authority should not have spawned exception object!");
                 }
             }
+
+            Object.Destroy(prefabHandlerObject);
         }
     }
 }