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

Fix test threading (#31669)

Browse Source
This commit is contained in:
metalgearsloth
2024-08-31 12:35:30 +10:00
committed by GitHub
parent 9183c50d81
commit 849d3d9f5c
5 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.IntegrationTests/Tests/Actions/ActionPvsDetachTest.cs
View File

@@ -32,11 +32,16 @@ public sealed class ActionPvsDetachTest
// PVS-detach action entities
// We do this by just giving them the ghost layer
var visSys = server.System<VisibilitySystem>();
var enumerator = server.Transform(ent).ChildEnumerator;
while (enumerator.MoveNext(out var child))
await server.WaitPost(() =>
{
visSys.AddLayer(child, (int) VisibilityFlags.Ghost);
}
var enumerator = server.Transform(ent).ChildEnumerator;
while (enumerator.MoveNext(out var child))
{
visSys.AddLayer(child, (int)VisibilityFlags.Ghost);
}
});
await pair.RunTicksSync(5);
// Client's actions have left been detached / are out of view, but action comp state has not changed
@@ -44,11 +49,14 @@ public sealed class ActionPvsDetachTest
Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions));
// Re-enter PVS view
enumerator = server.Transform(ent).ChildEnumerator;
while (enumerator.MoveNext(out var child))
await server.WaitPost(() =>
{
visSys.RemoveLayer(child, (int) VisibilityFlags.Ghost);
}
var enumerator = server.Transform(ent).ChildEnumerator;
while (enumerator.MoveNext(out var child))
{
visSys.RemoveLayer(child, (int) VisibilityFlags.Ghost);
}
});
await pair.RunTicksSync(5);
Assert.That(sys.GetActions(ent).Count(), Is.EqualTo(initActions));
Assert.That(cSys.GetActions(cEnt).Count(), Is.EqualTo(initActions));

6
Content.IntegrationTests/Tests/Buckle/BuckleDragTest.cs
View File

@@ -34,7 +34,11 @@ public sealed class BuckleDragTest : InteractionTest
Assert.That(pullable.BeingPulled, Is.False);
// Strap the human to the chair
Assert.That(Server.System<SharedBuckleSystem>().TryBuckle(sUrist, SPlayer, STarget.Value));
await Server.WaitAssertion(() =>
{
Assert.That(Server.System<SharedBuckleSystem>().TryBuckle(sUrist, SPlayer, STarget.Value));
});
await RunTicks(5);
Assert.That(buckle.Buckled, Is.True);
Assert.That(buckle.BuckledTo, Is.EqualTo(STarget));

9
Content.IntegrationTests/Tests/CargoTest.cs
View File

@@ -257,9 +257,12 @@ public sealed class CargoTest
var entManager = server.ResolveDependency<IEntityManager>();
var priceSystem = entManager.System<PricingSystem>();
var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace);
var price = priceSystem.GetPrice(ent);
Assert.That(price, Is.EqualTo(100.0));
await server.WaitAssertion(() =>
{
var ent = entManager.SpawnEntity("StackEnt", MapCoordinates.Nullspace);
var price = priceSystem.GetPrice(ent);
Assert.That(price, Is.EqualTo(100.0));
});
await pair.CleanReturnAsync();
}

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

@@ -143,10 +143,10 @@ public sealed class SuicideCommandTests
mobStateComp = entManager.GetComponent<MobStateComponent>(player);
mobThresholdsComp = entManager.GetComponent<MobThresholdsComponent>(player);
damageableComp = entManager.GetComponent<DamageableComponent>(player);
});
if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
if (protoMan.TryIndex<DamageTypePrototype>("Slash", out var slashProto))
damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5)));
});
// Check that running the suicide command kills the player
// and properly ghosts them without them being able to return to their body

3
Content.IntegrationTests/Tests/Shuttle/DockTest.cs
View File

@@ -97,13 +97,14 @@ public sealed class DockTest : ContentUnitTest
var entManager = server.ResolveDependency<IEntityManager>();
var dockingSystem = entManager.System<DockingSystem>();
var mapSystem = entManager.System<SharedMapSystem>();
MapGridComponent mapGrid = default!;
var mapGrid = entManager.AddComponent<MapGridComponent>(map.MapUid);
var shuttle = EntityUid.Invalid;
// Spawn shuttle and affirm no valid docks.
await server.WaitAssertion(() =>
{
mapGrid = entManager.AddComponent<MapGridComponent>(map.MapUid);
entManager.DeleteEntity(map.Grid);
Assert.That(entManager.System<MapLoaderSystem>().TryLoad(otherMap.MapId, "/Maps/Shuttles/emergency.yml", out var rootUids));
shuttle = rootUids[0];