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

Alert test fix (#10609)

Browse Source
This commit is contained in:
wrexbe
2022-08-14 20:45:58 -07:00
committed by GitHub
parent 073e394268
commit 23670ca1e3
2 changed files with 29 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,40 +24,47 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
var serverPlayerManager = server.ResolveDependency<IPlayerManager>(); var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
var alertsSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<AlertsSystem>(); var alertsSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<AlertsSystem>();
EntityUid playerUid = default;
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault(); playerUid = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault();
Assert.That(playerEnt != default); Assert.That(playerUid != default);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(playerEnt); // Making sure it exists
Assert.NotNull(alertsComponent); _ = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(playerUid);
// show 2 alerts var alerts = alertsSystem.GetActiveAlerts(playerUid);
alertsSystem.ShowAlert(alertsComponent.Owner, AlertType.Debug1, null, null); Assert.IsNotNull(alerts);
alertsSystem.ShowAlert(alertsComponent.Owner, AlertType.Debug2, null, null); var alertCount = alerts.Count;
alertsSystem.ShowAlert(playerUid, AlertType.Debug1);
alertsSystem.ShowAlert(playerUid, AlertType.Debug2);
Assert.AreEqual(alertCount + 2, alerts.Count);
}); });
await server.WaitRunTicks(5); await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await client.WaitRunTicks(5);
var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>(); AlertsUI clientAlertsUI = default;
var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
await client.WaitAssertion(() => await client.WaitAssertion(() =>
{ {
var clientPlayerMgr = IoCManager.Resolve<Robust.Client.Player.IPlayerManager>();
var clientUIMgr = IoCManager.Resolve<IUserInterfaceManager>();
var local = clientPlayerMgr.LocalPlayer; var local = clientPlayerMgr.LocalPlayer;
Assert.NotNull(local); Assert.NotNull(local);
var controlled = local.ControlledEntity; var controlled = local.ControlledEntity;
Assert.NotNull(controlled); Assert.NotNull(controlled);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(controlled.Value); // Making sure it exists
Assert.NotNull(alertsComponent); _ = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(controlled.Value);
// find the alertsui // find the alertsui
var alertsUI = clientAlertsUI =
clientUIMgr.StateRoot.Children.FirstOrDefault(c => c is AlertsUI) as AlertsUI; clientUIMgr.StateRoot.Children.FirstOrDefault(c => c is AlertsUI) as AlertsUI;
Assert.NotNull(alertsUI); Assert.NotNull(clientAlertsUI);
// we should be seeing 3 alerts - our health, and the 2 debug alerts, in a specific order. // we should be seeing 3 alerts - our health, and the 2 debug alerts, in a specific order.
Assert.That(alertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3)); Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(3));
var alertControls = alertsUI.AlertContainer.Children.Select(c => (AlertControl) c); var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray(); var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug1, AlertType.Debug2}; var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug1, AlertType.Debug2};
Assert.That(alertIDs, Is.SupersetOf(expectedIDs)); Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
@@ -65,38 +72,21 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() => await server.WaitAssertion(() =>
{ {
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault(); alertsSystem.ClearAlert(playerUid, AlertType.Debug1);
Assert.That(playerEnt, Is.Not.EqualTo(default));
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(playerEnt);
Assert.NotNull(alertsComponent);
alertsSystem.ClearAlert(alertsComponent.Owner, AlertType.Debug1);
}); });
await PoolManager.RunTicksSync(pairTracker.Pair, 5); await PoolManager.RunTicksSync(pairTracker.Pair, 5);
await client.WaitAssertion(() => await client.WaitAssertion(() =>
{ {
var local = clientPlayerMgr.LocalPlayer;
Assert.NotNull(local);
var controlled = local.ControlledEntity;
Assert.NotNull(controlled);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(controlled.Value);
Assert.NotNull(alertsComponent);
// find the alertsui
var alertsUI =
clientUIMgr.StateRoot.Children.FirstOrDefault(c => c is AlertsUI) as AlertsUI;
Assert.NotNull(alertsUI);
// we should be seeing 2 alerts now because one was cleared // we should be seeing 2 alerts now because one was cleared
Assert.That(alertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2)); Assert.That(clientAlertsUI.AlertContainer.ChildCount, Is.GreaterThanOrEqualTo(2));
var alertControls = alertsUI.AlertContainer.Children.Select(c => (AlertControl) c); var alertControls = clientAlertsUI.AlertContainer.Children.Select(c => (AlertControl) c);
var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray(); var alertIDs = alertControls.Select(ac => ac.Alert.AlertType).ToArray();
var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug2}; var expectedIDs = new [] {AlertType.HumanHealth, AlertType.Debug2};
Assert.That(alertIDs, Is.SupersetOf(expectedIDs)); Assert.That(alertIDs, Is.SupersetOf(expectedIDs));
}); });
await pairTracker.CleanReturnAsync(); await pairTracker.CleanReturnAsync();
} }
} }

2
Content.IntegrationTests/Tests/GameRules/StartEndGameRulesTest.cs
View File

@@ -18,7 +18,7 @@ public sealed class StartEndGameRulesTest
[Test] [Test]
public async Task Test() public async Task Test()
{ {
await using var pairTracker = await PoolManager.GetServerClient(); await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings(){Dirty = true});
var server = pairTracker.Pair.Server; var server = pairTracker.Pair.Server;
await server.WaitAssertion(() => await server.WaitAssertion(() =>