From 559574ccb9ed7162c8ce0787ab796951b415c669 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 7 Jun 2023 21:08:52 +1000 Subject: [PATCH] Purge IoC resolves from integration tests (#17185) --- .../Tests/Body/LegTest.cs | 7 +++---- .../Tests/Cleanup/EuiManagerTest.cs | 2 +- .../Tests/ContainerOcclusionTest.cs | 21 +++++++++++-------- .../Tests/Damageable/DamageableTest.cs | 2 +- .../Tests/DeleteInventoryTest.cs | 7 ++++--- .../DestructibleDamageTypeTest.cs | 7 ++++--- .../DestructibleDestructionTest.cs | 2 +- .../Tests/Disposal/DisposalUnitTest.cs | 12 ++++++----- .../Tests/DoAfter/DoAfterServerTest.cs | 9 ++++---- .../Tests/DummyIconTest.cs | 7 ++++--- .../Tests/FollowerSystemTest.cs | 10 +++++---- .../Components/ActionBlocking/HandCuffTest.cs | 13 ++++++------ .../Tests/GravityGridTest.cs | 3 +-- .../Tests/HumanInventoryUniformSlotsTest.cs | 19 ++++++++--------- .../Tests/InventoryHelpersTest.cs | 3 +-- .../Tests/Lobby/ServerReloginTest.cs | 11 +++++----- .../Tests/Networking/ReconnectTest.cs | 7 +++++-- .../Networking/SimplePredictReconcileTest.cs | 6 +++--- .../Tests/RestartRoundTest.cs | 3 ++- .../Tests/RoundEndTest.cs | 3 ++- 20 files changed, 83 insertions(+), 71 deletions(-) diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs index d959db5da1..3930e3dfb3 100644 --- a/Content.IntegrationTests/Tests/Body/LegTest.cs +++ b/Content.IntegrationTests/Tests/Body/LegTest.cs @@ -35,14 +35,13 @@ namespace Content.IntegrationTests.Tests.Body var server = pairTracker.Pair.Server; AppearanceComponent appearance = null; + var entityManager = server.ResolveDependency(); + var mapManager = server.ResolveDependency(); await server.WaitAssertion(() => { - var mapManager = IoCManager.Resolve(); - var mapId = mapManager.CreateMap(); - var entityManager = IoCManager.Resolve(); var human = entityManager.SpawnEntity("HumanBodyAndAppearanceDummy", new MapCoordinates(Vector2.Zero, mapId)); @@ -52,7 +51,7 @@ namespace Content.IntegrationTests.Tests.Body Assert.That(!appearance.TryGetData(RotationVisuals.RotationState, out RotationState _)); var bodySystem = entityManager.System(); - var legs = bodySystem.GetBodyChildrenOfType(body.Owner, BodyPartType.Leg, body); + var legs = bodySystem.GetBodyChildrenOfType(human, BodyPartType.Leg, body); foreach (var leg in legs) { diff --git a/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs b/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs index 43d9d3889d..78619f98f4 100644 --- a/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs +++ b/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs @@ -20,11 +20,11 @@ public sealed class EuiManagerTest var server = pairTracker.Pair.Server; var sPlayerManager = server.ResolveDependency(); + var eui = server.ResolveDependency(); await server.WaitAssertion(() => { var clientSession = sPlayerManager.ServerSessions.Single(); - var eui = IoCManager.Resolve(); var ui = new AdminAnnounceEui(); eui.OpenEui(ui, clientSession); }); diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs index 4f1e72ed2f..0ea036d8e1 100644 --- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs +++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs @@ -42,14 +42,15 @@ namespace Content.IntegrationTests.Tests var c = pairTracker.Pair.Client; var cEntities = c.ResolveDependency(); + var ent = s.ResolveDependency(); EntityUid dummy = default; - var ent2 = s.ResolveDependency(); + var mapManager = s.ResolveDependency(); + var mapId = mapManager.CreateMap(); + await s.WaitPost(() => { - var mapId = ent2.GetAllMapIds().Last(); var pos = new MapCoordinates(Vector2.Zero, mapId); - var ent = IoCManager.Resolve(); var entStorage = ent.EntitySysManager.GetEntitySystem(); var container = ent.SpawnEntity("ContainerOcclusionA", pos); dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos); @@ -78,14 +79,15 @@ namespace Content.IntegrationTests.Tests var c = pairTracker.Pair.Client; var cEntities = c.ResolveDependency(); - var ent2 = s.ResolveDependency(); + var ent = s.ResolveDependency(); EntityUid dummy = default; + var mapManager = s.ResolveDependency(); + var mapId = mapManager.CreateMap(); + await s.WaitPost(() => { - var mapId = ent2.GetAllMapIds().Last(); var pos = new MapCoordinates(Vector2.Zero, mapId); - var ent = IoCManager.Resolve(); var entStorage = ent.EntitySysManager.GetEntitySystem(); var container = ent.SpawnEntity("ContainerOcclusionB", pos); dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos); @@ -113,15 +115,16 @@ namespace Content.IntegrationTests.Tests var s = pairTracker.Pair.Server; var c = pairTracker.Pair.Client; - var ent2 = s.ResolveDependency(); var cEntities = c.ResolveDependency(); + var ent = s.ResolveDependency(); EntityUid dummy = default; + var mapManager = s.ResolveDependency(); + var mapId = mapManager.CreateMap(); + await s.WaitPost(() => { - var mapId = ent2.GetAllMapIds().Last(); var pos = new MapCoordinates(Vector2.Zero, mapId); - var ent = IoCManager.Resolve(); var entStorage = ent.EntitySysManager.GetEntitySystem(); var containerA = ent.SpawnEntity("ContainerOcclusionA", pos); var containerB = ent.SpawnEntity("ContainerOcclusionB", pos); diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index 35d8afe458..9920e15e02 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -105,7 +105,7 @@ namespace Content.IntegrationTests.Tests.Damageable var coordinates = new MapCoordinates(0, 0, map); sDamageableEntity = sEntityManager.SpawnEntity("TestDamageableEntityId", coordinates); - sDamageableComponent = IoCManager.Resolve().GetComponent(sDamageableEntity); + sDamageableComponent = sEntityManager.GetComponent(sDamageableEntity); sDamageableSystem = sEntitySystemManager.GetEntitySystem(); group1 = sPrototypeManager.Index("TestGroup1"); diff --git a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs index 6b43d904c8..d1d557964b 100644 --- a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs +++ b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs @@ -20,14 +20,15 @@ namespace Content.IntegrationTests.Tests await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true}); var server = pairTracker.Pair.Server; var testMap = await PoolManager.CreateTestMap(pairTracker); + var entMgr = server.ResolveDependency(); + var sysManager = server.ResolveDependency(); var coordinates = testMap.GridCoords; await server.WaitAssertion(() => { // Spawn everything. - var invSystem = IoCManager.Resolve().GetEntitySystem(); + var invSystem = sysManager.GetEntitySystem(); - var entMgr = IoCManager.Resolve(); var container = entMgr.SpawnEntity(null, coordinates); entMgr.EnsureComponent(container); entMgr.EnsureComponent(container); @@ -35,7 +36,7 @@ namespace Content.IntegrationTests.Tests var child = entMgr.SpawnEntity(null, coordinates); var item = entMgr.EnsureComponent(child); - IoCManager.Resolve().GetEntitySystem().SetSlots(item.Owner, SlotFlags.HEAD, item); + sysManager.GetEntitySystem().SetSlots(child, SlotFlags.HEAD, item); // Equip item. Assert.That(invSystem.TryEquip(container, child, "head"), Is.True); diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs index 29c25be5d9..3cc917add9 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs @@ -26,6 +26,7 @@ namespace Content.IntegrationTests.Tests.Destructible var sEntityManager = server.ResolveDependency(); var sEntitySystemManager = server.ResolveDependency(); + var protoManager = server.ResolveDependency(); EntityUid sDestructibleEntity = default; DamageableComponent sDamageableComponent = null; @@ -37,7 +38,7 @@ namespace Content.IntegrationTests.Tests.Destructible var coordinates = testMap.GridCoords; sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDamageTypeEntityId, coordinates); - sDamageableComponent = IoCManager.Resolve().GetComponent(sDestructibleEntity); + sDamageableComponent = sEntityManager.GetComponent(sDestructibleEntity); sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem(); sTestThresholdListenerSystem.ThresholdsReached.Clear(); sDamageableSystem = sEntitySystemManager.GetEntitySystem(); @@ -52,8 +53,8 @@ namespace Content.IntegrationTests.Tests.Destructible await server.WaitAssertion(() => { - var bluntDamageType = IoCManager.Resolve().Index("TestBlunt"); - var slashDamageType = IoCManager.Resolve().Index("TestSlash"); + var bluntDamageType = protoManager.Index("TestBlunt"); + var slashDamageType = protoManager.Index("TestSlash"); var bluntDamage = new DamageSpecifier(bluntDamageType,5); var slashDamage = new DamageSpecifier(slashDamageType,5); diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs index be26c38c59..c8a38734e7 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs @@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests.Destructible await server.WaitAssertion(() => { - var coordinates = IoCManager.Resolve().GetComponent(sDestructibleEntity).Coordinates; + var coordinates = sEntityManager.GetComponent(sDestructibleEntity).Coordinates; var bruteDamageGroup = sPrototypeManager.Index("TestBrute"); DamageSpecifier bruteDamage = new(bruteDamageGroup,50); diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index c383335241..4d8616bd81 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -156,6 +156,8 @@ namespace Content.IntegrationTests.Tests.Disposal EntityUid wrench = default!; EntityUid disposalUnit = default!; EntityUid disposalTrunk = default!; + + EntityUid unitUid = default; DisposalUnitComponent unitComponent = default!; var entityManager = server.ResolveDependency(); @@ -168,22 +170,22 @@ namespace Content.IntegrationTests.Tests.Disposal wrench = entityManager.SpawnEntity("WrenchDummy", coordinates); disposalUnit = entityManager.SpawnEntity("DisposalUnitDummy", coordinates); disposalTrunk = entityManager.SpawnEntity("DisposalTrunkDummy", - IoCManager.Resolve().GetComponent(disposalUnit).MapPosition); + entityManager.GetComponent(disposalUnit).MapPosition); // Test for components existing - ref DisposalUnitComponent? comp = ref unitComponent!; - Assert.True(entityManager.TryGetComponent(disposalUnit, out comp)); + unitUid = disposalUnit; + Assert.True(entityManager.TryGetComponent(disposalUnit, out unitComponent)); Assert.True(entityManager.HasComponent(disposalTrunk)); // Can't insert, unanchored and unpowered - entityManager.GetComponent(unitComponent!.Owner).Anchored = false; + entityManager.GetComponent(unitUid).Anchored = false; UnitInsertContains(unitComponent, false, human, wrench, disposalUnit, disposalTrunk); }); await server.WaitAssertion(() => { // Anchor the disposal unit - entityManager.GetComponent(unitComponent.Owner).Anchored = true; + entityManager.GetComponent(unitUid).Anchored = true; // No power Assert.False(unitComponent.Powered); diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs index db2df0ade2..390bdff8d3 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs @@ -67,13 +67,14 @@ namespace Content.IntegrationTests.Tests.DoAfter await server.WaitIdleAsync(); var entityManager = server.ResolveDependency(); + var timing = server.ResolveDependency(); var doAfterSystem = entityManager.EntitySysManager.GetEntitySystem(); var ev = new TestDoAfterEvent(); // That it finishes successfully await server.WaitPost(() => { - var tickTime = 1.0f / IoCManager.Resolve().TickRate; + var tickTime = 1.0f / timing.TickRate; var mob = entityManager.SpawnEntity("Dummy", MapCoordinates.Nullspace); var args = new DoAfterArgs(mob, tickTime / 2, ev, null) { Broadcast = true }; Assert.That(doAfterSystem.TryStartDoAfter(args)); @@ -92,14 +93,14 @@ namespace Content.IntegrationTests.Tests.DoAfter await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, ExtraPrototypes = Prototypes}); var server = pairTracker.Pair.Server; var entityManager = server.ResolveDependency(); + var timing = server.ResolveDependency(); var doAfterSystem = entityManager.EntitySysManager.GetEntitySystem(); - DoAfterId? id = default; + DoAfterId? id; var ev = new TestDoAfterEvent(); - await server.WaitPost(() => { - var tickTime = 1.0f / IoCManager.Resolve().TickRate; + var tickTime = 1.0f / timing.TickRate; var mob = entityManager.SpawnEntity("Dummy", MapCoordinates.Nullspace); var args = new DoAfterArgs(mob, tickTime * 2, ev, null) { Broadcast = true }; diff --git a/Content.IntegrationTests/Tests/DummyIconTest.cs b/Content.IntegrationTests/Tests/DummyIconTest.cs index f8351848cf..d51da122d4 100644 --- a/Content.IntegrationTests/Tests/DummyIconTest.cs +++ b/Content.IntegrationTests/Tests/DummyIconTest.cs @@ -17,14 +17,15 @@ namespace Content.IntegrationTests.Tests { await using var pairTracker = await PoolManager.GetServerClient(); var client = pairTracker.Pair.Client; + var prototypeManager = client.ResolveDependency(); + var resourceCache = client.ResolveDependency(); await client.WaitAssertion(() => { - var prototypeManager = IoCManager.Resolve(); - var resourceCache = IoCManager.Resolve(); foreach (var proto in prototypeManager.EnumeratePrototypes()) { - if (proto.NoSpawn || proto.Abstract || !proto.Components.ContainsKey("Sprite")) continue; + if (proto.NoSpawn || proto.Abstract || !proto.Components.ContainsKey("Sprite")) + continue; Assert.DoesNotThrow(() => { diff --git a/Content.IntegrationTests/Tests/FollowerSystemTest.cs b/Content.IntegrationTests/Tests/FollowerSystemTest.cs index 823c94b488..ceef0f35b6 100644 --- a/Content.IntegrationTests/Tests/FollowerSystemTest.cs +++ b/Content.IntegrationTests/Tests/FollowerSystemTest.cs @@ -22,12 +22,14 @@ public sealed class FollowerSystemTest await using var pairTracker = await PoolManager.GetServerClient(new (){NoClient = true}); var server = pairTracker.Pair.Server; + var entMan = server.ResolveDependency(); + var mapMan = server.ResolveDependency(); + var sysMan = server.ResolveDependency(); + var logMan = server.ResolveDependency(); + var logger = logMan.RootSawmill; + await server.WaitPost(() => { - var mapMan = IoCManager.Resolve(); - var entMan = IoCManager.Resolve(); - var sysMan = IoCManager.Resolve(); - var logger = IoCManager.Resolve().RootSawmill; var followerSystem = sysMan.GetEntitySystem(); // Create a map to spawn the observers on. diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs index df660c7761..478972d3ea 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs @@ -49,13 +49,15 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking CuffableComponent cuffed; HandsComponent hands; + var entityManager = server.ResolveDependency(); + var mapManager = server.ResolveDependency(); + var host = server.ResolveDependency(); + await server.WaitAssertion(() => { - var mapManager = IoCManager.Resolve(); var mapId = mapManager.CreateMap(); var coordinates = new MapCoordinates(Vector2.Zero, mapId); - var entityManager = IoCManager.Resolve(); var cuffableSys = entityManager.System(); // Spawn the entities @@ -81,8 +83,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking "Handcuffing a player did not result in their hands being cuffed"); // Test to ensure a player with 4 hands will still only have 2 hands cuffed - AddHand(human); - AddHand(human); + AddHand(human, host); + AddHand(human, host); Assert.That(cuffed.CuffedHandCount, Is.EqualTo(2)); Assert.That(hands.SortedHands.Count, Is.EqualTo(4)); @@ -95,9 +97,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking await pairTracker.CleanReturnAsync(); } - private void AddHand(EntityUid to) + private void AddHand(EntityUid to, IServerConsoleHost host) { - var host = IoCManager.Resolve(); host.ExecuteCommand(null, $"addhand {to}"); } } diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index d4634af6f8..b1ea932b9e 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -38,6 +38,7 @@ namespace Content.IntegrationTests.Tests EntityUid generator = default; var entityMan = server.ResolveDependency(); + var mapMan = server.ResolveDependency(); MapGridComponent grid1 = null; MapGridComponent grid2 = null; @@ -45,8 +46,6 @@ namespace Content.IntegrationTests.Tests // Create grids await server.WaitAssertion(() => { - var mapMan = IoCManager.Resolve(); - var mapId = testMap.MapId; grid1 = mapMan.CreateGrid(mapId); grid2 = mapMan.CreateGrid(mapId); diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs index 65e68d7b9a..9aa19d8d4f 100644 --- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs +++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs @@ -69,12 +69,11 @@ namespace Content.IntegrationTests.Tests EntityUid pocketItem = default; InventorySystem invSystem = default!; + var entityMan = server.ResolveDependency(); await server.WaitAssertion(() => { - invSystem = IoCManager.Resolve().GetEntitySystem(); - var mapMan = IoCManager.Resolve(); - var entityMan = IoCManager.Resolve(); + invSystem = entityMan.System(); human = entityMan.SpawnEntity("HumanDummy", coordinates); uniform = entityMan.SpawnEntity("UniformDummy", coordinates); @@ -96,8 +95,8 @@ namespace Content.IntegrationTests.Tests Assert.That(invSystem.CanEquip(human, tooBigItem, "pocket1", out _), Is.False); // Still failing! Assert.That(invSystem.TryEquip(human, pocketItem, "pocket1")); - Assert.That(IsDescendant(idCard, human)); - Assert.That(IsDescendant(pocketItem, human)); + Assert.That(IsDescendant(idCard, human, entityMan)); + Assert.That(IsDescendant(pocketItem, human, entityMan)); // Now drop the jumpsuit. Assert.That(invSystem.TryUnequip(human, "jumpsuit")); @@ -108,9 +107,9 @@ namespace Content.IntegrationTests.Tests await server.WaitAssertion(() => { // Items have been dropped! - Assert.That(IsDescendant(uniform, human), Is.False); - Assert.That(IsDescendant(idCard, human), Is.False); - Assert.That(IsDescendant(pocketItem, human), Is.False); + Assert.That(IsDescendant(uniform, human, entityMan), Is.False); + Assert.That(IsDescendant(idCard, human, entityMan), Is.False); + Assert.That(IsDescendant(pocketItem, human, entityMan), Is.False); // Ensure everything null here. Assert.That(!invSystem.TryGetSlotEntity(human, "jumpsuit", out _)); @@ -121,9 +120,9 @@ namespace Content.IntegrationTests.Tests await pairTracker.CleanReturnAsync(); } - private static bool IsDescendant(EntityUid descendant, EntityUid parent) + private static bool IsDescendant(EntityUid descendant, EntityUid parent, IEntityManager entManager) { - var xforms = IoCManager.Resolve().GetEntityQuery(); + var xforms = entManager.GetEntityQuery(); var tmpParent = xforms.GetComponent(descendant).ParentUid; while (tmpParent.IsValid()) { diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs index 6a7d8c8c13..d1fafa0d73 100644 --- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs +++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs @@ -47,11 +47,10 @@ namespace Content.IntegrationTests.Tests var server = pairTracker.Pair.Server; var sEntities = server.ResolveDependency(); + var systemMan = sEntities.EntitySysManager; await server.WaitAssertion(() => { - var mapMan = IoCManager.Resolve(); - var systemMan = IoCManager.Resolve(); var human = sEntities.SpawnEntity("InventoryStunnableDummy", MapCoordinates.Nullspace); var invSystem = systemMan.GetEntitySystem(); diff --git a/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs b/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs index f9e6df00b3..2e2cfa4f58 100644 --- a/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs @@ -13,18 +13,18 @@ public sealed class ServerReloginTest [Test] public async Task Relogin() { - IConfigurationManager serverConfig = default; - IPlayerManager serverPlayerMgr = default; - IClientNetManager clientNetManager = default; await using var pairTracker = await PoolManager.GetServerClient(); var server = pairTracker.Pair.Server; var client = pairTracker.Pair.Client; int originalMaxPlayers = 0; string username = null; + + var serverConfig = server.ResolveDependency(); + var serverPlayerMgr = server.ResolveDependency(); + var clientNetManager = client.ResolveDependency(); + await server.WaitAssertion(() => { - serverConfig = IoCManager.Resolve(); - serverPlayerMgr = IoCManager.Resolve(); Assert.That(serverPlayerMgr.PlayerCount, Is.EqualTo(1)); originalMaxPlayers = serverConfig.GetCVar(CCVars.SoftMaxPlayers); username = serverPlayerMgr.Sessions.First().Name; @@ -35,7 +35,6 @@ public sealed class ServerReloginTest await client.WaitAssertion(() => { - clientNetManager = IoCManager.Resolve(); clientNetManager.ClientDisconnect("For testing"); }); diff --git a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs index 5f97339afd..893694d509 100644 --- a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs +++ b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs @@ -16,7 +16,10 @@ namespace Content.IntegrationTests.Tests.Networking var server = pairTracker.Pair.Server; var client = pairTracker.Pair.Client; - await client.WaitPost(() => IoCManager.Resolve().ExecuteCommand("disconnect")); + var host = client.ResolveDependency(); + var netManager = client.ResolveDependency(); + + await client.WaitPost(() => host.ExecuteCommand("disconnect")); // Run some ticks for the disconnect to complete and such. await PoolManager.RunTicksSync(pairTracker.Pair, 5); @@ -26,7 +29,7 @@ namespace Content.IntegrationTests.Tests.Networking // Reconnect. client.SetConnectTarget(server); - await client.WaitPost(() => IoCManager.Resolve().ClientConnect(null, 0, null)); + await client.WaitPost(() => netManager.ClientConnect(null, 0, null)); // Run some ticks for the handshake to complete and such. await PoolManager.RunTicksSync(pairTracker.Pair, 10); diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 869be4c4fe..b7000b5d20 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -70,7 +70,7 @@ namespace Content.IntegrationTests.Tests.Networking var map = sMapManager.CreateMap(); var player = sPlayerManager.ServerSessions.Single(); serverEnt = sEntityManager.SpawnEntity(null, new MapCoordinates((0, 0), map)); - serverComponent = IoCManager.Resolve().AddComponent(serverEnt); + serverComponent = sEntityManager.AddComponent(serverEnt); // Make client "join game" so they receive game state updates. player.JoinGame(); @@ -364,7 +364,7 @@ namespace Content.IntegrationTests.Tests.Networking Assert.That(clientComponent.Foo, Is.True); } } - + cfg.SetCVar(CVars.NetLogging, log); await pairTracker.CleanReturnAsync(); } @@ -432,7 +432,7 @@ namespace Content.IntegrationTests.Tests.Networking private void HandleMessage(SetFooMessage message, EntitySessionEventArgs args) { - var component = IoCManager.Resolve().GetComponent(message.Uid); + var component = EntityManager.GetComponent(message.Uid); var old = component.Foo; if (Allow) { diff --git a/Content.IntegrationTests/Tests/RestartRoundTest.cs b/Content.IntegrationTests/Tests/RestartRoundTest.cs index 6798700224..f54bd74e22 100644 --- a/Content.IntegrationTests/Tests/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/RestartRoundTest.cs @@ -14,10 +14,11 @@ namespace Content.IntegrationTests.Tests { await using var pairTracker = await PoolManager.GetServerClient(); var server = pairTracker.Pair.Server; + var sysManager = server.ResolveDependency(); await server.WaitPost(() => { - IoCManager.Resolve().GetEntitySystem().RestartRound(); + sysManager.GetEntitySystem().RestartRound(); }); await PoolManager.RunTicksSync(pairTracker.Pair, 10); diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs index 9e4b71d8c2..2b8143038a 100644 --- a/Content.IntegrationTests/Tests/RoundEndTest.cs +++ b/Content.IntegrationTests/Tests/RoundEndTest.cs @@ -22,6 +22,7 @@ namespace Content.IntegrationTests.Tests var server = pairTracker.Pair.Server; + var entManager = server.ResolveDependency(); var config = server.ResolveDependency(); var sysManager = server.ResolveDependency(); var ticker = sysManager.GetEntitySystem(); @@ -42,7 +43,7 @@ namespace Content.IntegrationTests.Tests await server.WaitAssertion(() => { - var bus = IoCManager.Resolve().EventBus; + var bus = entManager.EventBus; bus.SubscribeEvent(EventSource.Local, this, _ => { Interlocked.Increment(ref eventCount); });