tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

26
Content.IntegrationTests/PoolManager.cs
View File

@@ -380,32 +380,6 @@ we are just going to end this here to save a lot of time. This is the exception
}
}
/// <summary>
/// Creates a map, a grid, and a tile, and gives back references to them.
/// </summary>
/// <param name="pair">A pair</param>
/// <returns>A TestMapData</returns>
[Obsolete("use TestPair.CreateMap")]
public static async Task<TestMapData> CreateTestMap(TestPair pair)
{
return await pair.CreateTestMap();
}
/// <summary>
/// Runs a server/client pair in sync
/// </summary>
/// <param name="pair">A server/client pair</param>
/// <param name="ticks">How many ticks to run them for</param>
[Obsolete("use TestPair.RunTicks")]
public static async Task RunTicksSync(TestPair pair, int ticks)
{
for (var i = 0; i < ticks; i++)
{
await pair.Server.WaitRunTicks(1);
await pair.Client.WaitRunTicks(1);
}
}
/// <summary>
/// Runs a server, or a client until a condition is true
/// </summary>

6
Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
View File

@@ -34,7 +34,7 @@ public sealed class AddTests
var guid = Guid.NewGuid();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>
{
@@ -83,7 +83,7 @@ public sealed class AddTests
var guid = Guid.NewGuid();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>
{
@@ -143,7 +143,7 @@ public sealed class AddTests
var sEntities = server.ResolveDependency<IEntityManager>();
var sAdminLogSystem = server.ResolveDependency<IAdminLogManager>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>
{

2
Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs
View File

@@ -24,7 +24,7 @@ public sealed class FilterTests
var commonGuid = Guid.NewGuid();
var firstGuid = Guid.NewGuid();
var secondGuid = Guid.NewGuid();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
await server.WaitPost(() =>

6
Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
View File

@@ -52,7 +52,7 @@ namespace Content.IntegrationTests.Tests.Buckle
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
var entityManager = server.ResolveDependency<IEntityManager>();
var actionBlocker = entityManager.System<ActionBlockerSystem>();
@@ -245,7 +245,7 @@ namespace Content.IntegrationTests.Tests.Buckle
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
EntityUid human = default;
@@ -338,7 +338,7 @@ namespace Content.IntegrationTests.Tests.Buckle
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
var entityManager = server.ResolveDependency<IEntityManager>();
var buckleSystem = entityManager.System<SharedBuckleSystem>();

6
Content.IntegrationTests/Tests/CargoTest.cs
View File

@@ -20,7 +20,7 @@ public sealed class CargoTest
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entManager = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -54,7 +54,7 @@ public sealed class CargoTest
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entManager = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -95,7 +95,7 @@ public sealed class CargoTest
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entManager = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();

8
Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs
View File

@@ -52,7 +52,7 @@ public sealed class SolutionSystemTests
var entityManager = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
EntityUid beaker;
@@ -93,7 +93,7 @@ public sealed class SolutionSystemTests
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entityManager = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
@@ -140,7 +140,7 @@ public sealed class SolutionSystemTests
var entityManager = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
var coordinates = testMap.GridCoords;
@@ -195,7 +195,7 @@ public sealed class SolutionSystemTests
var entityManager = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var containerSystem = entityManager.EntitySysManager.GetEntitySystem<SolutionContainerSystem>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
EntityUid beaker;

2
Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
View File

@@ -32,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Chemistry
var entityManager = server.ResolveDependency<IEntityManager>();
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
var solutionSystem = server.ResolveDependency<IEntitySystemManager>()
.GetEntitySystem<SolutionContainerSystem>();

4
Content.IntegrationTests/Tests/ClickableTest.cs
View File

@@ -55,7 +55,7 @@ namespace Content.IntegrationTests.Tests
var xformQuery = clientEntManager.GetEntityQuery<TransformComponent>();
var eye = client.ResolveDependency<IEyeManager>().CurrentEye;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
await server.WaitPost(() =>
{
var ent = serverEntManager.SpawnEntity(prototype, testMap.GridCoords);
@@ -64,7 +64,7 @@ namespace Content.IntegrationTests.Tests
});
// Let client sync up.
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
var hit = false;

2
Content.IntegrationTests/Tests/Commands/PardonCommand.cs
View File

@@ -62,7 +62,7 @@ namespace Content.IntegrationTests.Tests.Commands
Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
Assert.That(!netMan.IsConnected);

6
Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs
View File

@@ -27,7 +27,7 @@ namespace Content.IntegrationTests.Tests.Commands
var entityManager = server.ResolveDependency<IEntityManager>();
var gameTicker = entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
GameTick tickBeforeRestart = default;
@@ -49,7 +49,7 @@ namespace Content.IntegrationTests.Tests.Commands
}
});
await PoolManager.RunTicksSync(pair, 15);
await pair.RunTicksSync(15);
await server.WaitAssertion(() =>
{
@@ -58,7 +58,7 @@ namespace Content.IntegrationTests.Tests.Commands
Assert.That(tickBeforeRestart, Is.LessThan(tickAfterRestart));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await pair.CleanReturnAsync();
}
}

2
Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs
View File

@@ -27,7 +27,7 @@ namespace Content.IntegrationTests.Tests.Construction
var entMan = server.ResolveDependency<IEntityManager>();
var protoMan = server.ResolveDependency<IPrototypeManager>();
var map = await PoolManager.CreateTestMap(pair);
var map = await pair.CreateTestMap();
await server.WaitAssertion(() =>
{

6
Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
View File

@@ -55,7 +55,7 @@ namespace Content.IntegrationTests.Tests
entStorage.Insert(dummy, container);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await c.WaitAssertion(() =>
{
@@ -95,7 +95,7 @@ namespace Content.IntegrationTests.Tests
entStorage.Insert(dummy, container);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await c.WaitAssertion(() =>
{
@@ -137,7 +137,7 @@ namespace Content.IntegrationTests.Tests
entStorage.Insert(dummy, containerB);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await c.WaitAssertion(() =>
{

2
Content.IntegrationTests/Tests/DeleteInventoryTest.cs
View File

@@ -16,7 +16,7 @@ namespace Content.IntegrationTests.Tests
{
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entMgr = server.ResolveDependency<IEntityManager>();
var sysManager = server.ResolveDependency<IEntitySystemManager>();
var coordinates = testMap.GridCoords;

2
Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
View File

@@ -21,7 +21,7 @@ namespace Content.IntegrationTests.Tests.Destructible
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var sEntityManager = server.ResolveDependency<IEntityManager>();
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();

2
Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
View File

@@ -18,7 +18,7 @@ namespace Content.IntegrationTests.Tests.Destructible
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var sEntityManager = server.ResolveDependency<IEntityManager>();
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();

2
Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
View File

@@ -17,7 +17,7 @@ namespace Content.IntegrationTests.Tests.Destructible
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var sEntityManager = server.ResolveDependency<IEntityManager>();
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();

2
Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
View File

@@ -28,7 +28,7 @@ namespace Content.IntegrationTests.Tests.Destructible
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
var audio = sEntitySystemManager.GetEntitySystem<SharedAudioSystem>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
EntityUid sDestructibleEntity = default;
DamageableComponent sDamageableComponent = null;

4
Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
View File

@@ -113,7 +113,7 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
{
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
var mapManager = server.ResolveDependency<IMapManager>();
@@ -198,7 +198,7 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
{
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
var mapManager = server.ResolveDependency<IMapManager>();

2
Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
View File

@@ -150,7 +150,7 @@ namespace Content.IntegrationTests.Tests.Disposal
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
EntityUid human = default!;
EntityUid wrench = default!;

4
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -80,7 +80,7 @@ namespace Content.IntegrationTests.Tests
var settings = new PoolSettings { Dirty = true };
await using var pair = await PoolManager.GetServerClient(settings);
var server = pair.Server;
var map = await PoolManager.CreateTestMap(pair);
var map = await pair.CreateTestMap();
var entityMan = server.ResolveDependency<IEntityManager>();
var prototypeMan = server.ResolveDependency<IPrototypeManager>();
@@ -167,7 +167,7 @@ namespace Content.IntegrationTests.Tests
}
});
await PoolManager.RunTicksSync(pair, 15);
await pair.RunTicksSync(15);
// Make sure the client actually received the entities
// 500 is completely arbitrary. Note that the client & sever entity counts aren't expected to match.

8
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Fluids
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
var spillSystem = entitySystemManager.GetEntitySystem<PuddleSystem>();
@@ -34,7 +34,7 @@ namespace Content.IntegrationTests.Tests.Fluids
Assert.That(spillSystem.TrySpillAt(coordinates, solution, out _), Is.True);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await pair.CleanReturnAsync();
}
@@ -45,7 +45,7 @@ namespace Content.IntegrationTests.Tests.Fluids
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var entitySystemManager = server.ResolveDependency<IEntitySystemManager>();
var spillSystem = entitySystemManager.GetEntitySystem<PuddleSystem>();
@@ -63,7 +63,7 @@ namespace Content.IntegrationTests.Tests.Fluids
}
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await server.WaitAssertion(() =>
{

4
Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
View File

@@ -52,7 +52,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
Assert.That(alerts, Has.Count.EqualTo(alertCount + 2));
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
AlertsUI clientAlertsUI = default;
await client.WaitAssertion(() =>
@@ -98,7 +98,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
alertsSystem.ClearAlert(playerUid, AlertType.Debug1);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await client.WaitAssertion(() =>
{

4
Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs
View File

@@ -39,7 +39,7 @@ namespace Content.IntegrationTests.Tests.GameRules
});
var ticks = sGameTiming.TickRate * (int) Math.Ceiling(maxTime.RoundMaxTime.TotalSeconds * 1.1f);
await PoolManager.RunTicksSync(pair, ticks);
await pair.RunTicksSync(ticks);
await server.WaitAssertion(() =>
{
@@ -47,7 +47,7 @@ namespace Content.IntegrationTests.Tests.GameRules
});
ticks = sGameTiming.TickRate * (int) Math.Ceiling(maxTime.RoundEndDelay.TotalSeconds * 1.1f);
await PoolManager.RunTicksSync(pair, ticks);
await pair.RunTicksSync(ticks);
await server.WaitAssertion(() =>
{

10
Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
View File

@@ -41,7 +41,7 @@ namespace Content.IntegrationTests.Tests.Gravity
EntityUid human = default;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
await server.WaitAssertion(() =>
{
@@ -51,7 +51,7 @@ namespace Content.IntegrationTests.Tests.Gravity
});
// Let WeightlessSystem and GravitySystem tick
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
var generatorUid = EntityUid.Invalid;
await server.WaitAssertion(() =>
{
@@ -62,7 +62,7 @@ namespace Content.IntegrationTests.Tests.Gravity
});
// Let WeightlessSystem and GravitySystem tick
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await server.WaitAssertion(() =>
{
@@ -72,14 +72,14 @@ namespace Content.IntegrationTests.Tests.Gravity
entityManager.DeleteEntity(generatorUid);
});
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await server.WaitAssertion(() =>
{
Assert.That(alertsSystem.IsShowingAlert(human, AlertType.Weightless));
});
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await pair.CleanReturnAsync();
}

2
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -33,7 +33,7 @@ namespace Content.IntegrationTests.Tests
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
EntityUid generator = default;
var entityMan = server.ResolveDependency<IEntityManager>();

8
Content.IntegrationTests/Tests/Hands/HandTests.cs
View File

@@ -25,8 +25,8 @@ public sealed class HandTests
var mapMan = server.ResolveDependency<IMapManager>();
var sys = entMan.System<SharedHandsSystem>();
var data = await PoolManager.CreateTestMap(pair);
await PoolManager.RunTicksSync(pair, 5);
var data = await pair.CreateTestMap();
await pair.RunTicksSync(5);
EntityUid item = default;
EntityUid player = default;
@@ -41,7 +41,7 @@ public sealed class HandTests
});
// run ticks here is important, as errors may happen within the container system's frame update methods.
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.That(hands.ActiveHandEntity, Is.EqualTo(item));
await server.WaitPost(() =>
@@ -49,7 +49,7 @@ public sealed class HandTests
sys.TryDrop(player, item, null!);
});
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
Assert.That(hands.ActiveHandEntity, Is.Null);
await server.WaitPost(() => mapMan.DeleteMap(data.MapId));

2
Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
View File

@@ -58,7 +58,7 @@ namespace Content.IntegrationTests.Tests
{
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var coordinates = testMap.GridCoords;
EntityUid human = default;

4
Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
View File

@@ -66,7 +66,7 @@ public abstract partial class InteractionTest
Task? tickTask = null;
while (!task.IsCompleted)
{
tickTask = PoolManager.RunTicksSync(Pair, 1);
tickTask = Pair.RunTicksSync(1);
await Task.WhenAny(task, tickTask);
}
@@ -699,7 +699,7 @@ public abstract partial class InteractionTest
protected async Task RunTicks(int ticks)
{
await PoolManager.RunTicksSync(Pair, ticks);
await Pair.RunTicksSync(ticks);
}
protected int SecondsToTicks(float seconds)

2
Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs
View File

@@ -27,7 +27,7 @@ namespace Content.IntegrationTests.Tests.Lobby
// Need to run them in sync to receive the messages.
await PoolManager.RunTicksSync(pair, 1);
await pair.RunTicksSync(1);
await PoolManager.WaitUntil(client, () => clientStateManager.CurrentState is LobbyState, 600);

4
Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs
View File

@@ -39,7 +39,7 @@ public sealed class ServerReloginTest
clientNetManager.ClientDisconnect("For testing");
});
await PoolManager.RunTicksSync(pair, 20);
await pair.RunTicksSync(20);
await server.WaitAssertion(() =>
{
@@ -51,7 +51,7 @@ public sealed class ServerReloginTest
clientNetManager.ClientConnect(null!, 0, username);
});
await PoolManager.RunTicksSync(pair, 20);
await pair.RunTicksSync(20);
await server.WaitAssertion(() =>
{

2
Content.IntegrationTests/Tests/MaterialArbitrageTest.cs
View File

@@ -33,7 +33,7 @@ public sealed class MaterialArbitrageTest
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
await server.WaitIdleAsync();
var entManager = server.ResolveDependency<IEntityManager>();

2
Content.IntegrationTests/Tests/Materials/MaterialTests.cs
View File

@@ -28,7 +28,7 @@ namespace Content.IntegrationTests.Tests.Materials
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
await server.WaitAssertion(() =>
{

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(() =>
{

4
Content.IntegrationTests/Tests/Networking/ReconnectTest.cs
View File

@@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Networking
await client.WaitPost(() => host.ExecuteCommand("disconnect"));
// Run some ticks for the disconnect to complete and such.
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
@@ -29,7 +29,7 @@ namespace Content.IntegrationTests.Tests.Networking
await client.WaitPost(() => netManager.ClientConnect(null, 0, null));
// Run some ticks for the handshake to complete and such.
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
await pair.CleanReturnAsync();

2
Content.IntegrationTests/Tests/RestartRoundTest.cs
View File

@@ -23,7 +23,7 @@ namespace Content.IntegrationTests.Tests
sysManager.GetEntitySystem<GameTicker>().RestartRound();
});
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await pair.CleanReturnAsync();
}
}

2
Content.IntegrationTests/Tests/RoundEndTest.cs
View File

@@ -120,7 +120,7 @@ namespace Content.IntegrationTests.Tests
var currentCount = Thread.VolatileRead(ref eventCount);
while (currentCount == Thread.VolatileRead(ref eventCount) && !timeout.IsCompleted)
{
await PoolManager.RunTicksSync(pair, 5);
await pair.RunTicksSync(5);
}
if (timeout.IsCompleted) throw new TimeoutException("Event took too long to trigger");
}

2
Content.IntegrationTests/Tests/Shuttle/DockTest.cs
View File

@@ -24,7 +24,7 @@ public sealed class DockTest : ContentUnitTest
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var map = await PoolManager.CreateTestMap(pair);
var map = await pair.CreateTestMap();
var entManager = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();

2
Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
View File

@@ -35,7 +35,7 @@ namespace Content.IntegrationTests.Tests.Utility
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var mapCoordinates = testMap.MapCoords;
var entityCoordinates = testMap.GridCoords;

2
Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs
View File

@@ -61,7 +61,7 @@ namespace Content.IntegrationTests.Tests.Utility
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
var mapCoordinates = testMap.MapCoords;
var sEntities = server.ResolveDependency<IEntityManager>();

6
Content.IntegrationTests/Tests/VendingMachineRestockTest.cs
View File

@@ -193,7 +193,7 @@ namespace Content.IntegrationTests.Tests
VendingMachineRestockComponent restockWrongComponent = default!;
WiresPanelComponent machineWiresPanel = default!;
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
await server.WaitAssertion(() =>
{
@@ -273,7 +273,7 @@ namespace Content.IntegrationTests.Tests
var damageableSystem = entitySystemManager.GetEntitySystem<DamageableSystem>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
EntityUid restock = default;
@@ -336,7 +336,7 @@ namespace Content.IntegrationTests.Tests
var vendingMachineSystem = entitySystemManager.GetEntitySystem<SharedVendingMachineSystem>();
var testMap = await PoolManager.CreateTestMap(pair);
var testMap = await pair.CreateTestMap();
await server.WaitAssertion(() =>
{

4
Content.MapRenderer/Painters/MapPainter.cs
View File

@@ -55,7 +55,7 @@ namespace Content.MapRenderer.Painters
var sEntityManager = server.ResolveDependency<IServerEntityManager>();
var sPlayerManager = server.ResolveDependency<IPlayerManager>();
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
var sMapManager = server.ResolveDependency<IMapManager>();
@@ -85,7 +85,7 @@ namespace Content.MapRenderer.Painters
}
});
await PoolManager.RunTicksSync(pair, 10);
await pair.RunTicksSync(10);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
foreach (var (uid, grid) in grids)