Skip to content

Commit e34f05a

Browse files
authored
fix: Fix prefab tests failing on trunk (#2458)
1 parent 566719a commit e34f05a

File tree

1 file changed

+17
-0
lines changed

1 file changed

+17
-0
lines changed

com.unity.netcode.gameobjects/Tests/Editor/NetworkManagerConfigurationTests.cs

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,11 @@ public void WhenNetworkConfigContainsOldPrefabList_TheyMigrateProperlyToTheNewLi
125125
var overridingTargetPrefab = new GameObject("Overriding Target Prefab").AddComponent<NetworkObject>();
126126
var sourcePrefabToOverride = new GameObject("Overriding Source Prefab").AddComponent<NetworkObject>();
127127

128+
regularPrefab.GlobalObjectIdHash = 1;
129+
overriddenPrefab.GlobalObjectIdHash = 2;
130+
overridingTargetPrefab.GlobalObjectIdHash = 3;
131+
sourcePrefabToOverride.GlobalObjectIdHash = 4;
132+
128133
networkConfig.OldPrefabList = new List<NetworkPrefab>();
129134
networkConfig.OldPrefabList.Add(new NetworkPrefab { Prefab = regularPrefab.gameObject });
130135
networkConfig.OldPrefabList.Add(new NetworkPrefab { Prefab = overriddenPrefab.gameObject, Override = NetworkPrefabOverride.Prefab, OverridingTargetPrefab = overridingTargetPrefab.gameObject, SourcePrefabToOverride = sourcePrefabToOverride.gameObject, SourceHashToOverride = 123456 });
@@ -166,6 +171,10 @@ public void WhenModifyingPrefabListUsingNetworkManagerAPI_ModificationIsLocal()
166171
var object2 = new GameObject("Object 2").AddComponent<NetworkObject>();
167172
var object3 = new GameObject("Object 3").AddComponent<NetworkObject>();
168173

174+
object1.GlobalObjectIdHash = 1;
175+
object2.GlobalObjectIdHash = 2;
176+
object3.GlobalObjectIdHash = 3;
177+
169178
var sharedList = ScriptableObject.CreateInstance<NetworkPrefabsList>();
170179
sharedList.List.Add(new NetworkPrefab { Prefab = object1.gameObject });
171180

@@ -208,6 +217,10 @@ public void WhenModifyingPrefabListUsingPrefabsAPI_ModificationIsLocal()
208217
var object2 = new GameObject("Object 2").AddComponent<NetworkObject>();
209218
var object3 = new GameObject("Object 3").AddComponent<NetworkObject>();
210219

220+
object1.GlobalObjectIdHash = 1;
221+
object2.GlobalObjectIdHash = 2;
222+
object3.GlobalObjectIdHash = 3;
223+
211224
var sharedList = ScriptableObject.CreateInstance<NetworkPrefabsList>();
212225
sharedList.List.Add(new NetworkPrefab { Prefab = object1.gameObject });
213226

@@ -250,6 +263,10 @@ public void WhenModifyingPrefabListUsingPrefabsListAPI_ModificationIsShared()
250263
var object2 = new GameObject("Object 2").AddComponent<NetworkObject>();
251264
var object3 = new GameObject("Object 3").AddComponent<NetworkObject>();
252265

266+
object1.GlobalObjectIdHash = 1;
267+
object2.GlobalObjectIdHash = 2;
268+
object3.GlobalObjectIdHash = 3;
269+
253270
var sharedList = ScriptableObject.CreateInstance<NetworkPrefabsList>();
254271
sharedList.List.Add(new NetworkPrefab { Prefab = object1.gameObject });
255272

0 commit comments

Comments
 (0)