space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests (#3605)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-22 08:26:03 +13:00
committed by GitHub
parent ce4a0eb8bb
commit 5ec72082bb
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Robust.UnitTesting/RobustIntegrationTest.cs
View File

@@ -11,6 +11,8 @@ using System.Threading.Tasks;
using Moq;
using NUnit.Framework;
using Robust.Client;
using Robust.Client.GameStates;
using Robust.Client.Timing;
using Robust.Server;
using Robust.Server.Console;
using Robust.Server.ServerStatus;
@@ -757,6 +759,8 @@ namespace Robust.UnitTesting
ClientIoC.RegisterIoC(GameController.DisplayMode.Headless, deps);
deps.Register<INetManager, IntegrationNetManager>(true);
deps.Register<IClientNetManager, IntegrationNetManager>(true);
deps.Register<IGameStateProcessor, GameStateProcessor>(true);
deps.Register<IClientGameTiming, ClientGameTiming>(true);
deps.Register<IntegrationNetManager, IntegrationNetManager>(true);
deps.Register<IModLoader, TestingModLoader>(true);
deps.Register<IModLoaderInternal, TestingModLoader>(true);

13
Robust.UnitTesting/Shared/GameObjects/ContainerTests.cs
View File

@@ -2,6 +2,8 @@ using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
using Robust.Client.GameObjects;
using Robust.Client.GameStates;
using Robust.Client.Timing;
using Robust.Server.GameObjects;
using Robust.Server.Maps;
using Robust.Server.Player;
@@ -10,6 +12,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Timing;
using MapSystem = Robust.Server.GameObjects.MapSystem;
// ReSharper disable AccessToStaticMemberViaDerivedType
@@ -210,9 +213,13 @@ namespace Robust.UnitTesting.Shared.GameObjects
entMan.GetComponent<TransformComponent>(itemUid).LocalPosition = (100000, 0);
});
// Needs minimum 4 to sync to client because buffer size is 3
await server.WaitRunTicks(1);
await client.WaitRunTicks(4);
await server.WaitRunTicks(1);
var serverTime = server.ResolveDependency<IGameTiming>();
var clientTime = client.ResolveDependency<IClientGameTiming>();
while (clientTime.LastRealTick < serverTime.CurTick - 1)
{
await client.WaitRunTicks(1);
}
await client.WaitAssertion(() =>
{