Skip to content

Commit 39fe8be

Browse files
Test-update
Some general clean up and separating areas of the NetworkTransformOrderOfOperations by region to help with navigating through the different parts.
1 parent 70f7a1a commit 39fe8be

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformOrderOfOperations.cs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace Unity.Netcode.RuntimeTests
1616
[TestFixture(HostOrServer.Server)]
1717
internal class NetworkTransformOrderOfOperations : IntegrationTestWithApproximation
1818
{
19+
#region Configuration, Properties, and Overrides
1920
protected override int NumberOfClients => 4;
2021

2122
private NetworkObject m_GenericObject;
@@ -30,6 +31,12 @@ public NetworkTransformOrderOfOperations(HostOrServer host) : base(host)
3031
{
3132
}
3233

34+
protected override IEnumerator OnSetup()
35+
{
36+
SpawnSequenceController.Clear();
37+
return base.OnSetup();
38+
}
39+
3340
protected override void OnServerAndClientsCreated()
3441
{
3542
m_ObjectToTest = CreateNetworkObjectPrefab("TestObject").GetComponent<NetworkObject>();
@@ -40,6 +47,9 @@ protected override void OnServerAndClientsCreated()
4047
base.OnServerAndClientsCreated();
4148
}
4249

50+
#endregion
51+
52+
#region (Wait for) Conditional Methods
4353
private bool VerifyGenericsSpawned(StringBuilder errorLog)
4454
{
4555
var conditionMet = true;
@@ -81,12 +91,6 @@ private IEnumerator SpawnGenericParents()
8191
AssertOnTimeout("Failure to spawn generics on one or more clients!");
8292
}
8393

84-
protected override IEnumerator OnSetup()
85-
{
86-
SpawnSequenceController.Clear();
87-
return base.OnSetup();
88-
}
89-
9094
private bool TransformsMatch(StringBuilder errorLog)
9195
{
9296
var hasErrors = false;
@@ -146,7 +150,9 @@ private bool TransformsMatch(StringBuilder errorLog)
146150
}
147151
return !hasErrors;
148152
}
153+
#endregion
149154

155+
#region OrderOfOperations Core Test Methods
150156
[UnityTest]
151157

152158
public IEnumerator OrderOfOperations()
@@ -260,7 +266,9 @@ private IEnumerator RunTestSequences(bool spawnWithObservers = true, bool spawnW
260266
// Reset the controller's global settings
261267
SpawnSequenceController.Clear();
262268
}
269+
#endregion
263270

271+
#region Test Sequence Configurations
264272
/// <summary>
265273
/// Test-1:
266274
/// Authority-> Spawn, change ownership, (wait), parent
@@ -623,7 +631,9 @@ private void ConfigureSequencesTest10(NetworkObject parent1, NetworkObject paren
623631
SpawnSequenceController.AddAction(parentSequence1);
624632
SpawnSequenceController.AddAction(parentRpc);
625633
}
634+
#endregion
626635

636+
#region Sequence Class Definitions
627637
internal class NetworkShowSequence : SpawnSequence
628638
{
629639
public List<ulong> Clients = new List<ulong>();
@@ -954,7 +964,6 @@ public void TeleportRpc(Vector3 position, Quaternion rotation, RpcParams rpcPara
954964
}
955965
}
956966

957-
958967
public class ReferenceRpcHelper : NetworkBehaviour
959968
{
960969
[Rpc(SendTo.NotMe)]
@@ -993,5 +1002,6 @@ public void ReferenceParentRpc(NetworkObjectReference targetChildReference, Netw
9931002
networkObjectChild.TrySetParent(networkObjectParent);
9941003
}
9951004
}
1005+
#endregion
9961006
}
9971007
}

0 commit comments

Comments
 (0)