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

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

@@ -15,9 +15,9 @@ namespace Content.IntegrationTests.Tests.Commands
[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<IPlayerManager>();
var sConsole = server.ResolveDependency<IServerConsoleHost>();
@@ -62,7 +62,7 @@ namespace Content.IntegrationTests.Tests.Commands
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 @@ namespace Content.IntegrationTests.Tests.Commands
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();
}
}
}

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

@@ -33,8 +33,8 @@ namespace Content.IntegrationTests.Tests.Commands
[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<IEntityManager>();
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
var mobStateSystem = entManager.EntitySysManager.GetEntitySystem<MobStateSystem>();
@@ -89,7 +89,7 @@ namespace Content.IntegrationTests.Tests.Commands
Assert.That(damageable.TotalDamage, Is.EqualTo(FixedPoint2.Zero));
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}

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

@@ -16,18 +16,18 @@ namespace Content.IntegrationTests.Tests.Commands
[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<IConfigurationManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var gameTicker = entityManager.EntitySysManager.GetEntitySystem<GameTicker>();
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await PoolManager.RunTicksSync(pair, 5);
GameTick tickBeforeRestart = default;
@@ -49,7 +49,7 @@ namespace Content.IntegrationTests.Tests.Commands
}
});
await PoolManager.RunTicksSync(pairTracker.Pair, 15);
await PoolManager.RunTicksSync(pair, 15);
await server.WaitAssertion(() =>
{
@@ -58,8 +58,8 @@ namespace Content.IntegrationTests.Tests.Commands
Assert.That(tickBeforeRestart, Is.LessThan(tickAfterRestart));
});
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await pairTracker.CleanReturnAsync();
await PoolManager.RunTicksSync(pair, 5);
await pair.CleanReturnAsync();
}
}
}