Update submodule, client integration test.

This commit is contained in:
Pieter-Jan Briers
2019-06-04 19:08:15 +02:00
parent 4631e3c79a
commit f551bd32d6
4 changed files with 24 additions and 7 deletions

View File

@@ -194,13 +194,13 @@ namespace Content.Client
IoCManager.Resolve<IChatManager>().Initialize(); IoCManager.Resolve<IChatManager>().Initialize();
} }
public override void Update(AssemblyLoader.UpdateLevel level, float frameTime) public override void Update(ModUpdateLevel level, float frameTime)
{ {
base.Update(level, frameTime); base.Update(level, frameTime);
switch (level) switch (level)
{ {
case AssemblyLoader.UpdateLevel.FramePreEngine: case ModUpdateLevel.FramePreEngine:
var renderFrameEventArgs = new RenderFrameEventArgs(frameTime); var renderFrameEventArgs = new RenderFrameEventArgs(frameTime);
IoCManager.Resolve<IClientNotifyManager>().FrameUpdate(renderFrameEventArgs); IoCManager.Resolve<IClientNotifyManager>().FrameUpdate(renderFrameEventArgs);
IoCManager.Resolve<IClientGameTicker>().FrameUpdate(renderFrameEventArgs); IoCManager.Resolve<IClientGameTicker>().FrameUpdate(renderFrameEventArgs);

View File

@@ -1,9 +1,6 @@
using System;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using NUnit.Framework; using NUnit.Framework;
using Robust.Shared.Exceptions; using Robust.Shared.Exceptions;
using Robust.Shared.Utility;
using Robust.UnitTesting; using Robust.UnitTesting;
namespace Content.IntegrationTests namespace Content.IntegrationTests
@@ -28,6 +25,26 @@ namespace Content.IntegrationTests
server.Stop(); server.Stop();
await server.WaitIdleAsync(); await server.WaitIdleAsync();
Assert.That(!server.IsAlive); Assert.That(!server.IsAlive);
Assert.That(server.UnhandledException, Is.Null);
}
/// <summary>
/// Test that the client starts.
/// </summary>
[Test]
public async Task TestClientStart()
{
var client = StartClient();
await client.WaitIdleAsync();
Assert.That(client.IsAlive);
client.RunTicks(5);
await client.WaitIdleAsync();
Assert.That(client.IsAlive);
var runtimeLog = client.ResolveDependency<IRuntimeLog>();
Assert.That(runtimeLog.ExceptionCount, Is.EqualTo(0), "No exceptions must be logged.");
client.Stop();
await client.WaitIdleAsync();
Assert.That(!client.IsAlive);
} }
} }
} }

View File

@@ -210,7 +210,7 @@ namespace Content.Server
_gameTicker.Initialize(); _gameTicker.Initialize();
} }
public override void Update(AssemblyLoader.UpdateLevel level, float frameTime) public override void Update(ModUpdateLevel level, float frameTime)
{ {
base.Update(level, frameTime); base.Update(level, frameTime);