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

8
Content.IntegrationTests/Tests/Networking/NetworkIdsMatchTest.cs
View File

@@ -8,9 +8,9 @@ namespace Content.IntegrationTests.Tests.Networking
[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<IComponentFactory>();
var serverCompFactory = server.ResolveDependency<IComponentFactory>();
@@ -38,7 +38,7 @@ namespace Content.IntegrationTests.Tests.Networking
Assert.That(clientNetComps[netId].Name, Is.EqualTo(serverNetComps[netId].Name));
}
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}

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

@@ -9,9 +9,9 @@ namespace Content.IntegrationTests.Tests.Networking
[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<IClientConsoleHost>();
var netManager = client.ResolveDependency<IClientNetManager>();
@@ -19,7 +19,7 @@ namespace Content.IntegrationTests.Tests.Networking
await client.WaitPost(() => host.ExecuteCommand("disconnect"));
// Run some ticks for the disconnect to complete and such.
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
@@ -29,10 +29,10 @@ namespace Content.IntegrationTests.Tests.Networking
await client.WaitPost(() => netManager.ClientConnect(null, 0, null));
// Run some ticks for the handshake to complete and such.
await PoolManager.RunTicksSync(pairTracker.Pair, 10);
await PoolManager.RunTicksSync(pair, 10);
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}

12
Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
View File

@@ -31,9 +31,9 @@ namespace Content.IntegrationTests.Tests.Networking
[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<IMapManager>();
var sEntityManager = server.ResolveDependency<IEntityManager>();
@@ -60,8 +60,8 @@ namespace Content.IntegrationTests.Tests.Networking
});
// 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 @@ namespace Content.IntegrationTests.Tests.Networking
}
cfg.SetCVar(CVars.NetLogging, log);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
public sealed class PredictionTestEntitySystem : EntitySystem