space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace MapManager.DeleteMap with SharedMapSystem.DeleteMap in misc tests (#5777)

Browse Source 
* Replace MapManager.DeleteMap with SharedMapSystem.DeleteMap in various tests

* Poke tests

* I guess this is was technically a breaking change?
This commit is contained in:
Tayrtahn
2025-03-26 22:50:56 -04:00
committed by GitHub
parent 9f73e0398a
commit dacaa974d4
11 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Robust.UnitTesting/Shared/GameObjects/IEntityManagerTests.cs
View File

@@ -39,13 +39,13 @@ namespace Robust.UnitTesting.Shared.GameObjects
var sim = RobustServerSimulation.NewSimulation().InitializeInstance();
var entManager = sim.Resolve<IEntityManager>();
var mapManager = sim.Resolve<IMapManager>();
var mapSystem = entManager.System<SharedMapSystem>();
Assert.That(entManager.Count<TransformComponent>(), Is.EqualTo(0));
var mapId = sim.CreateMap().MapId;
Assert.That(entManager.Count<TransformComponent>(), Is.EqualTo(1));
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
Assert.That(entManager.Count<TransformComponent>(), Is.EqualTo(0));
}
}

10
Robust.UnitTesting/Shared/Map/GridSplit_Tests.cs
View File

@@ -53,7 +53,7 @@ public sealed class GridSplit_Tests
mapSystem.SetTile(gridEnt, new Vector2i(2, 0), Tile.Empty);
Assert.That(mapManager.GetAllGrids(mapId).Count(), Is.EqualTo(2));
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
[Test]
@@ -75,7 +75,7 @@ public sealed class GridSplit_Tests
mapSystem.SetTile(gridEnt, new Vector2i(1, 0), Tile.Empty);
Assert.That(mapManager.GetAllGrids(mapId).Count(), Is.EqualTo(2));
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
[Test]
@@ -106,7 +106,7 @@ public sealed class GridSplit_Tests
mapSystem.SetTile(gridEnt, new Vector2i(1, 0), Tile.Empty);
Assert.That(mapManager.GetAllGrids(mapId).Count(), Is.EqualTo(2));
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
[Test]
@@ -130,7 +130,7 @@ public sealed class GridSplit_Tests
mapSystem.SetTile(gridEnt, new Vector2i(1, 0), Tile.Empty);
Assert.That(mapManager.GetAllGrids(mapId).Count(), Is.EqualTo(3));
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
/// <summary>
@@ -181,6 +181,6 @@ public sealed class GridSplit_Tests
Assert.That(dummyXform.GridUid, Is.EqualTo(newGrid.Owner));
Assert.That(newGridXform._children, Does.Contain(dummy));
});
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
}

3
Robust.UnitTesting/Shared/Map/MapGridMap_Tests.cs
View File

@@ -39,6 +39,7 @@ public sealed class MapGridMap_Tests
var entManager = sim.Resolve<IEntityManager>();
var mapManager = sim.Resolve<IMapManager>();
var mapSystem = entManager.System<SharedMapSystem>();
var mapId = sim.CreateMap().MapId;
mapManager.CreateGridEntity(mapId);
@@ -49,6 +50,6 @@ public sealed class MapGridMap_Tests
entManager.TickUpdate(0.016f, false);
});
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
}

4
Robust.UnitTesting/Shared/Physics/Fixtures_Test.cs
View File

@@ -20,10 +20,10 @@ public sealed class Fixtures_Test
var sim = RobustServerSimulation.NewSimulation().InitializeInstance();
var entManager = sim.Resolve<IEntityManager>();
var mapManager = sim.Resolve<IMapManager>();
var sysManager = sim.Resolve<IEntitySystemManager>();
var fixturesSystem = sysManager.GetEntitySystem<FixtureSystem>();
var physicsSystem = sysManager.GetEntitySystem<SharedPhysicsSystem>();
var mapSystem = sysManager.GetEntitySystem<SharedMapSystem>();
var map = sim.CreateMap().MapId;
var ent = sim.SpawnEntity(null, new MapCoordinates(Vector2.Zero, map));
@@ -36,6 +36,6 @@ public sealed class Fixtures_Test
Assert.That(fixture.Density, Is.EqualTo(10f));
Assert.That(body.Mass, Is.EqualTo(10f));
mapManager.DeleteMap(map);
mapSystem.DeleteMap(map);
}
}

8
Robust.UnitTesting/Shared/Physics/Joints_Test.cs
View File

@@ -24,8 +24,8 @@ public sealed class Joints_Test
var sim = factory.InitializeInstance();
var entManager = sim.Resolve<IEntityManager>();
var mapManager = sim.Resolve<IMapManager>();
var jointSystem = entManager.System<SharedJointSystem>();
var mapSystem = entManager.System<SharedMapSystem>();
var mapId = sim.CreateMap().MapId;
@@ -53,7 +53,7 @@ public sealed class Joints_Test
Assert.That(entManager.GetComponent<JointRelayTargetComponent>(uidC).Relayed, Is.Empty);
Assert.That(entManager.GetComponent<JointComponent>(uidA).Relay, Is.EqualTo(null));
});
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
/// <summary>
@@ -65,11 +65,11 @@ public sealed class Joints_Test
var factory = RobustServerSimulation.NewSimulation();
var server = factory.InitializeInstance();
var entManager = server.Resolve<IEntityManager>();
var mapManager = server.Resolve<IMapManager>();
var fixtureSystem = entManager.EntitySysManager.GetEntitySystem<FixtureSystem>();
var jointSystem = entManager.EntitySysManager.GetEntitySystem<JointSystem>();
var broadphaseSystem = entManager.EntitySysManager.GetEntitySystem<SharedBroadphaseSystem>();
var physicsSystem = server.Resolve<IEntitySystemManager>().GetEntitySystem<SharedPhysicsSystem>();
var mapSystem = entManager.System<SharedMapSystem>();
var mapId = server.CreateMap().MapId;
@@ -106,6 +106,6 @@ public sealed class Joints_Test
broadphaseSystem.FindNewContacts(mapId);
Assert.That(body1.Contacts, Has.Count.EqualTo(1));
mapManager.DeleteMap(mapId);
mapSystem.DeleteMap(mapId);
}
}

6
Robust.UnitTesting/Shared/Spawning/EntitySpawnHelpersTest.cs
View File

@@ -20,10 +20,13 @@ public abstract partial class EntitySpawnHelpersTest : RobustIntegrationTest
{
protected ServerIntegrationInstance Server = default!;
protected IEntityManager EntMan = default!;
protected IMapManager MapMan = default!;
protected SharedMapSystem MapSys = default!;
protected SharedTransformSystem Xforms = default!;
protected SharedContainerSystem Container = default!;
// Even if unused, content / downstream tests might use this class, so removal would be a breaking change?
protected IMapManager MapMan = default!;
protected EntityUid Map;
protected MapId MapId;
protected EntityUid Parent; // entity parented to the map.
@@ -43,6 +46,7 @@ public abstract partial class EntitySpawnHelpersTest : RobustIntegrationTest
await Server.WaitIdleAsync();
MapMan = Server.ResolveDependency<IMapManager>();
EntMan = Server.ResolveDependency<IEntityManager>();
MapSys = EntMan.System<SharedMapSystem>();
Xforms = EntMan.System<SharedTransformSystem>();
Container = EntMan.System<SharedContainerSystem>();

2
Robust.UnitTesting/Shared/Spawning/SpawnInContainerOrDropTest.cs
View File

@@ -116,7 +116,7 @@ public sealed class SpawnInContainerOrDropTest : EntitySpawnHelpersTest
Assert.That(xform.GridUid, Is.Null);
});
await Server.WaitPost(() =>MapMan.DeleteMap(MapId));
await Server.WaitPost(() => MapSys.DeleteMap(MapId));
Server.Dispose();
}
}

2
Robust.UnitTesting/Shared/Spawning/SpawnNextToOrDropTest.cs
View File

@@ -121,7 +121,7 @@ public sealed class SpawnNextToOrDropTest : EntitySpawnHelpersTest
Assert.That(EntMan.GetComponent<MetaDataComponent>(uid).EntityLifeStage, Is.LessThan(EntityLifeStage.MapInitialized));
});
await Server.WaitPost(() =>MapMan.DeleteMap(MapId));
await Server.WaitPost(() => MapSys.DeleteMap(MapId));
Server.Dispose();
}
}

2
Robust.UnitTesting/Shared/Spawning/TrySpawnInContainerTest.cs
View File

@@ -42,7 +42,7 @@ public sealed class TrySpawnInContainerTest : EntitySpawnHelpersTest
Assert.That(EntMan.EntityExists(uid), Is.False);
});
await Server.WaitPost(() =>MapMan.DeleteMap(MapId));
await Server.WaitPost(() => MapSys.DeleteMap(MapId));
Server.Dispose();
}
}

2
Robust.UnitTesting/Shared/Spawning/TrySpawnNextToTest.cs
View File

@@ -50,7 +50,7 @@ public sealed class TrySpawnNextToTest : EntitySpawnHelpersTest
Assert.That(EntMan.EntityExists(uid), Is.False);
});
await Server.WaitPost(() =>MapMan.DeleteMap(MapId));
await Server.WaitPost(() => MapSys.DeleteMap(MapId));
Server.Dispose();
}
}