Fix alerts heisentest (#16691)

This commit is contained in:
metalgearsloth
2023-05-22 18:53:51 +10:00
committed by GitHub
parent d83da8330d
commit c1d8180fde

View File

@@ -22,6 +22,11 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
var server = pairTracker.Pair.Server; var server = pairTracker.Pair.Server;
var client = pairTracker.Pair.Client; var client = pairTracker.Pair.Client;
var clientPlayerMgr = client.ResolveDependency<Robust.Client.Player.IPlayerManager>();
var clientUIMgr = client.ResolveDependency<IUserInterfaceManager>();
var clientEntManager = client.ResolveDependency<IEntityManager>();
var entManager = server.ResolveDependency<IEntityManager>();
var serverPlayerManager = server.ResolveDependency<IPlayerManager>(); var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
var alertsSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<AlertsSystem>(); var alertsSystem = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<AlertsSystem>();
@@ -31,7 +36,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
playerUid = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault(); playerUid = serverPlayerManager.Sessions.Single().AttachedEntity.GetValueOrDefault();
Assert.That(playerUid != default); Assert.That(playerUid != default);
// Making sure it exists // Making sure it exists
_ = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(playerUid); Assert.That(entManager.HasComponent<AlertsComponent>(playerUid));
var alerts = alertsSystem.GetActiveAlerts(playerUid); var alerts = alertsSystem.GetActiveAlerts(playerUid);
Assert.IsNotNull(alerts); Assert.IsNotNull(alerts);
@@ -48,15 +53,12 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
AlertsUI clientAlertsUI = default; AlertsUI clientAlertsUI = default;
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);
// Making sure it exists // Making sure it exists
_ = IoCManager.Resolve<IEntityManager>().GetComponent<AlertsComponent>(controlled.Value); Assert.That(clientEntManager.HasComponent<AlertsComponent>(controlled.Value));
// find the alertsui // find the alertsui