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

Remove obsolete TestPair.Pair (#19496)

Browse Source
This commit is contained in:
Visne
2023-08-25 02:56:51 +02:00
committed by GitHub
parent e1639b05b5
commit 3c667b6f7e
101 changed files with 717 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,13 +31,13 @@ public sealed class GhostRoleTests
[Test]
public async Task TakeRoleAndReturn()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
await using var pair = await PoolManager.GetServerClient(new PoolSettings
{
DummyTicker = false,
Connected = true
});
var server = pairTracker.Pair.Server;
var client = pairTracker.Pair.Client;
var server = pair.Server;
var client = pair.Client;
var entMan = server.ResolveDependency<IEntityManager>();
var sPlayerMan = server.ResolveDependency<Robust.Server.Player.IPlayerManager>();
@@ -55,14 +55,14 @@ public sealed class GhostRoleTests
});
// Check player got attached.
await PoolManager.RunTicksSync(pairTracker.Pair, 10);
await PoolManager.RunTicksSync(pair, 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(pairTracker.Pair, 10);
await PoolManager.RunTicksSync(pair, 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(pairTracker.Pair, 10);
await PoolManager.RunTicksSync(pair, 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(pairTracker.Pair, 10);
await PoolManager.RunTicksSync(pair, 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(pairTracker.Pair, 10);
await PoolManager.RunTicksSync(pair, 10);
Assert.That(session.AttachedEntity, Is.EqualTo(originalMob));
Assert.That(originalMind.OwnedEntity, Is.EqualTo(originalMob));
Assert.Null(originalMind.VisitingEntity);
@@ -117,6 +117,6 @@ public sealed class GhostRoleTests
Assert.Null(newMind.VisitingEntity);
Assert.That(entMan.Deleted(otherGhost));
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}

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

@@ -21,8 +21,8 @@ public sealed partial class MindTests
[Test]
public async Task TestDeleteVisiting()
{
await using var pairTracker = await SetupPair();
var server = pairTracker.Pair.Server;
await using var pair = await SetupPair();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
@@ -50,9 +50,9 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitPost(() => entMan.DeleteEntity(visitEnt));
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
#pragma warning disable NUnit2045 // Interdependent assertions.
Assert.That(mind.VisitingEntity, Is.Null);
@@ -62,18 +62,18 @@ 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(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
// this is a variant of TestGhostOnDelete that just deletes the whole map.
[Test]
public async Task TestGhostOnDeleteMap()
{
await using var pairTracker = await SetupPair(dirty: true);
var server = pairTracker.Pair.Server;
var testMap = await PoolManager.CreateTestMap(pairTracker);
await using var pair = await SetupPair(dirty: true);
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
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(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitPost(() => mapManager.DeleteMap(testMap.MapId));
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
@@ -106,7 +106,7 @@ public sealed partial class MindTests
#pragma warning restore NUnit2045
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
/// <summary>
@@ -118,8 +118,8 @@ public sealed partial class MindTests
public async Task TestGhostOnDelete()
{
// Client is needed to spawn session
await using var pairTracker = await SetupPair(dirty: true);
var server = pairTracker.Pair.Server;
await using var pair = await SetupPair(dirty: true);
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
@@ -130,11 +130,11 @@ public sealed partial class MindTests
// Delete entity
await server.WaitPost(() => entMan.DeleteEntity(player.AttachedEntity!.Value));
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
Assert.That(entMan.HasComponent<GhostComponent>(player.AttachedEntity), "Player did not become a ghost");
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
/// <summary>
@@ -150,13 +150,13 @@ public sealed partial class MindTests
public async Task TestOriginalDeletedWhileGhostingKeepsGhost()
{
// Client is needed to spawn session
await using var pairTracker = await SetupPair();
var server = pairTracker.Pair.Server;
await using var pair = await SetupPair();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
var mind = GetMind(pairTracker.Pair);
var mind = GetMind(pair);
var player = playerMan.ServerSessions.Single();
#pragma warning disable NUnit2045 // Interdependent assertions.
@@ -180,13 +180,13 @@ public sealed partial class MindTests
Assert.That(mind.OwnedEntity, Is.EqualTo(originalEntity));
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() => entMan.DeleteEntity(originalEntity));
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
Assert.That(entMan.Deleted(originalEntity));
// Check that the player is still in control of the ghost
mind = GetMind(pairTracker.Pair);
mind = GetMind(pair);
Assert.That(!entMan.Deleted(ghost), "ghost has been deleted");
Assert.Multiple(() =>
{
@@ -196,7 +196,7 @@ public sealed partial class MindTests
Assert.That(mind.OwnedEntity, Is.EqualTo(ghost));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
/// <summary>
@@ -208,22 +208,22 @@ public sealed partial class MindTests
[Test]
public async Task TestGhostToAghost()
{
await using var pairTracker = await SetupPair();
var server = pairTracker.Pair.Server;
await using var pair = await SetupPair();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
var serverConsole = server.ResolveDependency<IServerConsoleHost>();
var player = playerMan.ServerSessions.Single();
var ghost = await BecomeGhost(pairTracker.Pair);
var ghost = await BecomeGhost(pair);
// Player is a normal ghost (not admin ghost).
Assert.That(entMan.GetComponent<MetaDataComponent>(player.AttachedEntity!.Value).EntityPrototype?.ID, Is.Not.EqualTo("AdminObserver"));
// Try to become an admin ghost
await server.WaitAssertion(() => serverConsole.ExecuteCommand(player, "aghost"));
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
Assert.That(entMan.Deleted(ghost), "old ghost was not deleted");
Assert.Multiple(() =>
@@ -237,7 +237,7 @@ public sealed partial class MindTests
Assert.That(mind, Is.Not.Null);
Assert.That(mind.VisitingEntity, Is.Null);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
/// <summary>
@@ -250,8 +250,8 @@ public sealed partial class MindTests
public async Task TestGhostDeletedSpawnsNewGhost()
{
// Client is needed to spawn session
await using var pairTracker = await SetupPair();
var server = pairTracker.Pair.Server;
await using var pair = await SetupPair();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
@@ -267,7 +267,7 @@ public sealed partial class MindTests
entMan.DeleteEntity(player.AttachedEntity!.Value);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
@@ -277,14 +277,14 @@ public sealed partial class MindTests
Assert.That(entMan.HasComponent<GhostComponent>(ghost));
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
serverConsole.ExecuteCommand(player, "aghost");
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
@@ -295,6 +295,6 @@ public sealed partial class MindTests
#pragma warning restore NUnit2045
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}

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

@@ -26,13 +26,12 @@ public sealed partial class MindTests
/// </remarks>
private static async Task<Pair.TestPair> SetupPair(bool dirty = false)
{
var pairTracker = await PoolManager.GetServerClient(new PoolSettings
var pair = await PoolManager.GetServerClient(new PoolSettings
{
DummyTicker = false,
Connected = true,
Dirty = dirty
});
var pair = pairTracker.Pair;
var entMan = pair.Server.ResolveDependency<IServerEntityManager>();
var playerMan = pair.Server.ResolveDependency<IPlayerManager>();
@@ -59,7 +58,7 @@ public sealed partial class MindTests
Assert.That(entMan.EntityExists(mind.OwnedEntity), "The mind's current entity does not exist");
Assert.That(mind.VisitingEntity == null || entMan.EntityExists(mind.VisitingEntity), "The minds visited entity does not exist.");
});
return pairTracker;
return pair;
}
private static async Task<EntityUid> BecomeGhost(TestPair pair, bool visit = false)

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

@@ -17,8 +17,7 @@ public sealed partial class MindTests
[Test]
public async Task TestGhostsCanReconnect()
{
await using var pairTracker = await SetupPair();
var pair = pairTracker.Pair;
await using var pair = await SetupPair();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var mind = GetMind(pair);
@@ -34,7 +33,7 @@ public sealed partial class MindTests
Assert.That(mind.VisitingEntity, Is.Null);
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
// This test will do the following:
@@ -45,8 +44,7 @@ public sealed partial class MindTests
[Test]
public async Task TestDeletedCanReconnect()
{
await using var pairTracker = await SetupPair();
var pair = pairTracker.Pair;
await using var pair = await SetupPair();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var mind = GetMind(pair);
@@ -85,7 +83,7 @@ public sealed partial class MindTests
Assert.That(entMan.HasComponent<GhostComponent>(mind.OwnedEntity));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
// This test will do the following:
@@ -96,8 +94,7 @@ public sealed partial class MindTests
[Test]
public async Task TestVisitingGhostReconnect()
{
await using var pairTracker = await SetupPair();
var pair = pairTracker.Pair;
await using var pair = await SetupPair();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var mind = GetMind(pair);
@@ -114,7 +111,7 @@ public sealed partial class MindTests
Assert.That(entMan.Deleted(ghost));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
// This test will do the following:
@@ -125,8 +122,7 @@ public sealed partial class MindTests
[Test]
public async Task TestVisitingReconnect()
{
await using var pairTracker = await SetupPair();
var pair = pairTracker.Pair;
await using var pair = await SetupPair();
var entMan = pair.Server.ResolveDependency<IEntityManager>();
var mindSys = entMan.System<MindSystem>();
var mind = GetMind(pair);
@@ -152,6 +148,6 @@ public sealed partial class MindTests
Assert.That(mind.CurrentEntity, Is.EqualTo(visiting));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}

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

@@ -54,8 +54,8 @@ public sealed partial class MindTests
[Test]
public async Task TestCreateAndTransferMindToNewEntity()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
@@ -74,14 +74,14 @@ public sealed partial class MindTests
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task TestReplaceMind()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
@@ -105,14 +105,14 @@ public sealed partial class MindTests
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task TestEntityDeadWhenGibbed()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -138,7 +138,7 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
@@ -152,21 +152,21 @@ public sealed partial class MindTests
Assert.That(mindSystem.GetMind(entity, mindContainerComp), Is.EqualTo(mind));
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
Assert.That(mindSystem.IsCharacterDeadPhysically(mind));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task TestMindTransfersToOtherEntity()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
@@ -193,24 +193,24 @@ public sealed partial class MindTests
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task TestOwningPlayerCanBeChanged()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
await using var pair = await PoolManager.GetServerClient(new PoolSettings
{
Connected = true,
DummyTicker = false
});
var server = pairTracker.Pair.Server;
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
var mindSystem = entMan.EntitySysManager.GetEntitySystem<MindSystem>();
var originalMind = GetMind(pairTracker.Pair);
var originalMind = GetMind(pair);
var userId = originalMind.UserId;
Mind mind = default!;
@@ -229,7 +229,7 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
@@ -248,16 +248,16 @@ public sealed partial class MindTests
});
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task TestAddRemoveHasRoles()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
@@ -318,15 +318,15 @@ public sealed partial class MindTests
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task TestPlayerCanGhost()
{
// Client is needed to spawn session
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
@@ -351,14 +351,14 @@ public sealed partial class MindTests
Assert.That(mindSystem.GetMind(entity, mindComp), Is.EqualTo(mind));
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
entMan.DeleteEntity(entity);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
EntityUid mob = default!;
Mind mobMind = default!;
@@ -376,7 +376,7 @@ public sealed partial class MindTests
mindSystem.TransferTo(mobMind, mob);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await server.WaitAssertion(() =>
{
@@ -389,7 +389,7 @@ public sealed partial class MindTests
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
// TODO Implement
@@ -401,13 +401,13 @@ public sealed partial class MindTests
[Test]
public async Task TestGhostDoesNotInfiniteLoop()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
await using var pair = await PoolManager.GetServerClient(new PoolSettings
{
DummyTicker = false,
Connected = true,
Dirty = true
});
var server = pairTracker.Pair.Server;
var server = pair.Server;
var entMan = server.ResolveDependency<IServerEntityManager>();
var playerMan = server.ResolveDependency<IPlayerManager>();
@@ -441,14 +441,14 @@ public sealed partial class MindTests
ghostRole = entMan.SpawnEntity("GhostRoleTestEntity", MapCoordinates.Nullspace);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 20);
await PoolManager.RunTicksSync(pair, 20);
await server.WaitAssertion(() =>
{
serverConsole.ExecuteCommand(player, "aghost");
});
await PoolManager.RunTicksSync(pairTracker.Pair, 20);
await PoolManager.RunTicksSync(pair, 20);
await server.WaitAssertion(() =>
{
@@ -456,7 +456,7 @@ public sealed partial class MindTests
entMan.EntitySysManager.GetEntitySystem<GhostRoleSystem>().Takeover(player, id);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 20);
await PoolManager.RunTicksSync(pair, 20);
await server.WaitAssertion(() =>
{
@@ -468,7 +468,7 @@ public sealed partial class MindTests
ghost = player.AttachedEntity!.Value;
});
await PoolManager.RunTicksSync(pairTracker.Pair, 20);
await PoolManager.RunTicksSync(pair, 20);
await server.WaitAssertion(() =>
{
@@ -476,6 +476,6 @@ public sealed partial class MindTests
Assert.That(player.AttachedEntity!.Value, Is.EqualTo(ghost));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}