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

Remove obsolete TestPair.Pair (#19496)

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

6
Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
View File

@@ -37,8 +37,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
[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 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
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)

16
Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
View File

@@ -16,9 +16,9 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
[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<IResourceManager>();
var prototypePath = new ResPath("/Prototypes/");
@@ -93,7 +93,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
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 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
[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<IComponentFactory>();
var ignoredServerNames = Server.Entry.IgnoredComponents.List;
var clientComponents = client.ResolveDependency<IComponentFactory>();
@@ -138,7 +138,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
}
}
Assert.That(failureMessages, Is.Empty);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}

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

@@ -16,13 +16,13 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
[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<Robust.Client.Player.IPlayerManager>();
var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
@@ -52,7 +52,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
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 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
alertsSystem.ClearAlert(playerUid, AlertType.Debug1);
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await client.WaitAssertion(() =>
{
@@ -110,7 +110,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}