Skip to content

Commit 8c4bb03

Browse files
NoelStephensUnityNoelStephensUnity
committed
tests - enable
Now that we have included the Mutliplayer Tools package in the test project, we needed to remove the !MULTIPLAYER_TOOLS check to assure these tests are actually being run.
1 parent 8576e33 commit 8c4bb03

File tree

8 files changed

+2
-32
lines changed

8 files changed

+2
-32
lines changed

‎com.unity.netcode.gameobjects/Tests/Editor/Build/BuildTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using System.IO;
32
using System.Reflection;
43
using NUnit.Framework;
@@ -41,4 +40,3 @@ public void BasicBuildTest()
4140
}
4241
}
4342
}
44-
#endif

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformBase.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ internal class NetworkTransformTestComponent : NetworkTransform
781781

782782
protected override void OnAuthorityPushTransformState(ref NetworkTransformState networkTransformState)
783783
{
784-
Debug.Log($"[Auth]{name} State Pushed.");
785784
StatePushed = true;
786785
AuthorityLastSentState = networkTransformState;
787786
AuthorityPushedTransformState?.Invoke(ref networkTransformState);
@@ -792,7 +791,6 @@ protected override void OnAuthorityPushTransformState(ref NetworkTransformState
792791
public bool StateUpdated { get; internal set; }
793792
protected override void OnNetworkTransformStateUpdated(ref NetworkTransformState oldState, ref NetworkTransformState newState)
794793
{
795-
Debug.Log($"[Non-Auth]{name} State Updated.");
796794
StateUpdated = true;
797795
base.OnNetworkTransformStateUpdated(ref oldState, ref newState);
798796
}

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformStateTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using NUnit.Framework;
32
using Unity.Netcode.Components;
43
using Unity.Netcode.TestHelpers.Runtime;
@@ -916,4 +915,3 @@ public void TestThresholds(
916915
}
917916
}
918917
}
919-
#endif

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkTransform/NetworkTransformTests.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,70 +13,57 @@ namespace Unity.Netcode.RuntimeTests
1313
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
1414
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
1515
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
16-
#if !MULTIPLAYER_TOOLS
1716
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
1817
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
1918
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
2019
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
2120
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
22-
2321
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
2422
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
2523
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
2624
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
2725
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
28-
2926
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
3027
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
3128
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
3229
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
3330
[TestFixture(HostOrServer.DAHost, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
34-
35-
#endif
3631
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
3732
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
3833
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
39-
#if !MULTIPLAYER_TOOLS
4034
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
4135
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
4236
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
4337
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
4438
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
45-
4639
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
4740
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
4841
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
4942
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
5043
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
51-
5244
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
5345
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
5446
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
5547
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
5648
[TestFixture(HostOrServer.Server, Authority.ServerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
57-
#endif
5849
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
5950
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
6051
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
61-
#if !MULTIPLAYER_TOOLS
6252
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
6353
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
6454
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
6555
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.LegacyLerp)]
6656
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.LegacyLerp)]
67-
6857
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
6958
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
7059
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
7160
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.Lerp)]
7261
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.Lerp)]
73-
7462
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Euler, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
7563
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
7664
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.None, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
7765
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Full, NetworkTransform.InterpolationTypes.SmoothDampening)]
7866
[TestFixture(HostOrServer.Host, Authority.OwnerAuthority, RotationCompression.QuaternionCompress, Rotation.Quaternion, Precision.Half, NetworkTransform.InterpolationTypes.SmoothDampening)]
79-
#endif
8067
internal class NetworkTransformTests : NetworkTransformBase
8168
{
8269
protected const int k_TickRate = 60;
@@ -162,8 +149,6 @@ private void AllChildrenLocalTransformValuesMatch(bool useSubChild, ChildrenTran
162149
}
163150
}
164151

165-
#if !MULTIPLAYER_TOOLS
166-
167152
private void UpdateTransformLocal(NetworkTransform networkTransformTestComponent)
168153
{
169154
networkTransformTestComponent.transform.localPosition += GetRandomVector3(0.5f, 2.0f);
@@ -698,7 +683,6 @@ public void LateJoiningPlayerInitialScaleValues([Values] TransformSpace testLoca
698683
}
699684
}
700685
}
701-
#endif
702686

703687
/// <summary>
704688
/// Tests changing all axial values one at a time.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,7 @@ internal enum Serialization
216216
Default,
217217
}
218218

219-
#if !MULTIPLAYER_TOOLS
220219
[TestFixture(Serialization.EnsureLengthSafety)]
221-
#endif
222220
[TestFixture(Serialization.Default)]
223221
internal class NetworkVariableTests : NetcodeIntegrationTest
224222
{
@@ -339,7 +337,6 @@ private void InitializeServerAndClients(HostOrServer useHost)
339337
TimeTravelToNextTick();
340338
}
341339

342-
#if !MULTIPLAYER_TOOLS
343340
/// <summary>
344341
/// Runs generalized tests on all predefined NetworkVariable types
345342
/// </summary>
@@ -4884,4 +4881,3 @@ protected override IEnumerator OnTearDown()
48844881
}
48854882
}
48864883
}
4887-
#endif

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if !MULTIPLAYER_TOOLS && !NGO_MINIMALPROJECT
1+
#if !NGO_MINIMALPROJECT
22
using System;
33
using System.Collections;
44
using System.Collections.Generic;
@@ -1231,7 +1231,7 @@ private void RunTestTypeA(TestTypes testType)
12311231
{
12321232
foreach (var sendTo in sendToValues)
12331233
{
1234-
UnityEngine.Debug.Log($"[{testType}][{sendTo}]");
1234+
VerboseDebug($"[{testType}][{sendTo}]");
12351235
for (ulong objectOwner = 0; objectOwner <= numberOfClientsULong; objectOwner++)
12361236
{
12371237
for (ulong sender = 0; sender <= numberOfClientsULong; sender++)

‎com.unity.netcode.gameobjects/Tests/Runtime/Timing/TimeIntegrationTest.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using System;
32
using System.Collections;
43
using NUnit.Framework;
@@ -200,4 +199,3 @@ public override int GetHashCode()
200199
}
201200
}
202201
}
203-
#endif

‎com.unity.netcode.gameobjects/Tests/Runtime/TransformInterpolationTests.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#if !MULTIPLAYER_TOOLS
21
using System.Collections;
32
using NUnit.Framework;
43
using Unity.Netcode.Components;
@@ -233,4 +232,3 @@ public IEnumerator TransformInterpolationTest()
233232
}
234233
}
235234
}
236-
#endif

0 commit comments

Comments
 (0)