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

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();
}
}