tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maybe fix an old heisenbug test (#14579)

Browse Source
This commit is contained in:
metalgearsloth
2023-03-11 12:48:57 +11:00
committed by GitHub
parent 86895f9735
commit cbf556c09c
1 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
View File

@@ -23,17 +23,18 @@ namespace Content.IntegrationTests.Tests
var server = pairTracker.Pair.Server; var server = pairTracker.Pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>(); var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var mapManager = server.ResolveDependency<IMapManager>();
EntityUid playerEnt = default; EntityUid playerEnt = default;
EntityUid visitEnt = default; EntityUid visitEnt = default;
Mind mind = null; Mind mind = null;
var map = await PoolManager.CreateTestMap(pairTracker);
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single(); var player = playerMan.ServerSessions.Single();
var pos = new MapCoordinates(Vector2.Zero, map.MapId);
var mapMan = IoCManager.Resolve<IMapManager>();
var mapId = mapMan.GetAllMapIds().Last();
var pos = new MapCoordinates(Vector2.Zero, mapId);
playerEnt = entMan.SpawnEntity(null, pos); playerEnt = entMan.SpawnEntity(null, pos);
visitEnt = entMan.SpawnEntity(null, pos); visitEnt = entMan.SpawnEntity(null, pos);
@@ -47,6 +48,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(player.AttachedEntity, Is.EqualTo(visitEnt)); Assert.That(player.AttachedEntity, Is.EqualTo(visitEnt));
Assert.That(mind.VisitingEntity, Is.EqualTo(visitEnt)); Assert.That(mind.VisitingEntity, Is.EqualTo(visitEnt));
}); });
await PoolManager.RunTicksSync(pairTracker.Pair, 5); await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await server.WaitAssertion(() => await server.WaitAssertion(() =>
@@ -67,8 +69,14 @@ namespace Content.IntegrationTests.Tests
// This used to throw so make sure it doesn't. // This used to throw so make sure it doesn't.
entMan.DeleteEntity(playerEnt); entMan.DeleteEntity(playerEnt);
}); });
await PoolManager.RunTicksSync(pairTracker.Pair, 5); await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await server.WaitPost(() =>
{
mapManager.DeleteMap(map.MapId);
});
await pairTracker.CleanReturnAsync(); await pairTracker.CleanReturnAsync();
} }
@@ -81,16 +89,17 @@ namespace Content.IntegrationTests.Tests
var server = pairTracker.Pair.Server; var server = pairTracker.Pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>(); var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var map = await PoolManager.CreateTestMap(pairTracker);
EntityUid playerEnt = default; EntityUid playerEnt = default;
Mind mind = null; Mind mind = null;
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single(); var player = playerMan.ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>(); var pos = new MapCoordinates(Vector2.Zero, map.MapId);
var mapId = mapMan.GetAllMapIds().Last();
var pos = new MapCoordinates(Vector2.Zero, mapId);
playerEnt = entMan.SpawnEntity(null, pos); playerEnt = entMan.SpawnEntity(null, pos);
@@ -116,6 +125,11 @@ namespace Content.IntegrationTests.Tests
Assert.That(entMan.EntityExists(mind.CurrentEntity!.Value), Is.True); Assert.That(entMan.EntityExists(mind.CurrentEntity!.Value), Is.True);
}); });
await server.WaitPost(() =>
{
mapManager.DeleteMap(map.MapId);
});
await pairTracker.CleanReturnAsync(); await pairTracker.CleanReturnAsync();
} }
@@ -127,15 +141,18 @@ namespace Content.IntegrationTests.Tests
var testMap = await PoolManager.CreateTestMap(pairTracker); var testMap = await PoolManager.CreateTestMap(pairTracker);
var coordinates = testMap.GridCoords; var coordinates = testMap.GridCoords;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var map = await PoolManager.CreateTestMap(pairTracker);
EntityUid playerEnt = default; EntityUid playerEnt = default;
Mind mind = null; Mind mind = null;
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single(); var player = playerMan.ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>(); playerEnt = entMan.SpawnEntity(null, coordinates);
var entMgr = IoCManager.Resolve<IServerEntityManager>();
playerEnt = entMgr.SpawnEntity(null, coordinates);
mind = new Mind(player.UserId); mind = new Mind(player.UserId);
mind.ChangeOwningPlayer(player.UserId); mind.ChangeOwningPlayer(player.UserId);
@@ -148,18 +165,22 @@ namespace Content.IntegrationTests.Tests
await server.WaitPost(() => await server.WaitPost(() =>
{ {
var mapMan = IoCManager.Resolve<IMapManager>(); mapManager.DeleteMap(testMap.MapId);
mapMan.DeleteMap(testMap.MapId);
}); });
await PoolManager.RunTicksSync(pairTracker.Pair, 5); await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
Assert.That(IoCManager.Resolve<IEntityManager>().EntityExists(mind.CurrentEntity!.Value), Is.True); Assert.That(entMan.EntityExists(mind.CurrentEntity!.Value), Is.True);
Assert.That(mind.CurrentEntity, Is.Not.EqualTo(playerEnt)); Assert.That(mind.CurrentEntity, Is.Not.EqualTo(playerEnt));
}); });
await server.WaitPost(() =>
{
mapManager.DeleteMap(map.MapId);
});
await pairTracker.CleanReturnAsync(); await pairTracker.CleanReturnAsync();
} }
} }