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

Fix do_after cancel test (#1628)

Browse Source 
TFW local tests work.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2020-08-09 17:59:25 +10:00
committed by GitHub
parent 0c419cc448
commit 8f9cdccfc9
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Content.IntegrationTests/Tests/DoAfter/DoAfterServerTest.cs
View File

@@ -18,16 +18,15 @@ namespace Content.IntegrationTests.Tests.DoAfter
public class DoAfterServerTest : ContentIntegrationTest public class DoAfterServerTest : ContentIntegrationTest
{ {
[Test] [Test]
public async Task Test() public async Task TestFinished()
{ {
Task<DoAfterStatus> task = null; Task<DoAfterStatus> task = null;
var server = StartServerDummyTicker(); var server = StartServerDummyTicker();
float tickTime = 0.0f;
// That it finishes successfully // That it finishes successfully
server.Post(() => server.Post(() =>
{ {
tickTime = 1.0f / IoCManager.Resolve<IGameTiming>().TickRate; var tickTime = 1.0f / IoCManager.Resolve<IGameTiming>().TickRate;
var mapManager = IoCManager.Resolve<IMapManager>(); var mapManager = IoCManager.Resolve<IMapManager>();
mapManager.CreateNewMapEntity(MapId.Nullspace); mapManager.CreateNewMapEntity(MapId.Nullspace);
var entityManager = IoCManager.Resolve<IEntityManager>(); var entityManager = IoCManager.Resolve<IEntityManager>();
@@ -39,10 +38,17 @@ namespace Content.IntegrationTests.Tests.DoAfter
await server.WaitRunTicks(1); await server.WaitRunTicks(1);
Assert.That(task.Result == DoAfterStatus.Finished); Assert.That(task.Result == DoAfterStatus.Finished);
}
// That cancel works on mob move
[Test]
public async Task TestCancelled()
{
Task<DoAfterStatus> task = null;
var server = StartServerDummyTicker();
server.Post(() => server.Post(() =>
{ {
var tickTime = 1.0f / IoCManager.Resolve<IGameTiming>().TickRate;
var mapManager = IoCManager.Resolve<IMapManager>(); var mapManager = IoCManager.Resolve<IMapManager>();
mapManager.CreateNewMapEntity(MapId.Nullspace); mapManager.CreateNewMapEntity(MapId.Nullspace);
var entityManager = IoCManager.Resolve<IEntityManager>(); var entityManager = IoCManager.Resolve<IEntityManager>();
@@ -50,11 +56,11 @@ namespace Content.IntegrationTests.Tests.DoAfter
var cancelToken = new CancellationTokenSource(); var cancelToken = new CancellationTokenSource();
var args = new DoAfterEventArgs(mob, tickTime * 2, cancelToken.Token); var args = new DoAfterEventArgs(mob, tickTime * 2, cancelToken.Token);
task = EntitySystem.Get<DoAfterSystem>().DoAfter(args); task = EntitySystem.Get<DoAfterSystem>().DoAfter(args);
mob.Transform.GridPosition = mob.Transform.GridPosition.Translated(new Vector2(0.1f, 0.1f)); cancelToken.Cancel();
}); });
await server.WaitRunTicks(1); await server.WaitRunTicks(3);
Assert.That(task.Result == DoAfterStatus.Cancelled); Assert.That(task.Result == DoAfterStatus.Cancelled, $"Result was {task.Result}");
} }
} }
} }