style and test

Adjusting URPC tests.
Fixing naming convention violation.

Author: NoelStephensUnity

com.unity.netcode.gameobjects/Editor/NetworkManagerEditor.cs

@@ -222,7 +222,7 @@ private void DrawAllPropertyFields()
         private void DrawTransportField()
         {
 #if RELAY_INTEGRATION_AVAILABLE
-            var useRelay = EditorPrefs.GetBool(k_UseEasyRelayIntegrationKey, false);
+            var useRelay = EditorPrefs.GetBool(m_UseEasyRelayIntegrationKey, false);
 #else
             var useRelay = false;
 #endif
@@ -257,7 +257,7 @@ private void DrawTransportField()
         }
 
 #if RELAY_INTEGRATION_AVAILABLE
-        private readonly string k_UseEasyRelayIntegrationKey = "NetworkManagerUI_UseRelay_" + Application.dataPath.GetHashCode();
+        private readonly string m_UseEasyRelayIntegrationKey = "NetworkManagerUI_UseRelay_" + Application.dataPath.GetHashCode();
         private string m_JoinCode = "";
         private string m_StartConnectionError = null;
         private string m_Region = "";
@@ -272,7 +272,7 @@ private void ShowStartConnectionButtons()
 
 #if RELAY_INTEGRATION_AVAILABLE
             // use editor prefs to persist the setting when entering / leaving play mode / exiting Unity
-            var useRelay = EditorPrefs.GetBool(k_UseEasyRelayIntegrationKey, false);
+            var useRelay = EditorPrefs.GetBool(m_UseEasyRelayIntegrationKey, false);
             GUILayout.BeginHorizontal();
             useRelay = GUILayout.Toggle(useRelay, "Try Relay in the Editor");
 
@@ -284,7 +284,7 @@ private void ShowStartConnectionButtons()
             }
             GUILayout.EndHorizontal();
 
-            EditorPrefs.SetBool(k_UseEasyRelayIntegrationKey, useRelay);
+            EditorPrefs.SetBool(m_UseEasyRelayIntegrationKey, useRelay);
             if (useRelay && !Application.isPlaying && !CloudProjectSettings.projectBound)
             {
                 EditorGUILayout.HelpBox("To use relay, you need to setup your project in the Project Settings in the Services section.", MessageType.Warning);

com.unity.netcode.gameobjects/Tests/Runtime/UniversalRpcTests.cs

@@ -1286,24 +1286,30 @@ public enum AllocationType
         }
 
         // Extending timeout since the added yield return causes this test to commonly timeout
-        [Timeout(360000)]
+        [Timeout(600000)]
         [UnityTest]
         public IEnumerator TestSendingWithGroupOverride()
         {
+            var waitFor = new WaitForFixedUpdate();
             foreach (var defaultSendTo in Enum.GetValues(typeof(SendTo)))
             {
+                m_EnableVerboseDebug = true;
+                VerboseDebug($"Processing: {defaultSendTo}");
+                m_EnableVerboseDebug = false;
+
                 foreach (var recipient in RecipientGroups)
                 {
                     for (ulong objectOwner = 0u; objectOwner <= 2u; ++objectOwner)
                     {
                         for (ulong sender = 0u; sender <= 2u; ++sender)
                         {
+                            yield return waitFor;
                             foreach (var allocationType in Enum.GetValues(typeof(AllocationType)))
                             {
-                                if (++YieldCheck % YieldCycleCount == 0)
-                                {
-                                    yield return null;
-                                }
+                                //if (++YieldCheck % YieldCycleCount == 0)
+                                //{
+                                //    yield return null;
+                                //}
                                 OnInlineSetup();
                                 var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";
 
@@ -1381,24 +1387,31 @@ public enum AllocationType
         }
 
         // Extending timeout since the added yield return causes this test to commonly timeout
-        [Timeout(360000)]
+        [Timeout(600000)]
         [UnityTest]
         public IEnumerator TestSendingWithGroupNotOverride()
         {
+            var waitFor = new WaitForFixedUpdate();
             foreach (var defaultSendTo in Enum.GetValues(typeof(SendTo)))
             {
+                m_EnableVerboseDebug = true;
+                VerboseDebug($"Processing: {defaultSendTo}");
+                m_EnableVerboseDebug = false;
                 foreach (var recipient in RecipientGroups)
                 {
                     for (ulong objectOwner = 0u; objectOwner <= 2u; ++objectOwner)
                     {
                         for (ulong sender = 0u; sender <= 2u; ++sender)
                         {
+                            yield return waitFor;
+
                             foreach (var allocationType in Enum.GetValues(typeof(AllocationType)))
                             {
-                                if (++YieldCheck % YieldCycleCount == 0)
-                                {
-                                    yield return null;
-                                }
+                                //if (++YieldCheck % YieldCycleCount == 0)
+                                //{
+                                //    yield return waitFor;
+                                //}
+
                                 OnInlineSetup();
                                 var sendMethodName = $"DefaultTo{defaultSendTo}AllowOverrideRpc";