From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com> Date: Mon, 28 Apr 2025 10:52:25 +0000 (-0400) Subject: MapManager warning cleanup on tests (#36940) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=88eda89faa941aeae17b041b702d554d2290840b;p=space-station-14.git MapManager warning cleanup on tests (#36940) lets see if this works. --- diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs index 86bcffd336..21a36e7ad5 100644 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs @@ -181,7 +181,7 @@ public sealed class NukeOpsTest } Assert.That(!entMan.EntityExists(nukieStationEnt)); // its not supposed to be a station! - Assert.That(server.MapMan.MapExists(gridsRule.Map)); + Assert.That(mapSys.MapExists(gridsRule.Map)); var nukieMap = mapSys.GetMap(gridsRule.Map!.Value); var targetStation = entMan.GetComponent(ruleComp.TargetStation!.Value); diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs index e067a27854..4644768901 100644 --- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs +++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs @@ -182,9 +182,9 @@ namespace Content.IntegrationTests.Tests var server = pair.Server; await server.WaitIdleAsync(); - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var entitySystemManager = server.ResolveDependency(); + var mapSystem = server.System(); EntityUid packageRight; EntityUid packageWrong; @@ -255,7 +255,7 @@ namespace Content.IntegrationTests.Tests Assert.That(systemMachine.GetAvailableInventory(machine, machineComponent), Has.Count.GreaterThan(0), "Machine available inventory count is not greater than zero after restock."); - mapManager.DeleteMap(testMap.MapId); + mapSystem.DeleteMap(testMap.MapId); }); await pair.CleanReturnAsync(); @@ -269,9 +269,9 @@ namespace Content.IntegrationTests.Tests await server.WaitIdleAsync(); var prototypeManager = server.ResolveDependency(); - var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var entitySystemManager = server.ResolveDependency(); + var mapSystem = server.System(); var damageableSystem = entitySystemManager.GetEntitySystem(); @@ -319,7 +319,7 @@ namespace Content.IntegrationTests.Tests Assert.That(totalRamen, Is.EqualTo(2), "Did not find enough ramen after destroying restock box."); - mapManager.DeleteMap(testMap.MapId); + mapSystem.DeleteMap(testMap.MapId); }); await pair.CleanReturnAsync();