Make tests faster (#8737)

* Test changes

* Make finding the test tile a little smarter
This commit is contained in:
wrexbe
2022-06-19 20:22:28 -07:00
committed by GitHub
parent bd54b8de25
commit 81e3b2da88
80 changed files with 1769 additions and 1788 deletions

View File

@@ -8,32 +8,35 @@ using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests
{
// Tests various scenarios of deleting the entity that a player's mind is connected to.
[TestFixture]
public sealed class MindEntityDeletionTest : ContentIntegrationTest
public sealed class MindEntityDeletionTest
{
[Test]
public async Task TestDeleteVisiting()
{
var (_, server) = await StartConnectedServerDummyTickerClientPair();
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
EntityUid playerEnt = default;
EntityUid visitEnt = default;
Mind mind = null;
server.Assert(() =>
await server.WaitAssertion(() =>
{
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();
mapMan.CreateNewMapEntity(MapId.Nullspace);
var mapId = mapMan.GetAllMapIds().Last();
var pos = new MapCoordinates(Vector2.Zero, mapId);
playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
visitEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
playerEnt = entMan.SpawnEntity(null, pos);
visitEnt = entMan.SpawnEntity(null, pos);
mind = new Mind(player.UserId);
mind.ChangeOwningPlayer(player.UserId);
@@ -44,40 +47,52 @@ namespace Content.IntegrationTests.Tests
Assert.That(player.AttachedEntity, Is.EqualTo(visitEnt));
Assert.That(mind.VisitingEntity, Is.EqualTo(visitEnt));
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
server.RunTicks(1);
server.Assert(() =>
await server.WaitAssertion(() =>
{
entMan.DeleteEntity(visitEnt);
if (mind == null)
{
Assert.Fail("Mind was null");
return;
}
Assert.That(mind.VisitingEntity, Is.EqualTo(default));
if (mind.VisitingEntity != null)
{
Assert.Fail("Mind VisitingEntity was not null");
return;
}
// This used to throw so make sure it doesn't.
entMan.DeleteEntity(playerEnt);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await server.WaitIdleAsync();
await pairTracker.CleanReturnAsync();
}
[Test]
public async Task TestGhostOnDelete()
{
// Has to be a non-dummy ticker so we have a proper map.
var (_, server) = await StartConnectedServerClientPair();
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
EntityUid playerEnt = default;
Mind mind = null;
server.Assert(() =>
await server.WaitAssertion(() =>
{
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();
mapMan.CreateNewMapEntity(MapId.Nullspace);
var mapId = mapMan.GetAllMapIds().Last();
var pos = new MapCoordinates(Vector2.Zero, mapId);
playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
playerEnt = entMan.SpawnEntity(null, pos);
mind = new Mind(player.UserId);
mind.ChangeOwningPlayer(player.UserId);
@@ -87,33 +102,33 @@ namespace Content.IntegrationTests.Tests
Assert.That(mind.CurrentEntity, Is.EqualTo(playerEnt));
});
server.RunTicks(1);
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
server.Post(() =>
await server.WaitPost(() =>
{
entMan.DeleteEntity(playerEnt);
});
server.RunTicks(1);
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
server.Assert(() =>
await server.WaitAssertion(() =>
{
Assert.That(entMan.EntityExists(mind.CurrentEntity!.Value), Is.True);
});
await server.WaitIdleAsync();
await pairTracker.CleanReturnAsync();
}
[Test]
public async Task TestGhostOnDeleteMap()
{
// Has to be a non-dummy ticker so we have a proper map.
var (_, server) = await StartConnectedServerClientPair();
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
EntityUid playerEnt = default;
Mind mind = null;
MapId map = default;
server.Assert(() =>
await server.WaitAssertion(() =>
{
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
@@ -136,24 +151,24 @@ namespace Content.IntegrationTests.Tests
Assert.That(mind.CurrentEntity, Is.EqualTo(playerEnt));
});
server.RunTicks(1);
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
server.Post(() =>
await server.WaitPost(() =>
{
var mapMan = IoCManager.Resolve<IMapManager>();
mapMan.DeleteMap(map);
});
server.RunTicks(1);
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
server.Assert(() =>
await server.WaitAssertion(() =>
{
Assert.That(IoCManager.Resolve<IEntityManager>().EntityExists(mind.CurrentEntity!.Value), Is.True);
Assert.That(mind.CurrentEntity, Is.Not.EqualTo(playerEnt));
});
await server.WaitIdleAsync();
await pairTracker.CleanReturnAsync();
}
}
}