tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make some tests use the PoolSettings.InLobby option (#18677)

Browse Source
This commit is contained in:
Leon Friedrich
2023-08-05 14:10:46 +12:00
committed by GitHub
parent bca24f619c
commit 6a19c1a0f6
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/PoolManager.cs
View File

@@ -376,6 +376,8 @@ public static class PoolManager
var ticker = pair.Server.ResolveDependency<EntityManager>().System<GameTicker>(); var ticker = pair.Server.ResolveDependency<EntityManager>().System<GameTicker>();
Assert.That(ticker.DummyTicker, Is.EqualTo(pair.Settings.DummyTicker)); Assert.That(ticker.DummyTicker, Is.EqualTo(pair.Settings.DummyTicker));
var cfg = pair.Server.ResolveDependency<IConfigurationManager>();
Assert.That(cfg.GetCVar(CCVars.GameLobbyEnabled), Is.EqualTo(pair.Settings.InLobby));
var status = ticker.PlayerGameStatuses[sPlayer.Sessions.Single().UserId]; var status = ticker.PlayerGameStatuses[sPlayer.Sessions.Single().UserId];
var expected = pair.Settings.InLobby var expected = pair.Settings.InLobby
? PlayerGameStatus.NotReadyToPlay ? PlayerGameStatus.NotReadyToPlay

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

@@ -204,17 +204,9 @@ public sealed class AddTests
[Test] [Test]
public async Task PreRoundAddAndGetSingle() public async Task PreRoundAddAndGetSingle()
{ {
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Dirty = true }); await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Dirty = true, InLobby = true });
var server = pairTracker.Pair.Server; var server = pairTracker.Pair.Server;
var configManager = server.ResolveDependency<IConfigurationManager>();
await server.WaitPost(() =>
{
configManager.SetCVar(CCVars.GameLobbyEnabled, true);
var command = new RestartRoundNowCommand();
command.Execute(null, string.Empty, Array.Empty<string>());
});
var sDatabase = server.ResolveDependency<IServerDbManager>(); var sDatabase = server.ResolveDependency<IServerDbManager>();
var sSystems = server.ResolveDependency<IEntitySystemManager>(); var sSystems = server.ResolveDependency<IEntitySystemManager>();

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

@@ -16,22 +16,13 @@ namespace Content.IntegrationTests.Tests.GameRules
[Test] [Test]
public async Task RestartTest() public async Task RestartTest()
{ {
await using var pairTracker = await PoolManager.GetServerClient(); await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { InLobby = true });
var server = pairTracker.Pair.Server; var server = pairTracker.Pair.Server;
var entityManager = server.ResolveDependency<IEntityManager>(); var entityManager = server.ResolveDependency<IEntityManager>();
var configManager = server.ResolveDependency<IConfigurationManager>();
await server.WaitPost(() =>
{
configManager.SetCVar(CCVars.GameLobbyEnabled, true);
var command = new RestartRoundNowCommand();
command.Execute(null, string.Empty, Array.Empty<string>());
});
var sGameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>(); var sGameTicker = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<GameTicker>();
var sGameTiming = server.ResolveDependency<IGameTiming>(); var sGameTiming = server.ResolveDependency<IGameTiming>();
sGameTicker.StartGameRule("MaxTimeRestart", out var ruleEntity); sGameTicker.StartGameRule("MaxTimeRestart", out var ruleEntity);
Assert.That(entityManager.TryGetComponent<MaxTimeRestartRuleComponent>(ruleEntity, out var maxTime)); Assert.That(entityManager.TryGetComponent<MaxTimeRestartRuleComponent>(ruleEntity, out var maxTime));
@@ -62,14 +53,6 @@ namespace Content.IntegrationTests.Tests.GameRules
{ {
Assert.That(sGameTicker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby)); Assert.That(sGameTicker.RunLevel, Is.EqualTo(GameRunLevel.PreRoundLobby));
}); });
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await server.WaitPost(() =>
{
configManager.SetCVar(CCVars.GameLobbyEnabled, false);
var command = new RestartRoundNowCommand();
command.Execute(null, string.Empty, Array.Empty<string>());
});
await PoolManager.RunTicksSync(pairTracker.Pair, 30);
await pairTracker.CleanReturnAsync(); await pairTracker.CleanReturnAsync();
} }