From 3c667b6f7ecd4c6ec6effeeede65bf7969b490b3 Mon Sep 17 00:00:00 2001 From: Visne <39844191+Visne@users.noreply.github.com> Date: Fri, 25 Aug 2023 02:56:51 +0200 Subject: [PATCH] Remove obsolete TestPair.Pair (#19496) --- .../DeviceNetworkingBenchmark.cs | 14 +-- Content.Benchmarks/MapLoadBenchmark.cs | 6 +- Content.Benchmarks/Program.cs | 2 +- Content.IntegrationTests/Pair/TestPair.cs | 12 +-- Content.IntegrationTests/PoolManager.cs | 19 ++-- .../Tests/Access/AccessReaderTest.cs | 8 +- .../Tests/Administration/Logs/AddTests.cs | 48 +++++----- .../Tests/Administration/Logs/FilterTests.cs | 8 +- .../Tests/Administration/Logs/QueryTests.cs | 6 +- .../Tests/Atmos/AlarmThresholdTest.cs | 6 +- .../Tests/Atmos/ConstantsTest.cs | 6 +- .../Tests/Atmos/GasMixtureTest.cs | 12 +-- .../Tests/Body/LegTest.cs | 6 +- .../Tests/Body/LungTest.cs | 12 +-- .../Tests/Body/SaveLoadReparentTest.cs | 6 +- .../Tests/Buckle/BuckleTest.cs | 24 ++--- Content.IntegrationTests/Tests/CargoTest.cs | 32 +++---- .../Tests/Chemistry/SolutionSystemTests.cs | 38 ++++---- .../Tests/Chemistry/TryAllReactionsTest.cs | 8 +- .../Tests/Cleanup/EuiManagerTest.cs | 6 +- .../Tests/ClickableTest.cs | 12 +-- .../Tests/Commands/PardonCommand.cs | 12 +-- .../Tests/Commands/RejuvenateTest.cs | 6 +- .../Tests/Commands/RestartRoundTest.cs | 12 +-- .../Construction/ConstructionActionValid.cs | 12 +-- .../Construction/ConstructionPrototypeTest.cs | 34 +++---- .../Tests/ContainerOcclusionTest.cs | 30 +++---- .../Tests/Damageable/DamageableTest.cs | 6 +- .../Tests/DeleteInventoryTest.cs | 8 +- .../DestructibleDamageGroupTest.cs | 8 +- .../DestructibleDamageTypeTest.cs | 8 +- .../DestructibleDestructionTest.cs | 8 +- .../DestructibleThresholdActivationTest.cs | 8 +- .../Tests/DeviceNetwork/DeviceNetworkTest.cs | 22 ++--- .../Tests/Disposal/DisposalUnitTest.cs | 8 +- .../Tests/DoAfter/DoAfterServerTest.cs | 18 ++-- .../Tests/Doors/AirlockTest.cs | 12 +-- .../Tests/DummyIconTest.cs | 8 +- Content.IntegrationTests/Tests/EntityTest.cs | 42 ++++----- .../Tests/Fluids/FluidSpillTest.cs | 6 +- .../Tests/Fluids/PuddleTest.cs | 20 ++--- .../Tests/FollowerSystemTest.cs | 6 +- .../Components/ActionBlocking/HandCuffTest.cs | 6 +- .../EntityPrototypeComponentsTest.cs | 16 ++-- .../Components/Mobs/AlertsComponentTests.cs | 12 +-- .../Tests/GameRules/RuleMaxTimeRestartTest.cs | 10 +-- .../Tests/GameRules/SecretStartsTest.cs | 6 +- .../Tests/GameRules/StartEndGameRulesTest.cs | 6 +- .../Tests/Gravity/WeightlessStatusTests.cs | 16 ++-- .../Tests/GravityGridTest.cs | 8 +- .../Tests/Guidebook/DocumentParsingTest.cs | 6 +- .../Guidebook/GuideEntryPrototypeTests.cs | 6 +- .../Tests/Hands/HandTests.cs | 14 +-- .../Tests/HumanInventoryUniformSlotsTest.cs | 8 +- .../Click/InteractionSystemTests.cs | 30 +++---- .../Tests/Interaction/InRangeUnobstructed.cs | 6 +- .../Interaction/InteractionTest.Helpers.cs | 4 +- .../Tests/Interaction/InteractionTest.cs | 16 ++-- .../Tests/InventoryHelpersTest.cs | 6 +- .../Tests/Lobby/CharacterCreationTest.cs | 10 +-- .../Tests/Lobby/ServerReloginTest.cs | 12 +-- .../Tests/LogErrorTest.cs | 8 +- .../Tests/MachineBoardTest.cs | 16 ++-- .../Tests/MaterialArbitrageTest.cs | 14 +-- .../Tests/Materials/MaterialTests.cs | 8 +- .../Tests/Minds/GhostRoleTests.cs | 18 ++-- .../Tests/Minds/MindTests.EntityDeletion.cs | 68 +++++++------- .../Tests/Minds/MindTests.Helpers.cs | 5 +- .../Tests/Minds/MindTests.ReconnectTests.cs | 20 ++--- .../Tests/Minds/MindTests.cs | 74 +++++++-------- Content.IntegrationTests/Tests/NPC/NPCTest.cs | 2 +- .../Tests/Networking/NetworkIdsMatchTest.cs | 8 +- .../Tests/Networking/ReconnectTest.cs | 12 +-- .../Networking/SimplePredictReconcileTest.cs | 12 +-- .../Tests/PostMapInitTest.cs | 32 +++---- .../Tests/Power/PowerTest.cs | 90 +++++++++---------- .../Tests/Procedural/DungeonTests.cs | 16 ++-- .../Tests/PrototypeSaveTest.cs | 8 +- .../Tests/PrototypeTests/PrototypeTests.cs | 24 ++--- .../Tests/ResearchTest.cs | 14 +-- .../Tests/ResettingEntitySystemTests.cs | 6 +- .../Tests/RestartRoundTest.cs | 8 +- .../Tests/RoundEndTest.cs | 8 +- Content.IntegrationTests/Tests/SalvageTest.cs | 6 +- .../Tests/SaveLoadMapTest.cs | 6 +- .../Tests/SaveLoadSaveTest.cs | 18 ++-- .../Tests/Serialization/SerializationTest.cs | 6 +- .../Tests/Shuttle/DockTest.cs | 2 +- Content.IntegrationTests/Tests/ShuttleTest.cs | 6 +- Content.IntegrationTests/Tests/StackTest.cs | 6 +- Content.IntegrationTests/Tests/StartTest.cs | 8 +- .../Tests/Station/StationJobsTest.cs | 18 ++-- Content.IntegrationTests/Tests/StorageTest.cs | 18 ++-- Content.IntegrationTests/Tests/Tag/TagTest.cs | 6 +- .../Tests/Toolshed/ToolshedTest.cs | 10 +-- .../Utility/EntitySystemExtensionsTest.cs | 8 +- .../Tests/Utility/EntityWhitelistTest.cs | 8 +- .../Tests/VendingMachineRestockTest.cs | 32 +++---- Content.MapRenderer/Painters/MapPainter.cs | 12 +-- Content.MapRenderer/Program.cs | 8 +- Content.YAMLLinter/Program.cs | 12 +-- 101 files changed, 717 insertions(+), 727 deletions(-) diff --git a/Content.Benchmarks/DeviceNetworkingBenchmark.cs b/Content.Benchmarks/DeviceNetworkingBenchmark.cs index 8aeddd6304..42149aef0b 100644 --- a/Content.Benchmarks/DeviceNetworkingBenchmark.cs +++ b/Content.Benchmarks/DeviceNetworkingBenchmark.cs @@ -60,7 +60,7 @@ public async Task SetupAsync() { ProgramShared.PathOffset = "../../../../"; _pair = await PoolManager.GetServerClient(); - var server = _pair.Pair.Server; + var server = _pair.Server; await server.WaitPost(() => { @@ -96,9 +96,9 @@ public async Task Cleanup() [Benchmark(Baseline = true, Description = "Entity Events")] public async Task EventSentBaseline() { - var server = _pair.Pair.Server; + var server = _pair.Server; - _pair.Pair.Server.Post(() => + _pair.Server.Post(() => { foreach (var entity in _targetEntities) { @@ -113,9 +113,9 @@ public async Task EventSentBaseline() [Benchmark(Description = "Device Net Broadcast No Connection Checks")] public async Task DeviceNetworkBroadcastNoConnectionChecks() { - var server = _pair.Pair.Server; + var server = _pair.Server; - _pair.Pair.Server.Post(() => + _pair.Server.Post(() => { _deviceNetworkSystem.QueuePacket(_sourceEntity, null, _payload, 100); }); @@ -127,9 +127,9 @@ public async Task DeviceNetworkBroadcastNoConnectionChecks() [Benchmark(Description = "Device Net Broadcast Wireless Connection Checks")] public async Task DeviceNetworkBroadcastWirelessConnectionChecks() { - var server = _pair.Pair.Server; + var server = _pair.Server; - _pair.Pair.Server.Post(() => + _pair.Server.Post(() => { _deviceNetworkSystem.QueuePacket(_sourceWirelessEntity, null, _payload, 100); }); diff --git a/Content.Benchmarks/MapLoadBenchmark.cs b/Content.Benchmarks/MapLoadBenchmark.cs index 15cbf96c36..7aad0ffeb3 100644 --- a/Content.Benchmarks/MapLoadBenchmark.cs +++ b/Content.Benchmarks/MapLoadBenchmark.cs @@ -28,7 +28,7 @@ public void Setup() ProgramShared.PathOffset = "../../../../"; _pair = PoolManager.GetServerClient().GetAwaiter().GetResult(); - var server = _pair.Pair.Server; + var server = _pair.Server; Paths = server.ResolveDependency() .EnumeratePrototypes() @@ -55,7 +55,7 @@ public async Task Cleanup() public async Task LoadMap() { var mapPath = Paths[Map]; - var server = _pair.Pair.Server; + var server = _pair.Server; await server.WaitPost(() => { var success = _mapLoader.TryLoad(new MapId(10), mapPath, out _); @@ -67,7 +67,7 @@ await server.WaitPost(() => [IterationCleanup] public void IterationCleanup() { - var server = _pair.Pair.Server; + var server = _pair.Server; server.WaitPost(() => { _mapManager.DeleteMap(new MapId(10)); diff --git a/Content.Benchmarks/Program.cs b/Content.Benchmarks/Program.cs index 08724064a6..5517bba6a6 100644 --- a/Content.Benchmarks/Program.cs +++ b/Content.Benchmarks/Program.cs @@ -22,7 +22,7 @@ public static async Task MainAsync(string[] args) { PoolManager.Startup(typeof(Program).Assembly); var pair = await PoolManager.GetServerClient(); - var gameMaps = pair.Pair.Server.ResolveDependency().EnumeratePrototypes().ToList(); + var gameMaps = pair.Server.ResolveDependency().EnumeratePrototypes().ToList(); MapLoadBenchmark.MapsSource = gameMaps.Select(x => x.ID); await pair.CleanReturnAsync(); diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs index 41af4b2c80..bd79c0f86b 100644 --- a/Content.IntegrationTests/Pair/TestPair.cs +++ b/Content.IntegrationTests/Pair/TestPair.cs @@ -15,10 +15,6 @@ namespace Content.IntegrationTests.Pair; /// public sealed partial class TestPair { - // TODO remove this. - [Obsolete("Field access is redundant")] - public TestPair Pair => this; - public readonly int Id; private bool _initialized; private TextWriter _testOut = default!; @@ -31,7 +27,7 @@ public sealed partial class TestPair public PoolTestLogHandler ServerLogHandler { get; private set; } = default!; public PoolTestLogHandler ClientLogHandler { get; private set; } = default!; - + public TestPair(int id) { Id = id; @@ -72,7 +68,7 @@ await Client.WaitPost(() => await Client.WaitRunTicks(1); } } - + public void Kill() { State = PairState.Dead; @@ -100,7 +96,7 @@ public void Use() throw new InvalidOperationException($"Pair is not ready to use. State: {State}"); State = PairState.InUse; } - + public enum PairState : byte { Ready = 0, @@ -108,4 +104,4 @@ public enum PairState : byte CleanDisposed = 2, Dead = 3, } -} \ No newline at end of file +} diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs index af89bce99d..8083c7a2e0 100644 --- a/Content.IntegrationTests/PoolManager.cs +++ b/Content.IntegrationTests/PoolManager.cs @@ -277,7 +277,7 @@ await testOut.WriteLineAsync( } pair.ValidateSettings(poolSettings); - + var poolRetrieveTime = poolRetrieveTimeWatch.Elapsed; await testOut.WriteLineAsync( $"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms"); @@ -298,7 +298,7 @@ await testOut.WriteLineAsync( { if (Pairs[pair]) continue; - + if (!pair.Settings.CanFastRecycle(poolSettings)) { fallback = pair; @@ -320,15 +320,14 @@ await testOut.WriteLineAsync( { var x = 2; } - + return fallback; } } /// - /// Used by PairTracker after checking the server/client pair, Don't use this. + /// Used by TestPair after checking the server/client pair, Don't use this. /// - /// public static void NoCheckReturn(TestPair pair) { lock (PairLock) @@ -384,12 +383,12 @@ private static async Task CreateServerClientPair(PoolSettings poolSett /// /// Creates a map, a grid, and a tile, and gives back references to them. /// - /// A pairTracker + /// A pair /// A TestMapData [Obsolete("use TestPair.CreateMap")] - public static async Task CreateTestMap(TestPair pairTracker) + public static async Task CreateTestMap(TestPair pair) { - return await pairTracker.CreateTestMap(); + return await pair.CreateTestMap(); } /// @@ -406,7 +405,7 @@ public static async Task RunTicksSync(TestPair pair, int ticks) await pair.Client.WaitRunTicks(1); } } - + /// /// Runs a server, or a client until a condition is true /// @@ -492,4 +491,4 @@ public static void Startup(Assembly? assembly) _initialized = true; DiscoverTestPrototypes(assembly); } -} \ No newline at end of file +} diff --git a/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs b/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs index fa172e7048..7d86fc2f6c 100644 --- a/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs +++ b/Content.IntegrationTests/Tests/Access/AccessReaderTest.cs @@ -16,7 +16,7 @@ public sealed class AccessReaderTest public async Task TestProtoTags() { await using var pair = await PoolManager.GetServerClient(); - var server = pair.Pair.Server; + var server = pair.Server; var protoManager = server.ResolveDependency(); var accessName = server.ResolveDependency().GetComponentName(typeof(AccessReaderComponent)); @@ -44,8 +44,8 @@ await server.WaitAssertion(() => [Test] public async Task TestTags() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); @@ -121,7 +121,7 @@ await server.WaitAssertion(() => Assert.That(system.AreAccessTagsAllowed(Array.Empty(), reader), Is.False); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs index 5c6d276050..e33ec5a449 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs @@ -26,15 +26,15 @@ public sealed class AddTests [Test] public async Task AddAndGetSingleLog() { - await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(LogTestSettings); + var server = pair.Server; var sEntities = server.ResolveDependency(); var sAdminLogSystem = server.ResolveDependency(); var guid = Guid.NewGuid(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; await server.WaitPost(() => { @@ -65,14 +65,14 @@ await PoolManager.WaitUntil(server, async () => return false; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task AddAndGetUnformattedLog() { - await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(LogTestSettings); + var server = pair.Server; var sDatabase = server.ResolveDependency(); var sEntities = server.ResolveDependency(); @@ -83,7 +83,7 @@ public async Task AddAndGetUnformattedLog() var guid = Guid.NewGuid(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; await server.WaitPost(() => { @@ -130,20 +130,20 @@ await PoolManager.WaitUntil(server, async () => json.Dispose(); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] [TestCase(500)] public async Task BulkAddLogs(int amount) { - await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(LogTestSettings); + var server = pair.Server; var sEntities = server.ResolveDependency(); var sAdminLogSystem = server.ResolveDependency(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; await server.WaitPost(() => { @@ -161,14 +161,14 @@ await PoolManager.WaitUntil(server, async () => return messages.Count >= amount; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task AddPlayerSessionLog() { - await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(LogTestSettings); + var server = pair.Server; var sPlayers = server.ResolveDependency(); @@ -197,7 +197,7 @@ await PoolManager.WaitUntil(server, async () => Assert.That(logs.First().Players, Does.Contain(playerGuid)); return true; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] @@ -210,8 +210,8 @@ public async Task PreRoundAddAndGetSingle() AdminLogsEnabled = true }; - await using var pairTracker = await PoolManager.GetServerClient(setting); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(setting); + var server = pair.Server; var sDatabase = server.ResolveDependency(); var sSystems = server.ResolveDependency(); @@ -264,14 +264,14 @@ await PoolManager.WaitUntil(server, async () => json.Dispose(); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task DuplicatePlayerDoesNotThrowTest() { - await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(LogTestSettings); + var server = pair.Server; var sPlayers = server.ResolveDependency(); var sAdminLogSystem = server.ResolveDependency(); @@ -300,15 +300,15 @@ await PoolManager.WaitUntil(server, async () => return true; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); Assert.Pass(); } [Test] public async Task DuplicatePlayerIdDoesNotThrowTest() { - await using var pairTracker = await PoolManager.GetServerClient(LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(LogTestSettings); + var server = pair.Server; var sPlayers = server.ResolveDependency(); @@ -338,7 +338,7 @@ await PoolManager.WaitUntil(server, async () => return true; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); Assert.Pass(); } } diff --git a/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs index 7acbba314c..4076d18ed8 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/FilterTests.cs @@ -14,8 +14,8 @@ public sealed class FilterTests [TestCase(DateOrder.Descending)] public async Task Date(DateOrder order) { - await using var pairTracker = await PoolManager.GetServerClient(AddTests.LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(AddTests.LogTestSettings); + var server = pair.Server; var sEntities = server.ResolveDependency(); @@ -24,7 +24,7 @@ public async Task Date(DateOrder order) var commonGuid = Guid.NewGuid(); var firstGuid = Guid.NewGuid(); var secondGuid = Guid.NewGuid(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; await server.WaitPost(() => @@ -96,6 +96,6 @@ await PoolManager.WaitUntil(server, async () => return firstFound && secondFound; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs index cf0e6412d9..1155edfad2 100644 --- a/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs +++ b/Content.IntegrationTests/Tests/Administration/Logs/QueryTests.cs @@ -15,8 +15,8 @@ public sealed class QueryTests [Test] public async Task QuerySingleLog() { - await using var pairTracker = await PoolManager.GetServerClient(AddTests.LogTestSettings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(AddTests.LogTestSettings); + var server = pair.Server; var sSystems = server.ResolveDependency(); var sPlayers = server.ResolveDependency(); @@ -55,6 +55,6 @@ await PoolManager.WaitUntil(server, async () => return false; }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs index 9ebc319d43..064b4f9a2d 100644 --- a/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs +++ b/Content.IntegrationTests/Tests/Atmos/AlarmThresholdTest.cs @@ -24,8 +24,8 @@ public sealed class AlarmThresholdTest [Test] public async Task TestAlarmThreshold() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var prototypeManager = server.ResolveDependency(); AtmosAlarmThreshold threshold = default!; @@ -134,7 +134,7 @@ await server.WaitAssertion(() => Assert.That(alarmType, Is.EqualTo(AtmosAlarmType.Normal)); } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs b/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs index 85e9ac934a..9f016cc89a 100644 --- a/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs +++ b/Content.IntegrationTests/Tests/Atmos/ConstantsTest.cs @@ -12,8 +12,8 @@ public sealed class ConstantsTest [Test] public async Task TotalGasesTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); await server.WaitPost(() => @@ -26,7 +26,7 @@ await server.WaitPost(() => Assert.That(Enum.GetValues(typeof(Gas)), Has.Length.EqualTo(Atmospherics.TotalNumberOfGases)); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs b/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs index 55ef72976c..1cb8fd8b6f 100644 --- a/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs +++ b/Content.IntegrationTests/Tests/Atmos/GasMixtureTest.cs @@ -12,8 +12,8 @@ public sealed class GasMixtureTest [Test] public async Task TestMerge() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var atmosphereSystem = server.ResolveDependency().GetEntitySystem(); @@ -57,7 +57,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] @@ -69,8 +69,8 @@ await server.WaitAssertion(() => [TestCase(Atmospherics.BreathPercentage)] public async Task RemoveRatio(float ratio) { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitAssertion(() => { @@ -104,7 +104,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Body/LegTest.cs b/Content.IntegrationTests/Tests/Body/LegTest.cs index 5490a9909e..4d5078f2dc 100644 --- a/Content.IntegrationTests/Tests/Body/LegTest.cs +++ b/Content.IntegrationTests/Tests/Body/LegTest.cs @@ -29,8 +29,8 @@ public sealed class LegTest [Test] public async Task RemoveLegsFallTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; EntityUid human = default!; AppearanceComponent appearance = null; @@ -72,7 +72,7 @@ await server.WaitAssertion(() => Assert.That(state, Is.EqualTo(RotationState.Horizontal)); #pragma warning restore NUnit2045 }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Body/LungTest.cs b/Content.IntegrationTests/Tests/Body/LungTest.cs index 744806cd36..d0325480ac 100644 --- a/Content.IntegrationTests/Tests/Body/LungTest.cs +++ b/Content.IntegrationTests/Tests/Body/LungTest.cs @@ -53,8 +53,8 @@ public sealed class LungTest public async Task AirConsistencyTest() { // --- Setup - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); @@ -132,14 +132,14 @@ await server.WaitAssertion(() => }); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task NoSuffocationTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); @@ -198,7 +198,7 @@ await server.WaitAssertion(() => }); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs index ad14acb324..94591dd2b9 100644 --- a/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs +++ b/Content.IntegrationTests/Tests/Body/SaveLoadReparentTest.cs @@ -24,8 +24,8 @@ public sealed class SaveLoadReparentTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entities = server.ResolveDependency(); var maps = server.ResolveDependency(); @@ -159,6 +159,6 @@ await server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs index 8614f0508a..91b3a91e18 100644 --- a/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs +++ b/Content.IntegrationTests/Tests/Buckle/BuckleTest.cs @@ -49,10 +49,10 @@ public sealed class BuckleTest [Test] public async Task BuckleUnbuckleCooldownRangeTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; var entityManager = server.ResolveDependency(); var actionBlocker = entityManager.System(); @@ -236,16 +236,16 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task BuckledDyingDropItemsTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; EntityUid human = default; @@ -329,16 +329,16 @@ await server.WaitAssertion(() => buckleSystem.TryUnbuckle(human, human, true, buckleComp: buckle); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task ForceUnbuckleBuckleTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; var entityManager = server.ResolveDependency(); var buckleSystem = entityManager.System(); @@ -405,7 +405,7 @@ await server.WaitAssertion(() => Assert.That(buckle.Buckled); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/CargoTest.cs b/Content.IntegrationTests/Tests/CargoTest.cs index c47fc7814e..74de6f3f50 100644 --- a/Content.IntegrationTests/Tests/CargoTest.cs +++ b/Content.IntegrationTests/Tests/CargoTest.cs @@ -17,10 +17,10 @@ public sealed class CargoTest [Test] public async Task NoCargoOrderArbitrage() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var entManager = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -46,15 +46,15 @@ await server.WaitAssertion(() => mapManager.DeleteMap(mapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task NoCargoBountyArbitageTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var entManager = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -86,16 +86,16 @@ await server.WaitAssertion(() => mapManager.DeleteMap(mapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task NoStaticPriceAndStackPrice() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var entManager = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -109,7 +109,7 @@ await server.WaitAssertion(() => var protoIds = protoManager.EnumeratePrototypes() .Where(p => !p.Abstract) - .Where(p => !pairTracker.Pair.IsTestPrototype(p)) + .Where(p => !pair.IsTestPrototype(p)) .Where(p => !p.Components.ContainsKey("MapGrid")) // Grids are not for sale. .Select(p => p.ID) .ToList(); @@ -142,7 +142,7 @@ await server.WaitAssertion(() => mapManager.DeleteMap(mapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } @@ -168,8 +168,8 @@ await server.WaitAssertion(() => [Test] public async Task StackPrice() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entManager = server.ResolveDependency(); var priceSystem = entManager.System(); @@ -178,6 +178,6 @@ public async Task StackPrice() var price = priceSystem.GetPrice(ent); Assert.That(price, Is.EqualTo(100.0)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs index ac26de3697..53a84c7a59 100644 --- a/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs +++ b/Content.IntegrationTests/Tests/Chemistry/SolutionSystemTests.cs @@ -46,13 +46,13 @@ public sealed class SolutionSystemTests [Test] public async Task TryAddTwoNonReactiveReagent() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var protoMan = server.ResolveDependency(); var containerSystem = entityManager.EntitySysManager.GetEntitySystem(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; EntityUid beaker; @@ -82,7 +82,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // This test mimics current behavior @@ -90,10 +90,10 @@ await server.WaitAssertion(() => [Test] public async Task TryAddTooMuchNonReactiveReagent() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var entityManager = server.ResolveDependency(); var protoMan = server.ResolveDependency(); @@ -127,20 +127,20 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // Unlike TryAddSolution this adds and two solution without then splits leaving only threshold in original [Test] public async Task TryMixAndOverflowTooMuchReagent() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var protoMan = server.ResolveDependency(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var containerSystem = entityManager.EntitySysManager.GetEntitySystem(); var coordinates = testMap.GridCoords; @@ -182,20 +182,20 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // TryMixAndOverflow will fail if Threshold larger than MaxVolume [Test] public async Task TryMixAndOverflowTooBigOverflow() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var protoMan = server.ResolveDependency(); var containerSystem = entityManager.EntitySysManager.GetEntitySystem(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; EntityUid beaker; @@ -220,14 +220,14 @@ await server.WaitAssertion(() => Is.False); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestTemperatureCalculations() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); const float temp = 100.0f; @@ -259,6 +259,6 @@ await server.WaitAssertion(() => Assert.That(solutionOne.GetHeatCapacity(protoMan) * solutionOne.Temperature, Is.EqualTo(thermalEnergyOne + thermalEnergyTwo)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs index 777d4b7c7e..10742feba0 100644 --- a/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs +++ b/Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs @@ -27,12 +27,12 @@ public sealed class TryAllReactionsTest [Test] public async Task TryAllTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var prototypeManager = server.ResolveDependency(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; var solutionSystem = server.ResolveDependency() .GetEntitySystem(); @@ -89,7 +89,7 @@ await server.WaitAssertion(() => }); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs b/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs index 12e0e41aa8..9aac4e2892 100644 --- a/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs +++ b/Content.IntegrationTests/Tests/Cleanup/EuiManagerTest.cs @@ -13,12 +13,12 @@ public async Task EuiManagerRecycleWithOpenWindowTest() // Even though we are using the server EUI here, we actually want to see if the client EUIManager crashes for (var i = 0; i < 2; i++) { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true, Dirty = true }); - var server = pairTracker.Pair.Server; + var server = pair.Server; var sPlayerManager = server.ResolveDependency(); var eui = server.ResolveDependency(); @@ -29,7 +29,7 @@ await server.WaitAssertion(() => var ui = new AdminAnnounceEui(); eui.OpenEui(ui, clientSession); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs index 3cca6a03c3..4c3868cdbf 100644 --- a/Content.IntegrationTests/Tests/ClickableTest.cs +++ b/Content.IntegrationTests/Tests/ClickableTest.cs @@ -44,9 +44,9 @@ public sealed class ClickableTest [TestCase("ClickTestRotatingCornerInvisibleNoRot", 0.25f, 0.25f, DirSouthEastJustShy, 1, ExpectedResult = true)] public async Task Test(string prototype, float clickPosX, float clickPosY, double angle, float scale) { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var server = pair.Server; + var client = pair.Client; EntityUid entity = default; var clientEntManager = client.ResolveDependency(); var serverEntManager = server.ResolveDependency(); @@ -55,7 +55,7 @@ public async Task Test(string prototype, float clickPosX, float clickPosY, var xformQuery = clientEntManager.GetEntityQuery(); var eye = client.ResolveDependency().CurrentEye; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); await server.WaitPost(() => { var ent = serverEntManager.SpawnEntity(prototype, testMap.GridCoords); @@ -64,7 +64,7 @@ await server.WaitPost(() => }); // Let client sync up. - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); var hit = false; @@ -87,7 +87,7 @@ await server.WaitPost(() => serverEntManager.DeleteEntity(entity); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); return hit; } diff --git a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs index a24985d738..df1d6a4730 100644 --- a/Content.IntegrationTests/Tests/Commands/PardonCommand.cs +++ b/Content.IntegrationTests/Tests/Commands/PardonCommand.cs @@ -15,9 +15,9 @@ public sealed class PardonCommand [Test] public async Task PardonTest() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var server = pair.Server; + var client = pair.Client; var sPlayerManager = server.ResolveDependency(); var sConsole = server.ResolveDependency(); @@ -62,7 +62,7 @@ public async Task PardonTest() Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1)); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0)); Assert.That(!netMan.IsConnected); @@ -146,10 +146,10 @@ public async Task PardonTest() Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0)); client.SetConnectTarget(server); await client.WaitPost(() => netMan.ClientConnect(null!, 0, null!)); - await pairTracker.RunTicksSync(5); + await pair.RunTicksSync(5); Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs index 0153cfccc4..2fda3ad58e 100644 --- a/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RejuvenateTest.cs @@ -33,8 +33,8 @@ public sealed class RejuvenateTest [Test] public async Task RejuvenateDeadTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entManager = server.ResolveDependency(); var prototypeManager = server.ResolveDependency(); var mobStateSystem = entManager.EntitySysManager.GetEntitySystem(); @@ -89,7 +89,7 @@ await server.WaitAssertion(() => Assert.That(damageable.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs index a94b232d77..325b2bf362 100644 --- a/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/Commands/RestartRoundTest.cs @@ -16,18 +16,18 @@ public sealed class RestartRoundNowTest [TestCase(false)] public async Task RestartRoundAfterStart(bool lobbyEnabled) { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings + await using var pair = await PoolManager.GetServerClient(new PoolSettings { DummyTicker = false, Dirty = true }); - var server = pairTracker.Pair.Server; + var server = pair.Server; var configManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTicker = entityManager.EntitySysManager.GetEntitySystem(); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); GameTick tickBeforeRestart = default; @@ -49,7 +49,7 @@ await server.WaitAssertion(() => } }); - await PoolManager.RunTicksSync(pairTracker.Pair, 15); + await PoolManager.RunTicksSync(pair, 15); await server.WaitAssertion(() => { @@ -58,8 +58,8 @@ await server.WaitAssertion(() => Assert.That(tickBeforeRestart, Is.LessThan(tickAfterRestart)); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); - await pairTracker.CleanReturnAsync(); + await PoolManager.RunTicksSync(pair, 5); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs index bc0aee451d..408b0e0bd0 100644 --- a/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs +++ b/Content.IntegrationTests/Tests/Construction/ConstructionActionValid.cs @@ -47,8 +47,8 @@ private bool IsValid(IGraphAction action, IPrototypeManager protoMan, out string [Test] public async Task ConstructionGraphSpawnPrototypeValid() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); @@ -79,7 +79,7 @@ public async Task ConstructionGraphSpawnPrototypeValid() } } } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); Assert.That(valid, Is.True, $"One or more SpawnPrototype actions specified invalid entity prototypes!\n{message}"); } @@ -87,8 +87,8 @@ public async Task ConstructionGraphSpawnPrototypeValid() [Test] public async Task ConstructionGraphEdgeValid() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); @@ -110,7 +110,7 @@ public async Task ConstructionGraphEdgeValid() } Assert.That(valid, Is.True, $"One or more edges specified invalid node targets!\n{message}"); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs index 385ed39a83..12732a1739 100644 --- a/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs +++ b/Content.IntegrationTests/Tests/Construction/ConstructionPrototypeTest.cs @@ -21,13 +21,13 @@ public sealed class ConstructionPrototypeTest [Test] public async Task TestStartNodeValid() { - 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(); var protoMan = server.ResolveDependency(); - var map = await PoolManager.CreateTestMap(pairTracker); + var map = await PoolManager.CreateTestMap(pair); await server.WaitAssertion(() => { @@ -47,14 +47,14 @@ await server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestStartIsValid() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); @@ -65,14 +65,14 @@ public async Task TestStartIsValid() Assert.That(graph.Nodes.ContainsKey(start), $"Found no startNode \"{start}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!"); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestTargetIsValid() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); @@ -83,14 +83,14 @@ public async Task TestTargetIsValid() Assert.That(graph.Nodes.ContainsKey(target), $"Found no targetNode \"{target}\" on graph \"{graph.ID}\" for construction prototype \"{proto.ID}\"!"); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task DeconstructionIsValid() { - 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(); var protoMan = server.ResolveDependency(); @@ -101,7 +101,7 @@ public async Task DeconstructionIsValid() { foreach (var proto in protoMan.EnumeratePrototypes()) { - if (proto.Abstract || pairTracker.Pair.IsTestPrototype(proto) || !proto.Components.TryGetValue(name, out var reg)) + if (proto.Abstract || pair.IsTestPrototype(proto) || !proto.Components.TryGetValue(name, out var reg)) continue; var comp = (ConstructionComponent) reg.Component; @@ -114,14 +114,14 @@ public async Task DeconstructionIsValid() } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestStartReachesValidTarget() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); var entMan = server.ResolveDependency(); @@ -142,7 +142,7 @@ public async Task TestStartReachesValidTarget() Assert.That(entity.Components.ContainsKey("Construction"), $"The next node ({next.Name}) in the path from the start node ({start}) to the target node ({target}) specified an entity prototype ({next.Entity}) without a ConstructionComponent."); #pragma warning restore NUnit2045 } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs index 0b1717c365..d68472bba7 100644 --- a/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs +++ b/Content.IntegrationTests/Tests/ContainerOcclusionTest.cs @@ -34,9 +34,9 @@ public sealed class ContainerOcclusionTest [Test] public async Task TestA() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var s = pairTracker.Pair.Server; - var c = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var s = pair.Server; + var c = pair.Client; var cEntities = c.ResolveDependency(); var ent = s.ResolveDependency(); @@ -55,7 +55,7 @@ await s.WaitPost(() => entStorage.Insert(dummy, container); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await c.WaitAssertion(() => { @@ -68,15 +68,15 @@ await c.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestB() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var s = pairTracker.Pair.Server; - var c = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var s = pair.Server; + var c = pair.Client; var cEntities = c.ResolveDependency(); var ent = s.ResolveDependency(); @@ -95,7 +95,7 @@ await s.WaitPost(() => entStorage.Insert(dummy, container); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await c.WaitAssertion(() => { @@ -108,15 +108,15 @@ await c.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestAb() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var s = pairTracker.Pair.Server; - var c = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var s = pair.Server; + var c = pair.Client; var cEntities = c.ResolveDependency(); var ent = s.ResolveDependency(); @@ -137,7 +137,7 @@ await s.WaitPost(() => entStorage.Insert(dummy, containerB); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await c.WaitAssertion(() => { @@ -150,7 +150,7 @@ await c.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs index f527b0577e..3ab90b07eb 100644 --- a/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs +++ b/Content.IntegrationTests/Tests/Damageable/DamageableTest.cs @@ -73,8 +73,8 @@ public sealed class DamageableTest [Test] public async Task TestDamageableComponents() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntityManager = server.ResolveDependency(); var sMapManager = server.ResolveDependency(); @@ -237,7 +237,7 @@ await server.WaitAssertion(() => sDamageableSystem.TryChangeDamage(uid, new DamageSpecifier(group3, -100)); Assert.That(sDamageableComponent.TotalDamage, Is.EqualTo(FixedPoint2.Zero)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs index a9261c4a23..33f36fae17 100644 --- a/Content.IntegrationTests/Tests/DeleteInventoryTest.cs +++ b/Content.IntegrationTests/Tests/DeleteInventoryTest.cs @@ -14,9 +14,9 @@ public sealed class DeleteInventoryTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + var testMap = await PoolManager.CreateTestMap(pair); var entMgr = server.ResolveDependency(); var sysManager = server.ResolveDependency(); var coordinates = testMap.GridCoords; @@ -44,7 +44,7 @@ await server.WaitAssertion(() => // Assert that child item was also deleted. Assert.That(item.Deleted, Is.True); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs index 84841eef21..97e1c38a2e 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs @@ -18,10 +18,10 @@ public sealed class DestructibleDamageGroupTest [Test] public async Task AndTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var sEntityManager = server.ResolveDependency(); var sPrototypeManager = server.ResolveDependency(); @@ -193,7 +193,7 @@ await server.WaitAssertion(() => // No new thresholds reached as triggers once is set to true and it already triggered before Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs index 3aed14aaa1..5b5cf08bde 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs @@ -15,10 +15,10 @@ public sealed class DestructibleDamageTypeTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var sEntityManager = server.ResolveDependency(); var sEntitySystemManager = server.ResolveDependency(); @@ -186,7 +186,7 @@ await server.WaitAssertion(() => // No new thresholds reached as triggers once is set to true and it already triggered before Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs index 8fd83fdb96..8599154086 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs @@ -14,10 +14,10 @@ public sealed class DestructibleDestructionTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var sEntityManager = server.ResolveDependency(); var sPrototypeManager = server.ResolveDependency(); @@ -88,7 +88,7 @@ await server.WaitAssertion(() => Assert.That(found, Is.True); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs index 1574fc5f64..d6bf04249f 100644 --- a/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs +++ b/Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs @@ -20,15 +20,15 @@ public sealed class DestructibleThresholdActivationTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntityManager = server.ResolveDependency(); var sPrototypeManager = server.ResolveDependency(); var sEntitySystemManager = server.ResolveDependency(); var audio = sEntitySystemManager.GetEntitySystem(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); EntityUid sDestructibleEntity = default; DamageableComponent sDamageableComponent = null; @@ -288,7 +288,7 @@ await server.WaitAssertion(() => Assert.That(sTestThresholdListenerSystem.ThresholdsReached, Is.Empty); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs index 4f6a473b39..79fc0c574a 100644 --- a/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs +++ b/Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs @@ -51,8 +51,8 @@ public sealed class DeviceNetworkTest [Test] public async Task NetworkDeviceSendAndReceive() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); @@ -105,15 +105,15 @@ await server.WaitAssertion(() => { CollectionAssert.AreEquivalent(deviceNetTestSystem.LastPayload, payload); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task WirelessNetworkDeviceSendAndReceive() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; var mapManager = server.ResolveDependency(); @@ -190,15 +190,15 @@ await server.WaitAssertion(() => CollectionAssert.AreNotEqual(deviceNetTestSystem.LastPayload, payload); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task WiredNetworkDeviceSendAndReceive() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; var mapManager = server.ResolveDependency(); @@ -273,7 +273,7 @@ await server.WaitAssertion(() => CollectionAssert.AreEqual(deviceNetTestSystem.LastPayload, payload); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs index 318afce7e8..7138ff498c 100644 --- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs +++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs @@ -147,10 +147,10 @@ private static void Flush(EntityUid unitEntity, DisposalUnitComponent unit, bool [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); EntityUid human = default!; EntityUid wrench = default!; @@ -240,7 +240,7 @@ await server.WaitAssertion(() => // Re-pressurizing Flush(disposalUnit, unitComponent, false, disposalSystem); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs index dabfd68853..252cd5e04b 100644 --- a/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs +++ b/Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs @@ -32,8 +32,8 @@ public override DoAfterEvent Clone() [Test] public async Task TestSerializable() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var refMan = server.ResolveDependency(); @@ -53,14 +53,14 @@ await server.WaitPost(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestFinished() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var entityManager = server.ResolveDependency(); @@ -83,14 +83,14 @@ await server.WaitPost(() => await server.WaitRunTicks(1); Assert.That(ev.Cancelled, Is.False); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestCancelled() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var timing = server.ResolveDependency(); var doAfterSystem = entityManager.EntitySysManager.GetEntitySystem(); @@ -118,7 +118,7 @@ await server.WaitPost(() => await server.WaitRunTicks(3); Assert.That(ev.Cancelled); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs index 9efbcbe18e..9f31231091 100644 --- a/Content.IntegrationTests/Tests/Doors/AirlockTest.cs +++ b/Content.IntegrationTests/Tests/Doors/AirlockTest.cs @@ -53,8 +53,8 @@ public sealed class AirlockTest [Test] public async Task OpenCloseDestroyTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var doors = entityManager.EntitySysManager.GetEntitySystem(); @@ -106,14 +106,14 @@ await server.WaitAssertion(() => server.RunTicks(5); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task AirlockBlockTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); @@ -178,7 +178,7 @@ await server.WaitAssertion(() => { Assert.That(Math.Abs(xformSystem.GetWorldPosition(AirlockPhysicsDummy).X - 1), Is.GreaterThan(0.01f)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/DummyIconTest.cs b/Content.IntegrationTests/Tests/DummyIconTest.cs index 757f8ac700..a11191a51e 100644 --- a/Content.IntegrationTests/Tests/DummyIconTest.cs +++ b/Content.IntegrationTests/Tests/DummyIconTest.cs @@ -12,8 +12,8 @@ public sealed class DummyIconTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var client = pair.Client; var prototypeManager = client.ResolveDependency(); var resourceCache = client.ResolveDependency(); @@ -21,7 +21,7 @@ await client.WaitAssertion(() => { foreach (var proto in prototypeManager.EnumeratePrototypes()) { - if (proto.NoSpawn || proto.Abstract || pairTracker.Pair.IsTestPrototype(proto) || !proto.Components.ContainsKey("Sprite")) + if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto) || !proto.Components.ContainsKey("Sprite")) continue; Assert.DoesNotThrow(() => @@ -31,7 +31,7 @@ await client.WaitAssertion(() => proto.ID); } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index d89668d4b4..5e5d51f69f 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -22,8 +22,8 @@ public async Task SpawnAndDeleteAllEntitiesOnDifferentMaps() // This test dirties the pair as it simply deletes ALL entities when done. Overhead of restarting the round // is minimal relative to the rest of the test. var settings = new PoolSettings { Dirty = true }; - await using var pairTracker = await PoolManager.GetServerClient(settings); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(settings); + var server = pair.Server; var entityMan = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -34,7 +34,7 @@ await server.WaitPost(() => var protoIds = prototypeMan .EnumeratePrototypes() .Where(p => !p.Abstract) - .Where(p => !pairTracker.Pair.IsTestPrototype(p)) + .Where(p => !pair.IsTestPrototype(p)) .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise. .Select(p => p.ID) .ToList(); @@ -69,7 +69,7 @@ await server.WaitPost(() => Assert.That(entityMan.EntityCount, Is.Zero); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] @@ -78,9 +78,9 @@ public async Task SpawnAndDeleteAllEntitiesInTheSameSpot() // This test dirties the pair as it simply deletes ALL entities when done. Overhead of restarting the round // is minimal relative to the rest of the test. var settings = new PoolSettings { Dirty = true }; - await using var pairTracker = await PoolManager.GetServerClient(settings); - var server = pairTracker.Pair.Server; - var map = await PoolManager.CreateTestMap(pairTracker); + await using var pair = await PoolManager.GetServerClient(settings); + var server = pair.Server; + var map = await PoolManager.CreateTestMap(pair); var entityMan = server.ResolveDependency(); var prototypeMan = server.ResolveDependency(); @@ -91,7 +91,7 @@ await server.WaitPost(() => var protoIds = prototypeMan .EnumeratePrototypes() .Where(p => !p.Abstract) - .Where(p => !pairTracker.Pair.IsTestPrototype(p)) + .Where(p => !pair.IsTestPrototype(p)) .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise. .Select(p => p.ID) .ToList(); @@ -121,7 +121,7 @@ await server.WaitPost(() => Assert.That(entityMan.EntityCount, Is.Zero); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -134,9 +134,9 @@ public async Task SpawnAndDirtyAllEntities() // This test dirties the pair as it simply deletes ALL entities when done. Overhead of restarting the round // is minimal relative to the rest of the test. var settings = new PoolSettings { Connected = true, Dirty = true }; - await using var pairTracker = await PoolManager.GetServerClient(settings); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(settings); + var server = pair.Server; + var client = pair.Client; var cfg = server.ResolveDependency(); var prototypeMan = server.ResolveDependency(); @@ -148,7 +148,7 @@ public async Task SpawnAndDirtyAllEntities() var protoIds = prototypeMan .EnumeratePrototypes() .Where(p => !p.Abstract) - .Where(p => !pairTracker.Pair.IsTestPrototype(p)) + .Where(p => !pair.IsTestPrototype(p)) .Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise. .Select(p => p.ID) .ToList(); @@ -167,7 +167,7 @@ await server.WaitPost(() => } }); - await PoolManager.RunTicksSync(pairTracker.Pair, 15); + await PoolManager.RunTicksSync(pair, 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. @@ -193,7 +193,7 @@ await server.WaitPost(() => Assert.That(sEntMan.EntityCount, Is.Zero); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] @@ -216,8 +216,8 @@ public async Task AllComponentsOneToOneDeleteTest() "BiomeSelection", // Whaddya know, requires config. }; - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); @@ -290,7 +290,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] @@ -313,8 +313,8 @@ public async Task AllComponentsOneEntityDeleteTest() "BiomeSelection", // Whaddya know, requires config. }; - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); @@ -420,7 +420,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs index b048fa2514..da806aa10a 100644 --- a/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/FluidSpillTest.cs @@ -30,8 +30,8 @@ public sealed class FluidSpill [Test] public async Task SpillCorner() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var puddleSystem = server.ResolveDependency().GetEntitySystem(); @@ -106,6 +106,6 @@ await server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs index 780a5f1933..6c116bce2b 100644 --- a/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs +++ b/Content.IntegrationTests/Tests/Fluids/PuddleTest.cs @@ -16,10 +16,10 @@ public sealed class PuddleTest [Test] public async Task TilePuddleTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var entitySystemManager = server.ResolveDependency(); var spillSystem = entitySystemManager.GetEntitySystem(); @@ -34,18 +34,18 @@ await server.WaitAssertion(() => Assert.That(spillSystem.TrySpillAt(coordinates, solution, out _), Is.True); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task SpaceNoPuddleTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var entitySystemManager = server.ResolveDependency(); var spillSystem = entitySystemManager.GetEntitySystem(); @@ -63,7 +63,7 @@ await server.WaitPost(() => } }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await server.WaitAssertion(() => { @@ -73,7 +73,7 @@ await server.WaitAssertion(() => Assert.That(spillSystem.TrySpillAt(coordinates, solution, out _), Is.False); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/FollowerSystemTest.cs b/Content.IntegrationTests/Tests/FollowerSystemTest.cs index b80975de92..ddd5c7a3f0 100644 --- a/Content.IntegrationTests/Tests/FollowerSystemTest.cs +++ b/Content.IntegrationTests/Tests/FollowerSystemTest.cs @@ -14,8 +14,8 @@ public sealed class FollowerSystemTest [Test] public async Task FollowerMapDeleteTest() { - 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(); var mapMan = server.ResolveDependency(); @@ -42,6 +42,6 @@ await server.WaitPost(() => entMan.DeleteEntity(mapMan.GetMapEntityId(map)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs index dfda53a9f5..55daeed430 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs @@ -37,8 +37,8 @@ public sealed class HandCuffTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; EntityUid human; EntityUid otherHuman; @@ -98,7 +98,7 @@ await server.WaitAssertion(() => Assert.That(cuffed.CuffedHandCount, Is.EqualTo(4), "Player doesn't have correct amount of hands cuffed"); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } private static void AddHand(EntityUid to, IServerConsoleHost host) diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs index fb53787768..5c73245501 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs @@ -16,9 +16,9 @@ public sealed class EntityPrototypeComponentsTest [Test] public async Task PrototypesHaveKnownComponents() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + var client = pair.Client; var sResourceManager = server.ResolveDependency(); var prototypePath = new ResPath("/Prototypes/"); @@ -93,7 +93,7 @@ public async Task PrototypesHaveKnownComponents() if (unknownComponentsClient.Count + unknownComponentsServer.Count == 0) { - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); Assert.Pass($"Validated {entitiesValidated} entities with {componentsValidated} components in {paths.Length} files."); return; } @@ -118,9 +118,9 @@ public async Task PrototypesHaveKnownComponents() [Test] public async Task IgnoredComponentsExistInTheCorrectPlaces() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + var client = pair.Client; var serverComponents = server.ResolveDependency(); var ignoredServerNames = Server.Entry.IgnoredComponents.List; var clientComponents = client.ResolveDependency(); @@ -138,7 +138,7 @@ public async Task IgnoredComponentsExistInTheCorrectPlaces() } } Assert.That(failureMessages, Is.Empty); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs index 295800171d..c0703508eb 100644 --- a/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs +++ b/Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs @@ -16,13 +16,13 @@ public sealed class AlertsComponentTests [Test] public async Task AlertsTest() { - 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 client = pairTracker.Pair.Client; + var server = pair.Server; + var client = pair.Client; var clientPlayerMgr = client.ResolveDependency(); var clientUIMgr = client.ResolveDependency(); @@ -52,7 +52,7 @@ await server.WaitAssertion(() => Assert.That(alerts, Has.Count.EqualTo(alertCount + 2)); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); AlertsUI clientAlertsUI = default; await client.WaitAssertion(() => @@ -98,7 +98,7 @@ await server.WaitAssertion(() => alertsSystem.ClearAlert(playerUid, AlertType.Debug1); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await client.WaitAssertion(() => { @@ -110,7 +110,7 @@ await client.WaitAssertion(() => Assert.That(alertIDs, Is.SupersetOf(expectedIDs)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs index 80d3bbe75d..904a4edc78 100644 --- a/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/RuleMaxTimeRestartTest.cs @@ -16,8 +16,8 @@ public sealed class RuleMaxTimeRestartTest [Test] public async Task RestartTest() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); + var server = pair.Server; var entityManager = server.ResolveDependency(); var sGameTicker = server.ResolveDependency().GetEntitySystem(); @@ -39,7 +39,7 @@ await server.WaitAssertion(() => }); var ticks = sGameTiming.TickRate * (int) Math.Ceiling(maxTime.RoundMaxTime.TotalSeconds * 1.1f); - await PoolManager.RunTicksSync(pairTracker.Pair, ticks); + await PoolManager.RunTicksSync(pair, ticks); await server.WaitAssertion(() => { @@ -47,14 +47,14 @@ await server.WaitAssertion(() => }); ticks = sGameTiming.TickRate * (int) Math.Ceiling(maxTime.RoundEndDelay.TotalSeconds * 1.1f); - await PoolManager.RunTicksSync(pairTracker.Pair, ticks); + await PoolManager.RunTicksSync(pair, ticks); await server.WaitAssertion(() => { Assert.That(sGameTicker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs b/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs index bff4472b92..941337f7ed 100644 --- a/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/SecretStartsTest.cs @@ -13,9 +13,9 @@ public sealed class SecretStartsTest [Test] public async Task TestSecretStarts() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Dirty = true }); + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true }); - var server = pairTracker.Pair.Server; + var server = pair.Server; await server.WaitIdleAsync(); var gameTicker = server.ResolveDependency().GetEntitySystem(); @@ -38,6 +38,6 @@ await server.WaitAssertion(() => gameTicker.ClearGameRules(); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs index 32113d429f..bda931397b 100644 --- a/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs @@ -15,12 +15,12 @@ public sealed class StartEndGameRulesTest [Test] public async Task TestAllConcurrent() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Dirty = true, DummyTicker = false }); - var server = pairTracker.Pair.Server; + var server = pair.Server; await server.WaitIdleAsync(); var gameTicker = server.ResolveDependency().GetEntitySystem(); var cfg = server.ResolveDependency(); @@ -48,6 +48,6 @@ await server.WaitAssertion(() => Assert.That(!gameTicker.GetAddedGameRules().Any()); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs index b552cc872c..a18f3475fe 100644 --- a/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs +++ b/Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs @@ -33,15 +33,15 @@ public sealed class WeightlessStatusTests [Test] public async Task WeightlessStatusTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entityManager = server.ResolveDependency(); var alertsSystem = server.ResolveDependency().GetEntitySystem(); EntityUid human = default; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); await server.WaitAssertion(() => { @@ -51,7 +51,7 @@ await server.WaitAssertion(() => }); // Let WeightlessSystem and GravitySystem tick - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); var generatorUid = EntityUid.Invalid; await server.WaitAssertion(() => { @@ -62,7 +62,7 @@ await server.WaitAssertion(() => }); // Let WeightlessSystem and GravitySystem tick - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); await server.WaitAssertion(() => { @@ -72,16 +72,16 @@ await server.WaitAssertion(() => entityManager.DeleteEntity(generatorUid); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); await server.WaitAssertion(() => { Assert.That(alertsSystem.IsShowingAlert(human, AlertType.Weightless)); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/GravityGridTest.cs b/Content.IntegrationTests/Tests/GravityGridTest.cs index e9d0498ecc..130683f2c5 100644 --- a/Content.IntegrationTests/Tests/GravityGridTest.cs +++ b/Content.IntegrationTests/Tests/GravityGridTest.cs @@ -30,10 +30,10 @@ public sealed class GravityGridTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); EntityUid generator = default; var entityMan = server.ResolveDependency(); @@ -96,7 +96,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Guidebook/DocumentParsingTest.cs b/Content.IntegrationTests/Tests/Guidebook/DocumentParsingTest.cs index edc19b531e..dec2c40c0a 100644 --- a/Content.IntegrationTests/Tests/Guidebook/DocumentParsingTest.cs +++ b/Content.IntegrationTests/Tests/Guidebook/DocumentParsingTest.cs @@ -45,8 +45,8 @@ some text with a nested control [Test] public async Task ParseTestDocument() { - await using var pairTracker = await PoolManager.GetServerClient(); - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(); + var client = pair.Client; await client.WaitIdleAsync(); var parser = client.ResolveDependency(); @@ -134,7 +134,7 @@ await client.WaitPost(() => subTest2.Params.TryGetValue("k", out val); Assert.That(val, Is.EqualTo(@"<>\>=""=<-_?*3.0//")); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } public sealed class TestControl : Control, IDocumentTag diff --git a/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs b/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs index eba4172a82..7d686dffe6 100644 --- a/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs +++ b/Content.IntegrationTests/Tests/Guidebook/GuideEntryPrototypeTests.cs @@ -15,8 +15,8 @@ public sealed class GuideEntryPrototypeTests [Test] public async Task ValidatePrototypeContents() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var client = pair.Client; await client.WaitIdleAsync(); var protoMan = client.ResolveDependency(); var resMan = client.ResolveDependency(); @@ -35,6 +35,6 @@ await client.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Hands/HandTests.cs b/Content.IntegrationTests/Tests/Hands/HandTests.cs index 1f5a939bdb..d4026513da 100644 --- a/Content.IntegrationTests/Tests/Hands/HandTests.cs +++ b/Content.IntegrationTests/Tests/Hands/HandTests.cs @@ -13,20 +13,20 @@ public sealed class HandTests [Test] public async Task TestPickupDrop() { - 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(); var playerMan = server.ResolveDependency(); var mapMan = server.ResolveDependency(); var sys = entMan.System(); - var data = await PoolManager.CreateTestMap(pairTracker); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + var data = await PoolManager.CreateTestMap(pair); + await PoolManager.RunTicksSync(pair, 5); EntityUid item = default; EntityUid player = default; @@ -41,7 +41,7 @@ await server.WaitPost(() => }); // run ticks here is important, as errors may happen within the container system's frame update methods. - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); Assert.That(hands.ActiveHandEntity, Is.EqualTo(item)); await server.WaitPost(() => @@ -49,10 +49,10 @@ await server.WaitPost(() => sys.TryDrop(player, item, null!); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); Assert.That(hands.ActiveHandEntity, Is.Null); await server.WaitPost(() => mapMan.DeleteMap(data.MapId)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs index f99d1e656f..6c27301f63 100644 --- a/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs +++ b/Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs @@ -56,9 +56,9 @@ public sealed class HumanInventoryUniformSlotsTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; + var testMap = await PoolManager.CreateTestMap(pair); var coordinates = testMap.GridCoords; EntityUid human = default; @@ -132,7 +132,7 @@ await server.WaitAssertion(() => mapMan.DeleteMap(testMap.MapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } private static bool IsDescendant(EntityUid descendant, EntityUid parent, IEntityManager entManager) diff --git a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs index 7e60abdeef..402569981a 100644 --- a/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs +++ b/Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs @@ -39,8 +39,8 @@ public sealed class InteractionSystemTests [Test] public async Task InteractionTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -103,14 +103,14 @@ await server.WaitAssertion(() => }); testInteractionSystem.ClearHandlers(); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task InteractionObstructionTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -174,14 +174,14 @@ await server.WaitAssertion(() => }); testInteractionSystem.ClearHandlers(); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task InteractionInRangeTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -243,15 +243,15 @@ await server.WaitAssertion(() => }); testInteractionSystem.ClearHandlers(); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task InteractionOutOfRangeTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -313,14 +313,14 @@ await server.WaitAssertion(() => }); testInteractionSystem.ClearHandlers(); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task InsideContainerInteractionBlockTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -404,7 +404,7 @@ await server.WaitAssertion(() => }); testInteractionSystem.ClearHandlers(); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Reflect(false)] diff --git a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs index af3552dc3a..b8828763a2 100644 --- a/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs +++ b/Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs @@ -26,8 +26,8 @@ public sealed class InRangeUnobstructed [Test] public async Task EntityEntityTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -107,7 +107,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs index bd5b95e08e..93ba8b6020 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs @@ -66,7 +66,7 @@ protected async Task CraftItem(string prototype, bool shouldSucceed = true) Task? tickTask = null; while (!task.IsCompleted) { - tickTask = PoolManager.RunTicksSync(PairTracker.Pair, 1); + tickTask = PoolManager.RunTicksSync(Pair, 1); await Task.WhenAny(task, tickTask); } @@ -699,7 +699,7 @@ protected async Task Delete(EntityUid uid) protected async Task RunTicks(int ticks) { - await PoolManager.RunTicksSync(PairTracker.Pair, ticks); + await PoolManager.RunTicksSync(Pair, ticks); } protected int SecondsToTicks(float seconds) diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs index f59c7a2cfa..bf8c77e066 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.cs @@ -41,11 +41,11 @@ public abstract partial class InteractionTest { protected virtual string PlayerPrototype => "InteractionTestMob"; - protected TestPair PairTracker = default!; - protected TestMapData MapData => PairTracker.TestMap!; + protected TestPair Pair = default!; + protected TestMapData MapData => Pair.TestMap!; - protected RobustIntegrationTest.ServerIntegrationInstance Server => PairTracker.Server; - protected RobustIntegrationTest.ClientIntegrationInstance Client => PairTracker.Client; + protected RobustIntegrationTest.ServerIntegrationInstance Server => Pair.Server; + protected RobustIntegrationTest.ClientIntegrationInstance Client => Pair.Client; protected MapId MapId => MapData.MapId; @@ -141,7 +141,7 @@ public abstract partial class InteractionTest [SetUp] public virtual async Task Setup() { - PairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + Pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); // server dependencies SEntMan = Server.ResolveDependency(); @@ -173,7 +173,7 @@ public virtual async Task Setup() CLogger = Client.ResolveDependency().RootSawmill; // Setup map. - await PairTracker.CreateTestMap(); + await Pair.CreateTestMap(); PlayerCoords = MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)).WithEntityId(MapData.MapUid, Transform, SEntMan); TargetCoords = MapData.GridCoords.Offset(new Vector2(1.5f, 0.5f)).WithEntityId(MapData.MapUid, Transform, SEntMan); await SetTile(Plating, grid: MapData.MapGrid); @@ -226,7 +226,7 @@ await Server.WaitPost(() => }); // Final player asserts/checks. - await PairTracker.ReallyBeIdle(5); + await Pair.ReallyBeIdle(5); Assert.Multiple(() => { Assert.That(cPlayerMan.LocalPlayer.ControlledEntity, Is.EqualTo(Player)); @@ -238,7 +238,7 @@ await Server.WaitPost(() => public async Task TearDownInternal() { await Server.WaitPost(() => MapMan.DeleteMap(MapId)); - await PairTracker.CleanReturnAsync(); + await Pair.CleanReturnAsync(); await TearDown(); } diff --git a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs index 381dfd288b..4a07177f77 100644 --- a/Content.IntegrationTests/Tests/InventoryHelpersTest.cs +++ b/Content.IntegrationTests/Tests/InventoryHelpersTest.cs @@ -41,8 +41,8 @@ public sealed class InventoryHelpersTest [Test] public async Task SpawnItemInSlotTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntities = server.ResolveDependency(); var systemMan = sEntities.EntitySysManager; @@ -90,7 +90,7 @@ await server.WaitAssertion(() => sEntities.DeleteEntity(human); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs index 50e340c155..6e48ffb119 100644 --- a/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/CharacterCreationTest.cs @@ -15,9 +15,9 @@ public sealed class CharacterCreationTest [Test] public async Task CreateDeleteCreateTest() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { InLobby = true }); + var server = pair.Server; + var client = pair.Client; var clientNetManager = client.ResolveDependency(); var clientStateManager = client.ResolveDependency(); @@ -27,7 +27,7 @@ public async Task CreateDeleteCreateTest() // Need to run them in sync to receive the messages. - await PoolManager.RunTicksSync(pairTracker.Pair, 1); + await PoolManager.RunTicksSync(pair, 1); await PoolManager.WaitUntil(client, () => clientStateManager.CurrentState is LobbyState, 600); @@ -109,7 +109,7 @@ await server.WaitAssertion(() => Assert.That(serverCharacters, Has.Count.EqualTo(2)); Assert.That(serverCharacters[1].MemberwiseEquals(profile)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs b/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs index b9ad58abb9..482cd13f50 100644 --- a/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs +++ b/Content.IntegrationTests/Tests/Lobby/ServerReloginTest.cs @@ -10,13 +10,13 @@ public sealed class ServerReloginTest [Test] public async Task Relogin() { - 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 client = pairTracker.Pair.Client; + var server = pair.Server; + var client = pair.Client; var originalMaxPlayers = 0; string username = null; @@ -39,7 +39,7 @@ await client.WaitAssertion(() => clientNetManager.ClientDisconnect("For testing"); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 20); + await PoolManager.RunTicksSync(pair, 20); await server.WaitAssertion(() => { @@ -51,7 +51,7 @@ await client.WaitPost(() => clientNetManager.ClientConnect(null!, 0, username); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 20); + await PoolManager.RunTicksSync(pair, 20); await server.WaitAssertion(() => { @@ -63,6 +63,6 @@ await server.WaitAssertion(() => serverConfig.SetCVar(CCVars.SoftMaxPlayers, originalMaxPlayers); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/LogErrorTest.cs b/Content.IntegrationTests/Tests/LogErrorTest.cs index b41f4c292d..b8d8dba7ce 100644 --- a/Content.IntegrationTests/Tests/LogErrorTest.cs +++ b/Content.IntegrationTests/Tests/LogErrorTest.cs @@ -12,9 +12,9 @@ public sealed class LogErrorTest [Test] public async Task TestLogErrorCausesTestFailure() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var server = pair.Server; + var client = pair.Client; var cfg = server.ResolveDependency(); var logmill = server.ResolveDependency().RootSawmill; @@ -29,6 +29,6 @@ public async Task TestLogErrorCausesTestFailure() await server.WaitPost(() => Assert.Throws(() => logmill.Error("test"))); await client.WaitPost(() => Assert.Throws(() => logmill.Error("test"))); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/MachineBoardTest.cs b/Content.IntegrationTests/Tests/MachineBoardTest.cs index e18852a06c..bd3a72f4c1 100644 --- a/Content.IntegrationTests/Tests/MachineBoardTest.cs +++ b/Content.IntegrationTests/Tests/MachineBoardTest.cs @@ -31,8 +31,8 @@ public sealed class MachineBoardTest [Test] public async Task TestMachineBoardHasValidMachine() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); @@ -40,7 +40,7 @@ await server.WaitAssertion(() => { foreach (var p in protoMan.EnumeratePrototypes() .Where(p => !p.Abstract) - .Where(p => !pairTracker.Pair.IsTestPrototype(p)) + .Where(p => !pair.IsTestPrototype(p)) .Where(p => !_ignoredPrototypes.Contains(p.ID))) { if (!p.TryGetComponent(out var mbc)) @@ -60,7 +60,7 @@ await server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -70,8 +70,8 @@ await server.WaitAssertion(() => [Test] public async Task TestComputerBoardHasValidComputer() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); @@ -79,7 +79,7 @@ await server.WaitAssertion(() => { foreach (var p in protoMan.EnumeratePrototypes() .Where(p => !p.Abstract) - .Where(p => !pairTracker.Pair.IsTestPrototype(p)) + .Where(p => !pair.IsTestPrototype(p)) .Where(p => !_ignoredPrototypes.Contains(p.ID))) { if (!p.TryGetComponent(out var cbc)) @@ -99,6 +99,6 @@ await server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs index e2c7964d84..84cd09d04b 100644 --- a/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs +++ b/Content.IntegrationTests/Tests/MaterialArbitrageTest.cs @@ -30,10 +30,10 @@ public sealed class MaterialArbitrageTest [Test] public async Task NoMaterialArbitrage() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); await server.WaitIdleAsync(); var entManager = server.ResolveDependency(); @@ -65,7 +65,7 @@ public async Task NoMaterialArbitrage() Dictionary constructionRecipes = new(); foreach (var proto in protoManager.EnumeratePrototypes()) { - if (proto.NoSpawn || proto.Abstract || pairTracker.Pair.IsTestPrototype(proto)) + if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto)) continue; if (!proto.Components.TryGetValue(constructionName, out var destructible)) @@ -125,7 +125,7 @@ public async Task NoMaterialArbitrage() // Here we get the set of entities/materials spawned when destroying an entity. foreach (var proto in protoManager.EnumeratePrototypes()) { - if (proto.NoSpawn || proto.Abstract || pairTracker.Pair.IsTestPrototype(proto)) + if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto)) continue; if (!proto.Components.TryGetValue(destructibleName, out var destructible)) @@ -290,7 +290,7 @@ public async Task NoMaterialArbitrage() Dictionary physicalCompositions = new(); foreach (var proto in protoManager.EnumeratePrototypes()) { - if (proto.NoSpawn || proto.Abstract || pairTracker.Pair.IsTestPrototype(proto)) + if (proto.NoSpawn || proto.Abstract || pair.IsTestPrototype(proto)) continue; if (!proto.Components.TryGetValue(compositionName, out var composition)) @@ -338,7 +338,7 @@ public async Task NoMaterialArbitrage() }); await server.WaitPost(() => mapManager.DeleteMap(testMap.MapId)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); async Task GetSpawnedPrice(Dictionary ents) { diff --git a/Content.IntegrationTests/Tests/Materials/MaterialTests.cs b/Content.IntegrationTests/Tests/Materials/MaterialTests.cs index e45cf5dde7..2231064fa4 100644 --- a/Content.IntegrationTests/Tests/Materials/MaterialTests.cs +++ b/Content.IntegrationTests/Tests/Materials/MaterialTests.cs @@ -20,15 +20,15 @@ public sealed class MaterialPrototypeSpawnsStackMaterialTest [Test] public async Task MaterialPrototypeSpawnsStackMaterial() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var mapManager = server.ResolveDependency(); var prototypeManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); await server.WaitAssertion(() => { @@ -62,7 +62,7 @@ await server.WaitAssertion(() => mapManager.DeleteMap(testMap.MapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs index 7fb56ba1aa..9b507eda1f 100644 --- a/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs +++ b/Content.IntegrationTests/Tests/Minds/GhostRoleTests.cs @@ -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(); var sPlayerMan = server.ResolveDependency(); @@ -55,14 +55,14 @@ await server.WaitPost(() => }); // 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(ghost)); Assert.That(ghost, Is.Not.EqualTo(originalMob)); @@ -82,7 +82,7 @@ await server.WaitPost(() => }); // 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 @@ await server.WaitPost(() => // Ghost again. conHost.ExecuteCommand("ghost"); - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); var otherGhost = session.AttachedEntity; Assert.That(entMan.HasComponent(otherGhost)); Assert.That(otherGhost, Is.Not.EqualTo(originalMob)); @@ -107,7 +107,7 @@ await server.WaitPost(() => // 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 @@ await server.WaitPost(() => Assert.Null(newMind.VisitingEntity); Assert.That(entMan.Deleted(otherGhost)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs index 0bace9fc5c..0bcea36f4e 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.EntityDeletion.cs @@ -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(); var playerMan = server.ResolveDependency(); @@ -50,9 +50,9 @@ await server.WaitAssertion(() => }); }); - 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 @@ await server.WaitAssertion(() => // 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(); @@ -94,9 +94,9 @@ await server.WaitAssertion(() => 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 @@ await server.WaitAssertion(() => #pragma warning restore NUnit2045 }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -118,8 +118,8 @@ await server.WaitAssertion(() => 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(); var playerMan = server.ResolveDependency(); @@ -130,11 +130,11 @@ public async Task TestGhostOnDelete() // 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(player.AttachedEntity), "Player did not become a ghost"); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -150,13 +150,13 @@ public async Task TestGhostOnDelete() 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(); var playerMan = server.ResolveDependency(); var mindSystem = entMan.EntitySysManager.GetEntitySystem(); - var mind = GetMind(pairTracker.Pair); + var mind = GetMind(pair); var player = playerMan.ServerSessions.Single(); #pragma warning disable NUnit2045 // Interdependent assertions. @@ -180,13 +180,13 @@ await server.WaitAssertion(() => 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 @@ await server.WaitAssertion(() => Assert.That(mind.OwnedEntity, Is.EqualTo(ghost)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -208,22 +208,22 @@ await server.WaitAssertion(() => [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(); var playerMan = server.ResolveDependency(); var serverConsole = server.ResolveDependency(); 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(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 async Task TestGhostToAghost() Assert.That(mind, Is.Not.Null); Assert.That(mind.VisitingEntity, Is.Null); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -250,8 +250,8 @@ public async Task TestGhostToAghost() 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(); var playerMan = server.ResolveDependency(); @@ -267,7 +267,7 @@ await server.WaitAssertion(() => entMan.DeleteEntity(player.AttachedEntity!.Value); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await server.WaitAssertion(() => { @@ -277,14 +277,14 @@ await server.WaitAssertion(() => Assert.That(entMan.HasComponent(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 @@ await server.WaitAssertion(() => #pragma warning restore NUnit2045 }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs index d984b31b0e..5e6a43e622 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.Helpers.cs @@ -26,13 +26,12 @@ public sealed partial class MindTests /// private static async Task 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(); var playerMan = pair.Server.ResolveDependency(); @@ -59,7 +58,7 @@ await pair.Server.WaitPost(() => 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 BecomeGhost(TestPair pair, bool visit = false) diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs index 49158e06e3..fda683d33e 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.ReconnectTests.cs @@ -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(); var mind = GetMind(pair); @@ -34,7 +33,7 @@ public async Task TestGhostsCanReconnect() Assert.That(mind.VisitingEntity, Is.Null); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // This test will do the following: @@ -45,8 +44,7 @@ public async Task TestGhostsCanReconnect() [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(); var mind = GetMind(pair); @@ -85,7 +83,7 @@ public async Task TestDeletedCanReconnect() Assert.That(entMan.HasComponent(mind.OwnedEntity)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // This test will do the following: @@ -96,8 +94,7 @@ public async Task TestDeletedCanReconnect() [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(); var mind = GetMind(pair); @@ -114,7 +111,7 @@ public async Task TestVisitingGhostReconnect() Assert.That(entMan.Deleted(ghost)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // This test will do the following: @@ -125,8 +122,7 @@ public async Task TestVisitingGhostReconnect() [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(); var mindSys = entMan.System(); var mind = GetMind(pair); @@ -152,6 +148,6 @@ await pair.Server.WaitAssertion(() => Assert.That(mind.CurrentEntity, Is.EqualTo(visiting)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Minds/MindTests.cs b/Content.IntegrationTests/Tests/Minds/MindTests.cs index 4899f22366..94f1739672 100644 --- a/Content.IntegrationTests/Tests/Minds/MindTests.cs +++ b/Content.IntegrationTests/Tests/Minds/MindTests.cs @@ -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(); @@ -74,14 +74,14 @@ await server.WaitAssertion(() => 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(); @@ -105,14 +105,14 @@ await server.WaitAssertion(() => }); }); - 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(); var protoMan = server.ResolveDependency(); @@ -138,7 +138,7 @@ await server.WaitAssertion(() => }); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await server.WaitAssertion(() => { @@ -152,21 +152,21 @@ await server.WaitAssertion(() => 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(); @@ -193,24 +193,24 @@ await server.WaitAssertion(() => }); }); - 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(); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); var mindSystem = entMan.EntitySysManager.GetEntitySystem(); - var originalMind = GetMind(pairTracker.Pair); + var originalMind = GetMind(pair); var userId = originalMind.UserId; Mind mind = default!; @@ -229,7 +229,7 @@ await server.WaitAssertion(() => }); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await server.WaitAssertion(() => { @@ -248,16 +248,16 @@ await server.WaitAssertion(() => }); }); - 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(); @@ -318,15 +318,15 @@ await server.WaitAssertion(() => }); }); - 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(); var playerMan = server.ResolveDependency(); @@ -351,14 +351,14 @@ await server.WaitAssertion(() => 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 @@ await server.WaitAssertion(() => mindSystem.TransferTo(mobMind, mob); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await server.WaitAssertion(() => { @@ -389,7 +389,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } // TODO Implement @@ -401,13 +401,13 @@ public async Task TestPlayerCanReturnFromGhostWhenDead() [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(); var playerMan = server.ResolveDependency(); @@ -441,14 +441,14 @@ await server.WaitAssertion(() => 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 @@ await server.WaitAssertion(() => entMan.EntitySysManager.GetEntitySystem().Takeover(player, id); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 20); + await PoolManager.RunTicksSync(pair, 20); await server.WaitAssertion(() => { @@ -468,7 +468,7 @@ await server.WaitAssertion(() => ghost = player.AttachedEntity!.Value; }); - await PoolManager.RunTicksSync(pairTracker.Pair, 20); + await PoolManager.RunTicksSync(pair, 20); await server.WaitAssertion(() => { @@ -476,6 +476,6 @@ await server.WaitAssertion(() => Assert.That(player.AttachedEntity!.Value, Is.EqualTo(ghost)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/NPC/NPCTest.cs b/Content.IntegrationTests/Tests/NPC/NPCTest.cs index efaacfd8d9..83321fe613 100644 --- a/Content.IntegrationTests/Tests/NPC/NPCTest.cs +++ b/Content.IntegrationTests/Tests/NPC/NPCTest.cs @@ -13,7 +13,7 @@ public sealed class NPCTest public async Task CompoundRecursion() { var pool = await PoolManager.GetServerClient(); - var server = pool.Pair.Server; + var server = pool.Server; await server.WaitIdleAsync(); diff --git a/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs b/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs index f4351e1a5a..c72be944fd 100644 --- a/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs +++ b/Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs @@ -8,9 +8,9 @@ public sealed class NetworkIdsMatchTest [Test] public async Task TestConnect() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var server = pair.Server; + var client = pair.Client; var clientCompFactory = client.ResolveDependency(); var serverCompFactory = server.ResolveDependency(); @@ -38,7 +38,7 @@ public async Task TestConnect() Assert.That(clientNetComps[netId].Name, Is.EqualTo(serverNetComps[netId].Name)); } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs index 9accbbb417..ff31c7d732 100644 --- a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs +++ b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs @@ -9,9 +9,9 @@ public sealed class ReconnectTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var server = pair.Server; + var client = pair.Client; var host = client.ResolveDependency(); var netManager = client.ResolveDependency(); @@ -19,7 +19,7 @@ public async Task Test() await client.WaitPost(() => host.ExecuteCommand("disconnect")); // Run some ticks for the disconnect to complete and such. - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); @@ -29,10 +29,10 @@ public async Task Test() await client.WaitPost(() => netManager.ClientConnect(null, 0, null)); // Run some ticks for the handshake to complete and such. - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs index 2751e46026..e6ddd1a90c 100644 --- a/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs +++ b/Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs @@ -31,9 +31,9 @@ public sealed class SimplePredictReconcileTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true }); + var server = pair.Server; + var client = pair.Client; var sMapManager = server.ResolveDependency(); var sEntityManager = server.ResolveDependency(); @@ -60,8 +60,8 @@ await server.WaitPost(() => }); // Run some ticks and ensure that the buffer has filled up. - await pairTracker.SyncTicks(); - await pairTracker.RunTicksSync(25); + await pair.SyncTicks(); + await pair.RunTicksSync(25); Assert.That(cGameTiming.TickTimingAdjustment, Is.EqualTo(0)); Assert.That(sGameTiming.TickTimingAdjustment, Is.EqualTo(0)); @@ -384,7 +384,7 @@ await client.WaitPost(() => } cfg.SetCVar(CVars.NetLogging, log); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } public sealed class PredictionTestEntitySystem : EntitySystem diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index fd525c073d..455426824f 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -69,8 +69,8 @@ public sealed class PostMapInitTest [Test, TestCaseSource(nameof(Grids))] public async Task GridsLoadableTest(string mapFile) { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entManager = server.ResolveDependency(); var mapLoader = entManager.System(); @@ -104,14 +104,14 @@ await server.WaitPost(() => }); await server.WaitRunTicks(1); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task NoSavedPostMapInitTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var resourceManager = server.ResolveDependency(); var mapFolder = new ResPath("/Maps"); @@ -146,14 +146,14 @@ public async Task NoSavedPostMapInitTest() Assert.That(postMapInit, Is.False, $"Map {map.Filename} was saved postmapinit"); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test, TestCaseSource(nameof(GameMaps))] public async Task GameMapsLoadableTest(string mapProto) { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entManager = server.ResolveDependency(); @@ -278,18 +278,18 @@ await server.WaitPost(() => }); await server.WaitRunTicks(1); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task AllMapsTested() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); var gameMaps = protoMan.EnumeratePrototypes() - .Where(x => !pairTracker.Pair.IsTestPrototype(x)) + .Where(x => !pair.IsTestPrototype(x)) .Select(x => x.ID) .ToHashSet(); @@ -297,14 +297,14 @@ public async Task AllMapsTested() CollectionAssert.AreEquivalent(GameMaps.ToHashSet(), gameMaps, "Game map prototype missing from test cases."); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task NonGameMapsLoadableTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapLoader = server.ResolveDependency().GetEntitySystem(); var mapManager = server.ResolveDependency(); @@ -364,7 +364,7 @@ await server.WaitPost(() => }); await server.WaitRunTicks(1); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Power/PowerTest.cs b/Content.IntegrationTests/Tests/Power/PowerTest.cs index 40d8ae898c..d4e2cde9b0 100644 --- a/Content.IntegrationTests/Tests/Power/PowerTest.cs +++ b/Content.IntegrationTests/Tests/Power/PowerTest.cs @@ -162,8 +162,8 @@ public sealed class PowerTest [Test] public async Task TestSimpleSurplus() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); const float loadPower = 200; @@ -213,7 +213,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } @@ -223,8 +223,8 @@ await server.WaitAssertion(() => [Test] public async Task TestSimpleDeficit() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); const float loadPower = 200; @@ -274,14 +274,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestSupplyRamp() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); @@ -361,14 +361,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestBatteryRamp() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); @@ -460,7 +460,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] @@ -468,8 +468,8 @@ public async Task TestNoDemandRampdown() { // checks that batteries and supplies properly ramp down if the load is disconnected/disabled. - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -558,14 +558,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestSimpleBatteryChargeDeficit() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); var entityManager = server.ResolveDependency(); @@ -614,14 +614,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestFullBattery() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); @@ -691,14 +691,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestFullBatteryEfficiencyPassThrough() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); @@ -768,14 +768,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestFullBatteryEfficiencyDemandPassThrough() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -860,7 +860,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -870,8 +870,8 @@ await server.WaitAssertion(() => [Test] public async Task TestSupplyPrioritized() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var gameTiming = server.ResolveDependency(); @@ -959,7 +959,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -968,8 +968,8 @@ await server.WaitAssertion(() => [Test] public async Task TestBatteriesProportional() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -1049,14 +1049,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestBatteryEngineCut() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -1130,7 +1130,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -1139,8 +1139,8 @@ await server.WaitAssertion(() => [Test] public async Task TestTerminalNodeGroups() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var nodeContainer = entityManager.System(); @@ -1198,14 +1198,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task ApcChargingTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -1253,14 +1253,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task ApcNetTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityManager = server.ResolveDependency(); var batterySys = entityManager.System(); @@ -1317,7 +1317,7 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/Procedural/DungeonTests.cs b/Content.IntegrationTests/Tests/Procedural/DungeonTests.cs index 4300eb52e1..6bede9660a 100644 --- a/Content.IntegrationTests/Tests/Procedural/DungeonTests.cs +++ b/Content.IntegrationTests/Tests/Procedural/DungeonTests.cs @@ -12,10 +12,10 @@ public sealed class DungeonTests [Test] public async Task TestDungeonRoomPackBounds() { - await using var pairTracker = await PoolManager.GetServerClient(); - var protoManager = pairTracker.Pair.Server.ResolveDependency(); + await using var pair = await PoolManager.GetServerClient(); + var protoManager = pair.Server.ResolveDependency(); - await pairTracker.Pair.Server.WaitAssertion(() => + await pair.Server.WaitAssertion(() => { var sizes = new HashSet(); @@ -56,16 +56,16 @@ await pairTracker.Pair.Server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestDungeonPresets() { - await using var pairTracker = await PoolManager.GetServerClient(); - var protoManager = pairTracker.Pair.Server.ResolveDependency(); + await using var pair = await PoolManager.GetServerClient(); + var protoManager = pair.Server.ResolveDependency(); - await pairTracker.Pair.Server.WaitAssertion(() => + await pair.Server.WaitAssertion(() => { var sizes = new HashSet(); @@ -93,6 +93,6 @@ await pairTracker.Pair.Server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs index 6823b2d58a..6096c497ef 100644 --- a/Content.IntegrationTests/Tests/PrototypeSaveTest.cs +++ b/Content.IntegrationTests/Tests/PrototypeSaveTest.cs @@ -32,8 +32,8 @@ public sealed class PrototypeSaveTest [Test] public async Task UninitializedSaveTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var entityMan = server.ResolveDependency(); @@ -72,7 +72,7 @@ await server.WaitPost(() => if (prototype.Abstract) continue; - if (pairTracker.Pair.IsTestPrototype(prototype)) + if (pair.IsTestPrototype(prototype)) continue; // Yea this test just doesn't work with this, it parents a grid to another grid and causes game logic to explode. @@ -172,7 +172,7 @@ await server.WaitAssertion(() => } }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } public sealed class TestEntityUidContext : ISerializationContext, diff --git a/Content.IntegrationTests/Tests/PrototypeTests/PrototypeTests.cs b/Content.IntegrationTests/Tests/PrototypeTests/PrototypeTests.cs index 8b7c73380e..440d9e636e 100644 --- a/Content.IntegrationTests/Tests/PrototypeTests/PrototypeTests.cs +++ b/Content.IntegrationTests/Tests/PrototypeTests/PrototypeTests.cs @@ -17,10 +17,10 @@ public sealed class PrototypeTests [Test] public async Task TestAllServerPrototypesAreSerializable() { - await using var pairTracker = await PoolManager.GetServerClient(); + await using var pair = await PoolManager.GetServerClient(); var context = new PrototypeSaveTest.TestEntityUidContext(); - await SaveThenValidatePrototype(pairTracker.Pair.Server, "server", context); - await pairTracker.CleanReturnAsync(); + await SaveThenValidatePrototype(pair.Server, "server", context); + await pair.CleanReturnAsync(); } /// @@ -30,10 +30,10 @@ public async Task TestAllServerPrototypesAreSerializable() [Test] public async Task TestAllClientPrototypesAreSerializable() { - await using var pairTracker = await PoolManager.GetServerClient(); + await using var pair = await PoolManager.GetServerClient(); var context = new PrototypeSaveTest.TestEntityUidContext(); - await SaveThenValidatePrototype(pairTracker.Pair.Client, "client", context); - await pairTracker.CleanReturnAsync(); + await SaveThenValidatePrototype(pair.Client, "client", context); + await pair.CleanReturnAsync(); } public async Task SaveThenValidatePrototype(RobustIntegrationTest.IntegrationInstance instance, string instanceId, @@ -69,10 +69,10 @@ public async Task SaveThenValidatePrototype(RobustIntegrationTest.IntegrationIns [Test] public async Task ServerPrototypeSaveLoadSaveTest() { - await using var pairTracker = await PoolManager.GetServerClient(); + await using var pair = await PoolManager.GetServerClient(); var context = new PrototypeSaveTest.TestEntityUidContext(); - await SaveLoadSavePrototype(pairTracker.Pair.Server, context); - await pairTracker.CleanReturnAsync(); + await SaveLoadSavePrototype(pair.Server, context); + await pair.CleanReturnAsync(); } /// @@ -81,10 +81,10 @@ public async Task ServerPrototypeSaveLoadSaveTest() [Test] public async Task ClientPrototypeSaveLoadSaveTest() { - await using var pairTracker = await PoolManager.GetServerClient(); + await using var pair = await PoolManager.GetServerClient(); var context = new PrototypeSaveTest.TestEntityUidContext(); - await SaveLoadSavePrototype(pairTracker.Pair.Client, context); - await pairTracker.CleanReturnAsync(); + await SaveLoadSavePrototype(pair.Client, context); + await pair.CleanReturnAsync(); } private async Task SaveLoadSavePrototype( diff --git a/Content.IntegrationTests/Tests/ResearchTest.cs b/Content.IntegrationTests/Tests/ResearchTest.cs index 179d751f18..ee319daa43 100644 --- a/Content.IntegrationTests/Tests/ResearchTest.cs +++ b/Content.IntegrationTests/Tests/ResearchTest.cs @@ -12,8 +12,8 @@ public sealed class ResearchTest [Test] public async Task DisciplineValidTierPrerequesitesTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoManager = server.ResolveDependency(); @@ -42,14 +42,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task AllTechPrintableTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoManager = server.ResolveDependency(); @@ -62,7 +62,7 @@ await server.WaitAssertion(() => if (proto.Abstract) continue; - if (pairTracker.Pair.IsTestPrototype(proto)) + if (pair.IsTestPrototype(proto)) continue; if (!proto.TryGetComponent(out var lathe)) @@ -94,6 +94,6 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs index f300410a58..98fb84210f 100644 --- a/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs +++ b/Content.IntegrationTests/Tests/ResettingEntitySystemTests.cs @@ -30,12 +30,12 @@ public void Reset(RoundRestartCleanupEvent ev) [Test] public async Task ResettingEntitySystemResetTest() { - 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 server = pair.Server; var entitySystemManager = server.ResolveDependency(); var gameTicker = entitySystemManager.GetEntitySystem(); @@ -54,7 +54,7 @@ await server.WaitAssertion(() => Assert.That(system.HasBeenReset); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/RestartRoundTest.cs b/Content.IntegrationTests/Tests/RestartRoundTest.cs index 8358a4a95e..b05a6f9da3 100644 --- a/Content.IntegrationTests/Tests/RestartRoundTest.cs +++ b/Content.IntegrationTests/Tests/RestartRoundTest.cs @@ -10,12 +10,12 @@ public sealed class RestartRoundTest [Test] public async Task Test() { - 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 server = pair.Server; var sysManager = server.ResolveDependency(); await server.WaitPost(() => @@ -23,8 +23,8 @@ await server.WaitPost(() => sysManager.GetEntitySystem().RestartRound(); }); - await PoolManager.RunTicksSync(pairTracker.Pair, 10); - await pairTracker.CleanReturnAsync(); + await PoolManager.RunTicksSync(pair, 10); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/RoundEndTest.cs b/Content.IntegrationTests/Tests/RoundEndTest.cs index 0a6bf20153..3badf783ec 100644 --- a/Content.IntegrationTests/Tests/RoundEndTest.cs +++ b/Content.IntegrationTests/Tests/RoundEndTest.cs @@ -13,13 +13,13 @@ public sealed class RoundEndTest : IEntityEventSubscriber [Test] public async Task Test() { - 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 server = pair.Server; var entManager = server.ResolveDependency(); var config = server.ResolveDependency(); @@ -120,7 +120,7 @@ async Task WaitForEvent() var currentCount = Thread.VolatileRead(ref eventCount); while (currentCount == Thread.VolatileRead(ref eventCount) && !timeout.IsCompleted) { - await PoolManager.RunTicksSync(pairTracker.Pair, 5); + await PoolManager.RunTicksSync(pair, 5); } if (timeout.IsCompleted) throw new TimeoutException("Event took too long to trigger"); } @@ -137,7 +137,7 @@ await server.WaitAssertion(() => roundEndSystem.DefaultCountdownDuration = TimeSpan.FromMinutes(4); ticker.RestartRound(); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/SalvageTest.cs b/Content.IntegrationTests/Tests/SalvageTest.cs index b16fce89f7..01680e3483 100644 --- a/Content.IntegrationTests/Tests/SalvageTest.cs +++ b/Content.IntegrationTests/Tests/SalvageTest.cs @@ -19,8 +19,8 @@ public sealed class SalvageTest [Test] public async Task AllSalvageMapsLoadableTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entManager = server.ResolveDependency(); var mapLoader = entManager.System(); @@ -58,6 +58,6 @@ await server.WaitPost(() => }); await server.WaitRunTicks(1); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs index 03e5b7e6c7..db2109ca59 100644 --- a/Content.IntegrationTests/Tests/SaveLoadMapTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadMapTest.cs @@ -18,8 +18,8 @@ public async Task SaveLoadMultiGridMap() { const string mapPath = @"/Maps/Test/TestMap.yml"; - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapManager = server.ResolveDependency(); var sEntities = server.ResolveDependency(); var mapLoader = sEntities.System(); @@ -93,7 +93,7 @@ await server.WaitAssertion(() => } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs index 9acd1bfb13..72c6d464e2 100644 --- a/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs +++ b/Content.IntegrationTests/Tests/SaveLoadSaveTest.cs @@ -21,8 +21,8 @@ public sealed class SaveLoadSaveTest [Test] public async Task SaveLoadSave() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var entManager = server.ResolveDependency(); var mapLoader = entManager.System(); var mapManager = server.ResolveDependency(); @@ -86,7 +86,7 @@ await server.WaitPost(() => TestContext.Error.WriteLine(twoTmp); } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } private const string TestMap = "Maps/bagel.yml"; @@ -97,8 +97,8 @@ await server.WaitPost(() => [Test] public async Task LoadSaveTicksSaveBagel() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapLoader = server.ResolveDependency().GetEntitySystem(); var mapManager = server.ResolveDependency(); @@ -163,7 +163,7 @@ await server.WaitPost(() => }); await server.WaitPost(() => mapManager.DeleteMap(mapId)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } /// @@ -179,8 +179,8 @@ await server.WaitPost(() => [Test] public async Task LoadTickLoadBagel() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var mapLoader = server.ResolveDependency().GetEntitySystem(); var mapManager = server.ResolveDependency(); @@ -235,7 +235,7 @@ public async Task LoadTickLoadBagel() Assert.That(yamlA, Is.EqualTo(yamlB)); await server.WaitPost(() => mapManager.DeleteMap(mapId)); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs b/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs index 4d06e4240b..d2e3eb936b 100644 --- a/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs +++ b/Content.IntegrationTests/Tests/Serialization/SerializationTest.cs @@ -17,8 +17,8 @@ public sealed partial class SerializationTest [Test] public async Task SerializeGenericEnums() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var seriMan = server.ResolveDependency(); var refMan = server.ResolveDependency(); @@ -68,7 +68,7 @@ public async Task SerializeGenericEnums() Assert.That(seriMan.ValidateNode(typedNode).GetErrors().Any(), Is.True); Assert.That(seriMan.ValidateNode(typedNode).GetErrors().Any(), Is.False); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } private enum TestEnum : byte { Aa, Bb, Cc, Dd } diff --git a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs index 00d29aaf3f..5f5aa5a153 100644 --- a/Content.IntegrationTests/Tests/Shuttle/DockTest.cs +++ b/Content.IntegrationTests/Tests/Shuttle/DockTest.cs @@ -22,7 +22,7 @@ private static IEnumerable TestSource() public async Task TestDockingConfig(Vector2 dock1Pos, Vector2 dock2Pos, Angle dock1Angle, Angle dock2Angle, bool result) { await using var pair = await PoolManager.GetServerClient(); - var server = pair.Pair.Server; + var server = pair.Server; var map = await PoolManager.CreateTestMap(pair); diff --git a/Content.IntegrationTests/Tests/ShuttleTest.cs b/Content.IntegrationTests/Tests/ShuttleTest.cs index 582efe0c6c..304366adbf 100644 --- a/Content.IntegrationTests/Tests/ShuttleTest.cs +++ b/Content.IntegrationTests/Tests/ShuttleTest.cs @@ -15,8 +15,8 @@ public sealed class ShuttleTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var mapMan = server.ResolveDependency(); @@ -51,7 +51,7 @@ await server.WaitAssertion(() => { Assert.That(entManager.GetComponent(gridEnt).LocalPosition, Is.Not.EqualTo(Vector2.Zero)); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/StackTest.cs b/Content.IntegrationTests/Tests/StackTest.cs index 9eeef87346..a34dd7e53d 100644 --- a/Content.IntegrationTests/Tests/StackTest.cs +++ b/Content.IntegrationTests/Tests/StackTest.cs @@ -11,8 +11,8 @@ public sealed class StackTest [Test] public async Task StackCorrectItemSize() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoManager = server.ResolveDependency(); var compFact = server.ResolveDependency(); @@ -34,6 +34,6 @@ public async Task StackCorrectItemSize() } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/StartTest.cs b/Content.IntegrationTests/Tests/StartTest.cs index 90a1179d24..e2bf5e8ff1 100644 --- a/Content.IntegrationTests/Tests/StartTest.cs +++ b/Content.IntegrationTests/Tests/StartTest.cs @@ -11,8 +11,8 @@ public sealed class StartTest [Test] public async Task TestClientStart() { - await using var pairTracker = await PoolManager.GetServerClient(); - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(); + var client = pair.Client; Assert.That(client.IsAlive); await client.WaitRunTicks(5); Assert.That(client.IsAlive); @@ -21,14 +21,14 @@ public async Task TestClientStart() await client.WaitIdleAsync(); Assert.That(client.IsAlive); - var server = pairTracker.Pair.Server; + var server = pair.Server; Assert.That(server.IsAlive); var sRuntimeLog = server.ResolveDependency(); Assert.That(sRuntimeLog.ExceptionCount, Is.EqualTo(0), "No exceptions must be logged on server."); await server.WaitIdleAsync(); Assert.That(server.IsAlive); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs index 44955b78bc..1748e944e7 100644 --- a/Content.IntegrationTests/Tests/Station/StationJobsTest.cs +++ b/Content.IntegrationTests/Tests/Station/StationJobsTest.cs @@ -74,8 +74,8 @@ public sealed class StationJobsTest [Test] public async Task AssignJobsTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var prototypeManager = server.ResolveDependency(); var fooStationProto = prototypeManager.Index("FooStation"); @@ -142,14 +142,14 @@ await server.WaitAssertion(() => Assert.That(assigned.Values.Select(x => x.Item1).ToList(), Does.Contain("TCaptain")); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task AdjustJobsTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var prototypeManager = server.ResolveDependency(); var mapManager = server.ResolveDependency(); @@ -193,14 +193,14 @@ await server.WaitAssertion(() => Assert.That(stationJobs.IsJobUnlimited(station, "TChaplain"), "Could not make TChaplain unlimited."); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task InvalidRoundstartJobsTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var prototypeManager = server.ResolveDependency(); @@ -232,7 +232,7 @@ await server.WaitAssertion(() => } }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } diff --git a/Content.IntegrationTests/Tests/StorageTest.cs b/Content.IntegrationTests/Tests/StorageTest.cs index 61edd4eaa3..7f8d569d5a 100644 --- a/Content.IntegrationTests/Tests/StorageTest.cs +++ b/Content.IntegrationTests/Tests/StorageTest.cs @@ -20,8 +20,8 @@ public sealed class StorageTest [Test] public async Task StorageSizeArbitrageTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoManager = server.ResolveDependency(); @@ -36,14 +36,14 @@ await server.WaitAssertion(() => Assert.That(storage.StorageCapacityMax, Is.LessThanOrEqualTo(item.Size), $"Found storage arbitrage on {proto.ID}"); } }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestStorageFillPrototypes() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoManager = server.ResolveDependency(); @@ -64,14 +64,14 @@ await server.WaitAssertion(() => } }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestSufficientSpaceForFill() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var protoMan = server.ResolveDependency(); var compFact = server.ResolveDependency(); @@ -143,7 +143,7 @@ int GetFillSize(StorageFillComponent fill, bool isEntStorage) return totalSize + groups.Values.Sum(); } - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Tag/TagTest.cs b/Content.IntegrationTests/Tests/Tag/TagTest.cs index 13da0eb6e5..ed3c484b43 100644 --- a/Content.IntegrationTests/Tests/Tag/TagTest.cs +++ b/Content.IntegrationTests/Tests/Tag/TagTest.cs @@ -44,8 +44,8 @@ public sealed class TagTest [Test] public async Task TagComponentTest() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var sEntityManager = server.ResolveDependency(); var sPrototypeManager = server.ResolveDependency(); @@ -240,7 +240,7 @@ await server.WaitAssertion(() => tagSystem.HasAllTags(sTagComponent, UnregisteredTag); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs b/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs index 6c003eceb1..ca7eeac199 100644 --- a/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs +++ b/Content.IntegrationTests/Tests/Toolshed/ToolshedTest.cs @@ -15,7 +15,7 @@ namespace Content.IntegrationTests.Tests.Toolshed; [FixtureLifeCycle(LifeCycle.InstancePerTestCase)] public abstract class ToolshedTest : IInvocationContext { - protected TestPair PairTracker = default!; + protected TestPair Pair = default!; protected virtual bool Connected => false; protected virtual bool AssertOnUnexpectedError => true; @@ -32,7 +32,7 @@ public abstract class ToolshedTest : IInvocationContext [TearDown] public async Task TearDownInternal() { - await PairTracker.CleanReturnAsync(); + await Pair.CleanReturnAsync(); await TearDown(); } @@ -45,12 +45,12 @@ protected virtual async Task TearDown() [SetUp] public virtual async Task Setup() { - PairTracker = await PoolManager.GetServerClient(new PoolSettings {Connected = Connected}); - Server = PairTracker.Server; + Pair = await PoolManager.GetServerClient(new PoolSettings {Connected = Connected}); + Server = Pair.Server; if (Connected) { - Client = PairTracker.Client; + Client = Pair.Client; await Client.WaitIdleAsync(); } diff --git a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs index 08bc19e151..88d70b37b0 100644 --- a/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs +++ b/Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs @@ -32,10 +32,10 @@ public sealed class EntitySystemExtensionsTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var mapCoordinates = testMap.MapCoords; var entityCoordinates = testMap.GridCoords; @@ -95,7 +95,7 @@ await server.WaitAssertion(() => Assert.That(entity, Is.Not.Null); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs b/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs index 31a154af30..80bf8791d5 100644 --- a/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs +++ b/Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs @@ -58,10 +58,10 @@ public sealed class EntityWhitelistTest [Test] public async Task Test() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); var mapCoordinates = testMap.MapCoords; var sEntities = server.ResolveDependency(); @@ -118,7 +118,7 @@ await server.WaitAssertion(() => Assert.That(whitelistSer.IsValid(WhitelistTestInvalidTag), Is.False); }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs index 6a0ddc91c7..6855f39ae1 100644 --- a/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs +++ b/Content.IntegrationTests/Tests/VendingMachineRestockTest.cs @@ -105,8 +105,8 @@ public sealed class VendingMachineRestockTest : EntitySystem [Test] public async Task TestAllRestocksAreAvailableToBuy() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var prototypeManager = server.ResolveDependency(); @@ -120,7 +120,7 @@ await server.WaitAssertion(() => foreach (var proto in prototypeManager.EnumeratePrototypes()) { if (proto.Abstract - || pairTracker.Pair.IsTestPrototype(proto) + || pair.IsTestPrototype(proto) || !proto.HasComponent()) { continue; @@ -170,14 +170,14 @@ await server.WaitAssertion(() => }); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestCompleteRestockProcess() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var mapManager = server.ResolveDependency(); @@ -193,7 +193,7 @@ public async Task TestCompleteRestockProcess() VendingMachineRestockComponent restockWrongComponent = default!; WiresPanelComponent machineWiresPanel = default!; - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); await server.WaitAssertion(() => { @@ -256,14 +256,14 @@ await server.WaitAssertion(() => mapManager.DeleteMap(testMap.MapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestRestockBreaksOpen() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var prototypeManager = server.ResolveDependency(); @@ -273,7 +273,7 @@ public async Task TestRestockBreaksOpen() var damageableSystem = entitySystemManager.GetEntitySystem(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); EntityUid restock = default; @@ -320,14 +320,14 @@ await server.WaitAssertion(() => mapManager.DeleteMap(testMap.MapId); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } [Test] public async Task TestRestockInventoryBounds() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; await server.WaitIdleAsync(); var mapManager = server.ResolveDependency(); @@ -336,7 +336,7 @@ public async Task TestRestockInventoryBounds() var vendingMachineSystem = entitySystemManager.GetEntitySystem(); - var testMap = await PoolManager.CreateTestMap(pairTracker); + var testMap = await PoolManager.CreateTestMap(pair); await server.WaitAssertion(() => { @@ -366,7 +366,7 @@ await server.WaitAssertion(() => "Machine's available inventory did not stay the same after a third restock."); }); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } } } diff --git a/Content.MapRenderer/Painters/MapPainter.cs b/Content.MapRenderer/Painters/MapPainter.cs index 49524ba73f..bebc208488 100644 --- a/Content.MapRenderer/Painters/MapPainter.cs +++ b/Content.MapRenderer/Painters/MapPainter.cs @@ -26,7 +26,7 @@ public static async IAsyncEnumerable> Paint(string map var stopwatch = new Stopwatch(); stopwatch.Start(); - await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings + await using var pair = await PoolManager.GetServerClient(new PoolSettings { DummyTicker = false, Connected = true, @@ -34,8 +34,8 @@ public static async IAsyncEnumerable> Paint(string map Map = map }); - var server = pairTracker.Pair.Server; - var client = pairTracker.Pair.Client; + var server = pair.Server; + var client = pair.Client; Console.WriteLine($"Loaded client and server in {(int) stopwatch.Elapsed.TotalMilliseconds} ms"); @@ -55,7 +55,7 @@ await client.WaitPost(() => var sEntityManager = server.ResolveDependency(); var sPlayerManager = server.ResolveDependency(); - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); var sMapManager = server.ResolveDependency(); @@ -85,7 +85,7 @@ await server.WaitPost(() => } }); - await PoolManager.RunTicksSync(pairTracker.Pair, 10); + await PoolManager.RunTicksSync(pair, 10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); foreach (var (uid, grid) in grids) @@ -132,7 +132,7 @@ await server.WaitPost(() => // We don't care if it fails as we have already saved the images. try { - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); } catch { diff --git a/Content.MapRenderer/Program.cs b/Content.MapRenderer/Program.cs index 3735a08bf4..43dcff2c02 100644 --- a/Content.MapRenderer/Program.cs +++ b/Content.MapRenderer/Program.cs @@ -34,8 +34,8 @@ internal static async Task Main(string[] args) { Console.WriteLine("Didn't specify any maps to paint! Loading the map list..."); - await using var pairTracker = await PoolManager.GetServerClient(); - var mapIds = pairTracker.Pair.Server + await using var pair = await PoolManager.GetServerClient(); + var mapIds = pair.Server .ResolveDependency() .EnumeratePrototypes() .Select(map => map.ID) @@ -108,8 +108,8 @@ internal static async Task Main(string[] args) Console.WriteLine("Retrieving map ids by map file names..."); Console.Write("Fetching map prototypes... "); - await using var pairTracker = await PoolManager.GetServerClient(); - var mapPrototypes = pairTracker.Pair.Server + await using var pair = await PoolManager.GetServerClient(); + var mapPrototypes = pair.Server .ResolveDependency() .EnumeratePrototypes() .ToArray(); diff --git a/Content.YAMLLinter/Program.cs b/Content.YAMLLinter/Program.cs index 756264135a..4ba7b9c12c 100644 --- a/Content.YAMLLinter/Program.cs +++ b/Content.YAMLLinter/Program.cs @@ -51,20 +51,20 @@ private static async Task Main(string[] _) private static async Task<(Dictionary> YamlErrors, List FieldErrors)> ValidateClient() { - await using var pairTracker = await PoolManager.GetServerClient(); - var client = pairTracker.Pair.Client; + await using var pair = await PoolManager.GetServerClient(); + var client = pair.Client; var result = await ValidateInstance(client); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); return result; } private static async Task<(Dictionary> YamlErrors, List FieldErrors)> ValidateServer() { - await using var pairTracker = await PoolManager.GetServerClient(); - var server = pairTracker.Pair.Server; + await using var pair = await PoolManager.GetServerClient(); + var server = pair.Server; var result = await ValidateInstance(server); - await pairTracker.CleanReturnAsync(); + await pair.CleanReturnAsync(); return result; }