Code Cleanup: Integration Tests

Content.IntegrationTests/Tests/Actions/ActionsAddedTest.cs

@@ -18,7 +18,7 @@ public sealed class ActionsAddedTest
     [Test]
     public async Task TestCombatActionsAdded()
     {
-        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false});
+        await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, DummyTicker = false });
         var server = pair.Server;
         var client = pair.Client;
         var sEntMan = server.ResolveDependency<IEntityManager>();

Content.IntegrationTests/Tests/Body/GibTest.cs

@@ -5,7 +5,7 @@
 namespace Content.IntegrationTests.Tests.Body;
 
 [TestFixture]
-public sealed  class GibTest
+public sealed class GibTest
 {
     [Test]
     public async Task TestGib()

Content.IntegrationTests/Tests/Body/LegTest.cs

@@ -5,7 +5,6 @@
 using Content.Shared.Rotation;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
-using Robust.Shared.Maths;
 
 namespace Content.IntegrationTests.Tests.Body
 {
@@ -40,13 +39,14 @@ public async Task RemoveLegsFallTest()
             var appearanceSystem = entityManager.System<SharedAppearanceSystem>();
             var xformSystem = entityManager.System<SharedTransformSystem>();
 
+            var map = await pair.CreateTestMap();
+
             await server.WaitAssertion(() =>
             {
-                var mapId = mapManager.CreateMap();
                 BodyComponent body = null;
 
                 human = entityManager.SpawnEntity("HumanBodyAndAppearanceDummy",
-                    new MapCoordinates(Vector2.Zero, mapId));
+                    new MapCoordinates(Vector2.Zero, map.MapId));
 
                 Assert.Multiple(() =>
                 {
@@ -61,7 +61,7 @@ await server.WaitAssertion(() =>
 
                 foreach (var leg in legs)
                 {
-                    xformSystem.DetachParentToNull(leg.Id, entityManager.GetComponent<TransformComponent>(leg.Id));
+                    xformSystem.DetachEntity(leg.Id, entityManager.GetComponent<TransformComponent>(leg.Id));
                 }
             });
 

Content.IntegrationTests/Tests/Body/LungTest.cs

@@ -60,8 +60,8 @@ public async Task AirConsistencyTest()
             var mapManager = server.ResolveDependency<IMapManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
             var mapLoader = entityManager.System<MapLoaderSystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
 
-            MapId mapId;
             EntityUid? grid = null;
             BodyComponent body = default;
             RespiratorComponent resp = default;
@@ -73,7 +73,7 @@ public async Task AirConsistencyTest()
 
             await server.WaitPost(() =>
             {
-                mapId = mapManager.CreateMap();
+                mapSys.CreateMap(out var mapId);
                 Assert.That(mapLoader.TryLoad(mapId, testMapName, out var roots));
 
                 var query = entityManager.GetEntityQuery<MapGridComponent>();
@@ -142,8 +142,8 @@ public async Task NoSuffocationTest()
             var entityManager = server.ResolveDependency<IEntityManager>();
             var cfg = server.ResolveDependency<IConfigurationManager>();
             var mapLoader = entityManager.System<MapLoaderSystem>();
+            var mapSys = entityManager.System<SharedMapSystem>();
 
-            MapId mapId;
             EntityUid? grid = null;
             RespiratorComponent respirator = null;
             EntityUid human = default;
@@ -152,7 +152,7 @@ public async Task NoSuffocationTest()
 
             await server.WaitPost(() =>
             {
-                mapId = mapManager.CreateMap();
+                mapSys.CreateMap(out var mapId);
 
                 Assert.That(mapLoader.TryLoad(mapId, testMapName, out var ents), Is.True);
                 var query = entityManager.GetEntityQuery<MapGridComponent>();

Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs

@@ -33,10 +33,11 @@ public async Task Test()
         var mapLoader = entities.System<MapLoaderSystem>();
         var bodySystem = entities.System<SharedBodySystem>();
         var containerSystem = entities.System<SharedContainerSystem>();
+        var mapSys = entities.System<SharedMapSystem>();
 
         await server.WaitAssertion(() =>
         {
-            var mapId = maps.CreateMap();
+            mapSys.CreateMap(out var mapId);
             maps.CreateGrid(mapId);
             var human = entities.SpawnEntity("HumanBodyDummy", new MapCoordinates(0, 0, mapId));
 
@@ -115,7 +116,7 @@ await server.WaitAssertion(() =>
             mapLoader.SaveMap(mapId, mapPath);
             maps.DeleteMap(mapId);
 
-            mapId = maps.CreateMap();
+            mapSys.CreateMap(out mapId);
             Assert.That(mapLoader.TryLoad(mapId, mapPath, out _), Is.True);
 
             var query = EnumerateQueryEnumerator(

Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs

@@ -38,13 +38,13 @@ public async Task BucklePullTest()
         await RunTicks(5);
         Assert.That(buckle.Buckled, Is.True);
         Assert.That(buckle.BuckledTo, Is.EqualTo(STarget));
-        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[]{sUrist}));
+        Assert.That(strap.BuckledEntities, Is.EquivalentTo(new[] { sUrist }));
         Assert.That(puller.Pulling, Is.Null);
         Assert.That(pullable.Puller, Is.Null);
         Assert.That(pullable.BeingPulled, Is.False);
 
         // Start pulling, and thus unbuckle them
-        await PressKey(ContentKeyFunctions.TryPullObject, cursorEntity:urist);
+        await PressKey(ContentKeyFunctions.TryPullObject, cursorEntity: urist);
         await RunTicks(5);
         Assert.That(buckle.Buckled, Is.False);
         Assert.That(buckle.BuckledTo, Is.Null);

Content.IntegrationTests/Tests/CargoTest.cs

@@ -19,11 +19,11 @@ namespace Content.IntegrationTests.Tests;
 [TestFixture]
 public sealed class CargoTest
 {
-    public static HashSet<ProtoId<CargoProductPrototype>> Ignored = new ()
-    {
+    private static readonly HashSet<ProtoId<CargoProductPrototype>> Ignored =
+    [
         // This is ignored because it is explicitly intended to be able to sell for more than it costs.
         new("FunCrateGambling")
-    };
+    ];
 
     [Test]
     public async Task NoCargoOrderArbitrage()

Content.IntegrationTests/Tests/Chemistry/FixedPoint2SerializationTest.cs

@@ -9,10 +9,10 @@ namespace Content.IntegrationTests.Tests.Chemistry
 {
     public sealed class FixedPoint2SerializationTest : SerializationTest
     {
-        protected override Assembly[] Assemblies => new[]
-        {
+        protected override Assembly[] Assemblies =>
+        [
             typeof(FixedPoint2SerializationTest).Assembly
-        };
+        ];
 
         [Test]
         public void DeserializeNullTest()
@@ -53,6 +53,6 @@ public void DeserializeNullDefinitionTest()
     [DataDefinition]
     public sealed partial class FixedPoint2TestDefinition
     {
-        [DataField("unit")] public FixedPoint2? Unit { get; set; } = FixedPoint2.New(5);
+        [DataField] public FixedPoint2? Unit { get; set; } = FixedPoint2.New(5);
     }
 }

Content.IntegrationTests/Tests/Chemistry/SolutionRoundingTest.cs

@@ -1,5 +1,5 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
 using Content.Shared.FixedPoint;
@@ -76,7 +76,7 @@ public async Task Test()
 
         await server.WaitPost(() =>
         {
-            var system = server.System<SolutionContainerSystem>();
+            var system = server.System<SharedSolutionContainerSystem>();
             var beaker = server.EntMan.SpawnEntity("SolutionRoundingTestContainer", testMap.GridCoords);
 
             system.TryGetSolution(beaker, "beaker", out var newSolutionEnt, out var newSolution);

Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs

@@ -1,5 +1,5 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Components;
+using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Prototypes;
@@ -11,7 +11,7 @@ namespace Content.IntegrationTests.Tests.Chemistry;
 // To ensure volume(A) + volume(B) = volume(A+B)
 // reactions can change this assumption
 [TestFixture]
-[TestOf(typeof(SolutionContainerSystem))]
+[TestOf(typeof(SharedSolutionContainerSystem))]
 public sealed class SolutionSystemTests
 {
     [TestPrototypes]
@@ -51,7 +51,7 @@ public async Task TryAddTwoNonReactiveReagent()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var testMap = await pair.CreateTestMap();
         var coordinates = testMap.GridCoords;
 
@@ -97,7 +97,7 @@ public async Task TryAddTooMuchNonReactiveReagent()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var coordinates = testMap.GridCoords;
 
         EntityUid beaker;
@@ -141,7 +141,7 @@ public async Task TryMixAndOverflowTooMuchReagent()
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
         var testMap = await pair.CreateTestMap();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var coordinates = testMap.GridCoords;
 
         EntityUid beaker;
@@ -194,7 +194,7 @@ public async Task TryMixAndOverflowTooBigOverflow()
 
         var entityManager = server.ResolveDependency<IEntityManager>();
         var protoMan = server.ResolveDependency<IPrototypeManager>();
-        var containerSystem = entityManager.System<SolutionContainerSystem>();
+        var containerSystem = entityManager.System<SharedSolutionContainerSystem>();
         var testMap = await pair.CreateTestMap();
         var coordinates = testMap.GridCoords;
 

Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs

@@ -1,11 +1,11 @@
-using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Map;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 using System.Linq;
+using Content.Shared.Chemistry.EntitySystems;
 
 namespace Content.IntegrationTests.Tests.Chemistry
 {
@@ -34,7 +34,7 @@ public async Task TryAllTest()
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
             var testMap = await pair.CreateTestMap();
             var coordinates = testMap.GridCoords;
-            var solutionContainerSystem = entityManager.System<SolutionContainerSystem>();
+            var solutionContainerSystem = entityManager.System<SharedSolutionContainerSystem>();
 
             foreach (var reactionPrototype in prototypeManager.EnumeratePrototypes<ReactionPrototype>())
             {

Content.IntegrationTests/Tests/Commands/PardonCommand.cs

@@ -28,7 +28,7 @@ public async Task PardonTest()
 
             Assert.That(netMan.IsConnected);
 
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(1));
             // No bans on record
             Assert.Multiple(async () =>
             {
@@ -50,7 +50,7 @@ public async Task PardonTest()
 
             var banReason = "test";
 
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(1));
             // Ban the client for 24 hours
             await server.WaitPost(() => sConsole.ExecuteCommand($"ban {clientSession.Name} {banReason} 1440"));
 
@@ -63,7 +63,7 @@ public async Task PardonTest()
             });
 
             await pair.RunTicksSync(5);
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(0));
             Assert.That(!netMan.IsConnected);
 
             // Try to pardon a ban that does not exist
@@ -143,11 +143,11 @@ public async Task PardonTest()
             });
 
             // Reconnect client. Slightly faster than dirtying the pair.
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
+            Assert.That(sPlayerManager.Sessions, Is.Empty);
             client.SetConnectTarget(server);
             await client.WaitPost(() => netMan.ClientConnect(null!, 0, null!));
             await pair.RunTicksSync(5);
-            Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
+            Assert.That(sPlayerManager.Sessions, Has.Length.EqualTo(1));
 
             await pair.CleanReturnAsync();
         }

Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs

@@ -37,9 +37,9 @@ public async Task RejuvenateDeadTest()
             var server = pair.Server;
             var entManager = server.ResolveDependency<IEntityManager>();
             var prototypeManager = server.ResolveDependency<IPrototypeManager>();
-            var mobStateSystem = entManager.EntitySysManager.GetEntitySystem<MobStateSystem>();
-            var damSystem = entManager.EntitySysManager.GetEntitySystem<DamageableSystem>();
-            var rejuvenateSystem = entManager.EntitySysManager.GetEntitySystem<RejuvenateSystem>();
+            var mobStateSystem = entManager.System<MobStateSystem>();
+            var damSystem = entManager.System<DamageableSystem>();
+            var rejuvenateSystem = entManager.System<RejuvenateSystem>();
 
             await server.WaitAssertion(() =>
             {

Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs

@@ -26,7 +26,7 @@ public async Task RestartRoundAfterStart(bool lobbyEnabled)
 
             var configManager = server.ResolveDependency<IConfigurationManager>();
             var entityManager = server.ResolveDependency<IEntityManager>();
-            var gameTicker = entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
+            var gameTicker = entityManager.System<GameTicker>();
 
             await pair.RunTicksSync(5);
 

Content.IntegrationTests/Tests/ContainerOcclusionTest.cs

@@ -43,11 +43,11 @@ public async Task TestA()
 
             EntityUid dummy = default;
             var mapManager = server.ResolveDependency<IMapManager>();
-            var mapId = mapManager.CreateMap();
+            var map = await pair.CreateTestMap();
 
             await server.WaitPost(() =>
             {
-                var pos = new MapCoordinates(Vector2.Zero, mapId);
+                var pos = new MapCoordinates(Vector2.Zero, map.MapId);
                 var entStorage = serverEntManager.EntitySysManager.GetEntitySystem<EntityStorageSystem>();
                 var container = serverEntManager.SpawnEntity("ContainerOcclusionA", pos);
                 dummy = serverEntManager.SpawnEntity("ContainerOcclusionDummy", pos);
@@ -85,11 +85,12 @@ public async Task TestB()
 
             EntityUid dummy = default;
             var mapManager = server.ResolveDependency<IMapManager>();
-            var mapId = mapManager.CreateMap();
+
+            var map = await pair.CreateTestMap();
 
             await server.WaitPost(() =>
             {
-                var pos = new MapCoordinates(Vector2.Zero, mapId);
+                var pos = new MapCoordinates(Vector2.Zero, map.MapId);
                 var entStorage = serverEntManager.EntitySysManager.GetEntitySystem<EntityStorageSystem>();
                 var container = serverEntManager.SpawnEntity("ContainerOcclusionB", pos);
                 dummy = serverEntManager.SpawnEntity("ContainerOcclusionDummy", pos);
@@ -127,11 +128,12 @@ public async Task TestAb()
 
             EntityUid dummy = default;
             var mapManager = server.ResolveDependency<IMapManager>();
-            var mapId = mapManager.CreateMap();
+
+            var map = await pair.CreateTestMap();
 
             await server.WaitPost(() =>
             {
-                var pos = new MapCoordinates(Vector2.Zero, mapId);
+                var pos = new MapCoordinates(Vector2.Zero, map.MapId);
                 var entStorage = serverEntManager.EntitySysManager.GetEntitySystem<EntityStorageSystem>();
                 var containerA = serverEntManager.SpawnEntity("ContainerOcclusionA", pos);
                 var containerB = serverEntManager.SpawnEntity("ContainerOcclusionB", pos);