Code Cleanup: Integration Tests (#29584)
* Cleanup PuddleTest * Cleanup GravityGridTest * Cleanup PowerTest * Cleanup SaveLoadMapTest * Cleanup Body tests * Cleanup ContainerOcclusionTest * Cleanup AirlockTest * Cleanup DamageableTest * Cleanup EntityTest * Cleanup FluidSpillTest * Cleanup FollowerSystemTest * Cleanup HandCuffTest * Cleanup InteractionSystemTests * Cleanup InRangeUnobstructed * Cleanup SimplePredictReconcileTest * Cleanup PostMapInitTest * Cleanup SalvageTest * Cleanup SaveLoadSaveTest * Cleanup ShuttleTest * Cleanup MaterialArbitrageTest * Cleanup PrototypeSaveTest * Fix ShuttleTest * Bunch of small ones * Move JobTests to Station directory * More small fixes * Cleanup InteractionTest.Helpers Had to change a method signature, so some callers were modified too. * Missed one
This commit is contained in:
@@ -34,29 +34,25 @@ namespace Content.IntegrationTests.Tests
|
||||
|
||||
var testMap = await pair.CreateTestMap();
|
||||
|
||||
EntityUid generator = default;
|
||||
var entityMan = server.ResolveDependency<IEntityManager>();
|
||||
var mapMan = server.ResolveDependency<IMapManager>();
|
||||
var entityMan = server.EntMan;
|
||||
var mapMan = server.MapMan;
|
||||
var mapSys = entityMan.System<SharedMapSystem>();
|
||||
|
||||
MapGridComponent grid1 = null;
|
||||
MapGridComponent grid2 = null;
|
||||
EntityUid grid1Entity = default!;
|
||||
EntityUid grid2Entity = default!;
|
||||
EntityUid generator = default;
|
||||
Entity<MapGridComponent> grid1 = default;
|
||||
Entity<MapGridComponent> grid2 = default;
|
||||
|
||||
// Create grids
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
var mapId = testMap.MapId;
|
||||
grid1 = mapMan.CreateGrid(mapId);
|
||||
grid2 = mapMan.CreateGrid(mapId);
|
||||
grid1Entity = grid1.Owner;
|
||||
grid2Entity = grid2.Owner;
|
||||
grid1 = mapMan.CreateGridEntity(mapId);
|
||||
grid2 = mapMan.CreateGridEntity(mapId);
|
||||
|
||||
mapSys.SetTile(grid1Entity, grid1, Vector2i.Zero, new Tile(1));
|
||||
mapSys.SetTile(grid2Entity, grid2, Vector2i.Zero, new Tile(1));
|
||||
mapSys.SetTile(grid1, grid1, Vector2i.Zero, new Tile(1));
|
||||
mapSys.SetTile(grid2, grid2, Vector2i.Zero, new Tile(1));
|
||||
|
||||
generator = entityMan.SpawnEntity("GridGravityGeneratorDummy", new EntityCoordinates(grid1Entity, 0.5f, 0.5f));
|
||||
generator = entityMan.SpawnEntity("GridGravityGeneratorDummy", new EntityCoordinates(grid1, 0.5f, 0.5f));
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
Assert.That(entityMan.HasComponent<GravityGeneratorComponent>(generator));
|
||||
@@ -77,8 +73,8 @@ namespace Content.IntegrationTests.Tests
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
Assert.That(generatorComponent.GravityActive, Is.True);
|
||||
Assert.That(!entityMan.GetComponent<GravityComponent>(grid1Entity).EnabledVV);
|
||||
Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).EnabledVV);
|
||||
Assert.That(!entityMan.GetComponent<GravityComponent>(grid1).EnabledVV);
|
||||
Assert.That(entityMan.GetComponent<GravityComponent>(grid2).EnabledVV);
|
||||
});
|
||||
|
||||
// Re-enable needs power so it turns off again.
|
||||
@@ -95,7 +91,7 @@ namespace Content.IntegrationTests.Tests
|
||||
Assert.Multiple(() =>
|
||||
{
|
||||
Assert.That(generatorComponent.GravityActive, Is.False);
|
||||
Assert.That(entityMan.GetComponent<GravityComponent>(grid2Entity).EnabledVV, Is.False);
|
||||
Assert.That(entityMan.GetComponent<GravityComponent>(grid2).EnabledVV, Is.False);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user