Skip to content

Commit e2a0d4a

Browse files
EmandMEmandM
committed
Fix implicit conversions in the tests
1 parent 862ac81 commit e2a0d4a

File tree

3 files changed

+26
-17
lines changed

3 files changed

+26
-17
lines changed

‎com.unity.netcode.gameobjects/Tests/Runtime/DistributedAuthority/DistributedAuthorityCodecTests.cs‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,12 @@ public IEnumerator UnnamedMessage()
350350
yield return SendMessage(ref message);
351351
}
352352

353+
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
354+
private readonly SceneHandle m_TestSceneHandle = SceneHandle.FromRawData(23456);
355+
#else
356+
private readonly SceneHandle m_TestSceneHandle = 23456;
357+
#endif
358+
353359
[UnityTest]
354360
public IEnumerator SceneEventMessageLoad()
355361
{
@@ -360,7 +366,7 @@ public IEnumerator SceneEventMessageLoad()
360366
LoadSceneMode = LoadSceneMode.Single,
361367
SceneEventProgressId = Guid.NewGuid(),
362368
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
363-
SceneHandle = 23456,
369+
SceneHandle = m_TestSceneHandle,
364370
};
365371

366372
var message = new SceneEventMessage()
@@ -386,7 +392,7 @@ public IEnumerator SceneEventMessageLoadWithObjects()
386392
LoadSceneMode = LoadSceneMode.Single,
387393
SceneEventProgressId = Guid.NewGuid(),
388394
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
389-
SceneHandle = 23456,
395+
SceneHandle = m_TestSceneHandle,
390396
};
391397

392398
var message = new SceneEventMessage()
@@ -406,7 +412,7 @@ public IEnumerator SceneEventMessageUnload()
406412
LoadSceneMode = LoadSceneMode.Single,
407413
SceneEventProgressId = Guid.NewGuid(),
408414
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
409-
SceneHandle = 23456,
415+
SceneHandle = m_TestSceneHandle,
410416
};
411417

412418
var message = new SceneEventMessage()
@@ -426,7 +432,7 @@ public IEnumerator SceneEventMessageLoadComplete()
426432
LoadSceneMode = LoadSceneMode.Single,
427433
SceneEventProgressId = Guid.NewGuid(),
428434
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
429-
SceneHandle = 23456,
435+
SceneHandle = m_TestSceneHandle,
430436
};
431437

432438
var message = new SceneEventMessage()
@@ -446,7 +452,7 @@ public IEnumerator SceneEventMessageUnloadComplete()
446452
LoadSceneMode = LoadSceneMode.Single,
447453
SceneEventProgressId = Guid.NewGuid(),
448454
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
449-
SceneHandle = 23456,
455+
SceneHandle = m_TestSceneHandle,
450456
};
451457

452458
var message = new SceneEventMessage()
@@ -466,7 +472,7 @@ public IEnumerator SceneEventMessageLoadCompleted()
466472
LoadSceneMode = LoadSceneMode.Single,
467473
SceneEventProgressId = Guid.NewGuid(),
468474
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
469-
SceneHandle = 23456,
475+
SceneHandle = m_TestSceneHandle,
470476
ClientsCompleted = new List<ulong>() { k_ClientId },
471477
ClientsTimedOut = new List<ulong>() { 123456789 },
472478
};
@@ -488,7 +494,7 @@ public IEnumerator SceneEventMessageUnloadLoadCompleted()
488494
LoadSceneMode = LoadSceneMode.Single,
489495
SceneEventProgressId = Guid.NewGuid(),
490496
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
491-
SceneHandle = 23456,
497+
SceneHandle = m_TestSceneHandle,
492498
ClientsCompleted = new List<ulong>() { k_ClientId },
493499
ClientsTimedOut = new List<ulong>() { 123456789 },
494500
};
@@ -510,7 +516,7 @@ public IEnumerator SceneEventMessageSynchronize()
510516
LoadSceneMode = LoadSceneMode.Single,
511517
ClientSynchronizationMode = LoadSceneMode.Single,
512518
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
513-
SceneHandle = 23456,
519+
SceneHandle = m_TestSceneHandle,
514520
ScenesToSynchronize = new Queue<uint>()
515521
};
516522
eventData.ScenesToSynchronize.Enqueue(101);
@@ -535,7 +541,7 @@ public IEnumerator SceneEventMessageReSynchronize()
535541
LoadSceneMode = LoadSceneMode.Single,
536542
ClientSynchronizationMode = LoadSceneMode.Single,
537543
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
538-
SceneHandle = 23456,
544+
SceneHandle = m_TestSceneHandle,
539545
};
540546

541547
var message = new SceneEventMessage()
@@ -555,7 +561,7 @@ public IEnumerator SceneEventMessageSynchronizeComplete()
555561
LoadSceneMode = LoadSceneMode.Single,
556562
ClientSynchronizationMode = LoadSceneMode.Single,
557563
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
558-
SceneHandle = 23456,
564+
SceneHandle = m_TestSceneHandle,
559565
};
560566

561567
var message = new SceneEventMessage()

‎com.unity.netcode.gameobjects/Tests/Runtime/NetworkObject/NetworkObjectOnSpawnTests.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
using Unity.Netcode.TestHelpers.Runtime;
66
using UnityEngine;
77
using UnityEngine.TestTools;
8+
#if SCENE_MANAGEMENT_SCENE_HANDLE_AVAILABLE
9+
using UnityEngine.SceneManagement;
10+
#endif
811

912
namespace Unity.Netcode.RuntimeTests
1013
{
@@ -371,7 +374,7 @@ public void DynamicallySpawnedNoSceneOriginException()
371374
var gameObject = new GameObject();
372375
var networkObject = gameObject.AddComponent<NetworkObject>();
373376
networkObject.IsSpawned = true;
374-
networkObject.SceneOriginHandle = 0;
377+
networkObject.SceneOriginHandle = SceneHandle.None;
375378
networkObject.IsSceneObject = false;
376379
// This validates invoking GetSceneOriginHandle will not throw an exception for a dynamically spawned NetworkObject
377380
// when the scene of origin handle is zero

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,9 +1523,9 @@ public void WhenSerializingAndDeserializingValueTypeNetworkVariables_ValuesAreSe
15231523
else if (testType == typeof(SceneHandle))
15241524
{
15251525
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
1526-
TestValueType(SceneHandle.FromRawData(int.MinValue + 5), SceneHandle.FromRawData(int.MaxValue));
1526+
TestValueType(SceneHandle.FromRawData(3), SceneHandle.FromRawData(4));
15271527
#else
1528-
TestValueType(int.MinValue + 5, int.MaxValue);
1528+
TestValueType(5, 6);
15291529
#endif
15301530
}
15311531
else if (testType == typeof(NetworkVariableTestStruct))
@@ -1750,8 +1750,8 @@ public void WhenSerializingAndDeserializingValueTypeNativeArrayNetworkVariables_
17501750
{
17511751
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
17521752
TestValueTypeNativeArray(
1753-
new NativeArray<SceneHandle>(new SceneHandle[] { SceneHandle.FromRawData(int.MinValue + 5), SceneHandle.FromRawData(int.MaxValue) }, Allocator.Temp),
1754-
new NativeArray<SceneHandle>(new SceneHandle[] { SceneHandle.FromRawData(0), SceneHandle.FromRawData(int.MinValue + 10), SceneHandle.FromRawData(int.MaxValue - 10) }, Allocator.Temp));
1753+
new NativeArray<SceneHandle>(new SceneHandle[] { SceneHandle.FromRawData(5), SceneHandle.FromRawData(12) }, Allocator.Temp),
1754+
new NativeArray<SceneHandle>(new SceneHandle[] { SceneHandle.FromRawData(0), SceneHandle.FromRawData(30), SceneHandle.FromRawData(45) }, Allocator.Temp));
17551755
#else
17561756
TestValueTypeNativeArray(
17571757
new NativeArray<SceneHandle>(new SceneHandle[] { int.MinValue + 5, int.MaxValue }, Allocator.Temp),
@@ -3542,8 +3542,8 @@ public void WhenSerializingAndDeserializingValueTypeNativeListNetworkVariables_V
35423542
{
35433543
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
35443544
TestValueTypeNativeList(
3545-
new NativeList<SceneHandle>(Allocator.Temp) { SceneHandle.FromRawData(int.MinValue + 5), SceneHandle.FromRawData(int.MaxValue) },
3546-
new NativeList<SceneHandle>(Allocator.Temp) { SceneHandle.FromRawData(0), SceneHandle.FromRawData(int.MinValue + 10), SceneHandle.FromRawData(int.MaxValue - 10) });
3545+
new NativeList<SceneHandle>(Allocator.Temp) { SceneHandle.FromRawData(5), SceneHandle.FromRawData(12) },
3546+
new NativeList<SceneHandle>(Allocator.Temp) { SceneHandle.FromRawData(0), SceneHandle.FromRawData(20), SceneHandle.FromRawData(32) });
35473547
#else
35483548
TestValueTypeNativeList(
35493549
new NativeList<SceneHandle>(Allocator.Temp) { int.MinValue + 5, int.MaxValue },

0 commit comments

Comments
 (0)