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

Remove obsolete PoolManager methods (#19499)

Browse Source
This commit is contained in:
Visne
2023-08-25 04:13:11 +02:00
committed by GitHub
parent 11a57be230
commit 9bd30d57ad
45 changed files with 108 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs
View File

@@ -55,14 +55,14 @@ public sealed class GhostRoleTests
});
// Check player got attached.
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
Assert.Null(originalMind.VisitingEntity);
// Use the ghost command
conHost.ExecuteCommand("ghost");
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
var ghost = session.AttachedEntity;
Assert.That(entMan.HasComponent<GhostComponent>(ghost));
Assert.That(ghost, Is.Not.EqualTo(originalMob));
@@ -82,7 +82,7 @@ public sealed class GhostRoleTests
});
// Check player got attached to ghost role.
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
var newMind = session.ContentData()!.Mind!;
Assert.That(newMind, Is.Not.EqualTo(originalMind));
Assert.That(session.AttachedEntity, Is.EqualTo(ghostRole));
@@ -96,7 +96,7 @@ public sealed class GhostRoleTests
// Ghost again.
conHost.ExecuteCommand("ghost");
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
var otherGhost = session.AttachedEntity;
Assert.That(entMan.HasComponent<GhostComponent>(otherGhost));
Assert.That(otherGhost, Is.Not.EqualTo(originalMob));
@@ -107,7 +107,7 @@ public sealed class GhostRoleTests
// Next, control the original entity again:
await server.WaitPost(() => mindSystem.SetUserId(originalMind, session.UserId));
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
Assert.Null(originalMind.VisitingEntity);

26
Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs
View File

@@ -50,9 +50,9 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitPost(() => entMan.DeleteEntity(visitEnt));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
#pragma warning disable NUnit2045 // Interdependent assertions.
Assert.That(mind.VisitingEntity, Is.Null);
@@ -62,7 +62,7 @@ public sealed partial class MindTests
// This used to throw so make sure it doesn't.
await server.WaitPost(() => entMan.DeleteEntity(mind.OwnedEntity!.Value));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await pair.CleanReturnAsync();
}
@@ -73,7 +73,7 @@ public sealed partial class MindTests
{
await using var pair = await SetupPair(dirty: true);
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
var entMan = server.ResolveDependency<IServerEntityManager>();
@@ -94,9 +94,9 @@ public sealed partial class MindTests
Assert.That(mind.CurrentEntity, Is.EqualTo(playerEnt));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitPost(() => mapManager.DeleteMap(testMap.MapId));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
@@ -130,7 +130,7 @@ public sealed partial class MindTests
// Delete entity
await server.WaitPost(() => entMan.DeleteEntity(player.AttachedEntity!.Value));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.That(entMan.HasComponent<GhostComponent>(player.AttachedEntity), "Player did not become a ghost");
@@ -180,9 +180,9 @@ public sealed partial class MindTests
Assert.That(mind.OwnedEntity, Is.EqualTo(originalEntity));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() => entMan.DeleteEntity(originalEntity));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.That(entMan.Deleted(originalEntity));
// Check that the player is still in control of the ghost
@@ -223,7 +223,7 @@ public sealed partial class MindTests
// Try to become an admin ghost
await server.WaitAssertion(() => serverConsole.ExecuteCommand(player, "aghost"));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.That(entMan.Deleted(ghost), "old ghost was not deleted");
Assert.Multiple(() =>
@@ -267,7 +267,7 @@ public sealed partial class MindTests
entMan.DeleteEntity(player.AttachedEntity!.Value);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
@@ -277,14 +277,14 @@ public sealed partial class MindTests
Assert.That(entMan.HasComponent<GhostComponent>(ghost));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
serverConsole.ExecuteCommand(player, "aghost");
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{

8
Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs
View File

@@ -48,7 +48,7 @@ public sealed partial class MindTests
mindSys.TransferTo(mind, entity);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.Multiple(() =>
{
@@ -89,7 +89,7 @@ public sealed partial class MindTests
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.Multiple(() =>
{
Assert.That(entMan.HasComponent<GhostComponent>(ghostUid));
@@ -141,7 +141,7 @@ public sealed partial class MindTests
{
netManager.ClientDisconnect("Disconnect command used.");
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.Multiple(() =>
{
@@ -160,7 +160,7 @@ public sealed partial class MindTests
await Task.WhenAll(pair.Client.WaitIdleAsync(), pair.Client.WaitIdleAsync());
pair.Client.SetConnectTarget(pair.Server);
await pair.Client.WaitPost(() => netManager.ClientConnect(null!, 0, username));
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
var player = playerMan.ServerSessions.Single();
Assert.That(player.Status, Is.EqualTo(SessionStatus.InGame));

2
Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs
View File

@@ -135,7 +135,7 @@ public sealed partial class MindTests
visiting = entMan.SpawnEntity(null, MapCoordinates.Nullspace);
mindSys.Visit(mind, visiting);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await DisconnectReconnect(pair);

24
Content.IntegrationTests/Tests/Minds/MindTests.cs
View File

@@ -138,7 +138,7 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
@@ -152,7 +152,7 @@ public sealed partial class MindTests
Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mind));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
@@ -208,7 +208,7 @@ public sealed partial class MindTests
var entMan = server.ResolveDependency<IServerEntityManager>();
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
var originalMind = GetMind(pair);
var userId = originalMind.UserId;
@@ -229,7 +229,7 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
@@ -248,7 +248,7 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await pair.CleanReturnAsync();
}
@@ -351,14 +351,14 @@ public sealed partial class MindTests
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
entMan.DeleteEntity(entity);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
EntityUid mob = default!;
Mind mobMind = default!;
@@ -376,7 +376,7 @@ public sealed partial class MindTests
mindSystem.TransferTo(mobMind, mob);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{
@@ -441,14 +441,14 @@ public sealed partial class MindTests
ghostRole = entMan.SpawnEntity("GhostRoleTestEntity", MapCoordinates.Nullspace);
});
await PoolManager.RunTicksSync(pair, 20);
await pair.RunTicksSync(20);
await server.WaitAssertion(() =>
{
serverConsole.ExecuteCommand(player, "aghost");
});
await PoolManager.RunTicksSync(pair, 20);
await pair.RunTicksSync(20);
await server.WaitAssertion(() =>
{
@@ -456,7 +456,7 @@ public sealed partial class MindTests
entMan.EntitySysManager.GetEntitySystem<GhostRoleSystem>().Takeover(player, id);
});
await PoolManager.RunTicksSync(pair, 20);
await pair.RunTicksSync(20);
await server.WaitAssertion(() =>
{
@@ -468,7 +468,7 @@ public sealed partial class MindTests
ghost = player.AttachedEntity!.Value;
});
await PoolManager.RunTicksSync(pair, 20);
await pair.RunTicksSync(20);
await server.WaitAssertion(() =>
{