Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove useless resolves from a buncha tests.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-08 12:43:38 +01:00
parent 32416334c4
commit 2699540526
30 changed files with 189 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@ namespace Content.IntegrationTests.Tests
{
var (_, server) = await StartConnectedServerDummyTickerClientPair();
var entMan = server.ResolveDependency<IServerEntityManager>();
EntityUid playerEnt = default;
EntityUid visitEnt = default;
Mind mind = null;
@@ -28,12 +29,11 @@ namespace Content.IntegrationTests.Tests
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();
var entMgr = IoCManager.Resolve<IServerEntityManager>();
mapMan.CreateNewMapEntity(MapId.Nullspace);
playerEnt = entMgr.SpawnEntity(null, MapCoordinates.Nullspace);
visitEnt = entMgr.SpawnEntity(null, MapCoordinates.Nullspace);
playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
visitEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mind = new Mind(player.UserId);
mind.ChangeOwningPlayer(player.UserId);
@@ -49,12 +49,12 @@ namespace Content.IntegrationTests.Tests
server.Assert(() =>
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(visitEnt);
entMan.DeleteEntity(visitEnt);
Assert.That(mind.VisitingEntity, Is.EqualTo(default));
// This used to throw so make sure it doesn't.
IoCManager.Resolve<IEntityManager>().DeleteEntity(playerEnt);
entMan.DeleteEntity(playerEnt);
});
await server.WaitIdleAsync();
@@ -66,6 +66,7 @@ namespace Content.IntegrationTests.Tests
// Has to be a non-dummy ticker so we have a proper map.
var (_, server) = await StartConnectedServerClientPair();
var entMan = server.ResolveDependency<IServerEntityManager>();
EntityUid playerEnt = default;
Mind mind = null;
server.Assert(() =>
@@ -73,11 +74,10 @@ namespace Content.IntegrationTests.Tests
var player = IoCManager.Resolve<IPlayerManager>().ServerSessions.Single();
var mapMan = IoCManager.Resolve<IMapManager>();
var entMgr = IoCManager.Resolve<IServerEntityManager>();
mapMan.CreateNewMapEntity(MapId.Nullspace);
playerEnt = entMgr.SpawnEntity(null, MapCoordinates.Nullspace);
playerEnt = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mind = new Mind(player.UserId);
mind.ChangeOwningPlayer(player.UserId);
@@ -91,14 +91,14 @@ namespace Content.IntegrationTests.Tests
server.Post(() =>
{
IoCManager.Resolve<IEntityManager>().DeleteEntity(playerEnt);
entMan.DeleteEntity(playerEnt);
});
server.RunTicks(1);
server.Assert(() =>
{
Assert.That(IoCManager.Resolve<IEntityManager>().EntityExists(mind.CurrentEntity!.Value), Is.True);
Assert.That(entMan.EntityExists(mind.CurrentEntity!.Value), Is.True);
});
await server.WaitIdleAsync();