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

Change WaitUntil tickstep default to 1, fix going over the max, better async and fix rejuvenate test not being async (#2439)

Browse Source
This commit is contained in:
DrSmugleaf
2020-10-30 01:08:33 +01:00
committed by GitHub
parent ac3e9bc566
commit 12d8737e09
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.IntegrationTests/ContentIntegrationTest.cs
View File

@@ -129,19 +129,26 @@ namespace Content.IntegrationTests
return grid;
}
protected async Task WaitUntil(IntegrationInstance instance, Func<bool> func, int tickStep = 10, int maxTicks = 600)
protected async Task WaitUntil(IntegrationInstance instance, Func<bool> func, int maxTicks = 600, int tickStep = 1)
{
var ticksAwaited = 0;
bool passed;
await instance.WaitIdleAsync();
while (!(passed = func()) && ticksAwaited < maxTicks)
{
await instance.WaitIdleAsync();
instance.RunTicks(tickStep);
ticksAwaited += tickStep;
}
var ticksToRun = tickStep;
await instance.WaitIdleAsync();
if (ticksAwaited + tickStep > maxTicks)
{
ticksToRun = maxTicks - ticksAwaited;
}
await instance.WaitRunTicks(ticksToRun);
ticksAwaited += ticksToRun;
}
Assert.That(passed);
}

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

@@ -1,4 +1,5 @@
using Content.Server.GlobalVerbs;
using System.Threading.Tasks;
using Content.Server.GlobalVerbs;
using Content.Shared.Damage;
using Content.Shared.GameObjects.Components.Damage;
using NUnit.Framework;
@@ -14,14 +15,11 @@ namespace Content.IntegrationTests.Tests.Commands
public class RejuvenateTest : ContentIntegrationTest
{
[Test]
public void RejuvenateDeadTest()
public async Task RejuvenateDeadTest()
{
var server = StartServerDummyTicker();
IEntity human = null;
IDamageableComponent damageable = null;
server.Assert(() =>
await server.WaitAssertion(() =>
{
var mapManager = IoCManager.Resolve<IMapManager>();
@@ -29,10 +27,10 @@ namespace Content.IntegrationTests.Tests.Commands
var entityManager = IoCManager.Resolve<IEntityManager>();
human = entityManager.SpawnEntity("HumanMob_Content", MapCoordinates.Nullspace);
var human = entityManager.SpawnEntity("HumanMob_Content", MapCoordinates.Nullspace);
// Sanity check
Assert.True(human.TryGetComponent(out damageable));
Assert.True(human.TryGetComponent(out IDamageableComponent damageable));
Assert.That(damageable.CurrentState, Is.EqualTo(DamageState.Alive));
// Kill the entity