Make tests faster (#8737)
* Test changes * Make finding the test tile a little smarter
This commit is contained in:
@@ -4,37 +4,20 @@ using Content.Client.Clickable;
|
||||
using NUnit.Framework;
|
||||
using Robust.Client.Graphics;
|
||||
using Robust.Server.GameObjects;
|
||||
using Robust.Shared;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Map;
|
||||
|
||||
namespace Content.IntegrationTests.Tests
|
||||
{
|
||||
[TestFixture]
|
||||
public sealed class ClickableTest : ContentIntegrationTest
|
||||
public sealed class ClickableTest
|
||||
{
|
||||
private ClientIntegrationInstance _client;
|
||||
private ServerIntegrationInstance _server;
|
||||
|
||||
private const double DirSouth = 0;
|
||||
private const double DirNorth = Math.PI;
|
||||
private const double DirEast = Math.PI / 2;
|
||||
private const double DirSouthEast = Math.PI / 4;
|
||||
private const double DirSouthEastJustShy = Math.PI / 4 - 0.1;
|
||||
|
||||
[OneTimeSetUp]
|
||||
public async Task Setup()
|
||||
{
|
||||
(_client, _server) = await StartConnectedServerClientPair(serverOptions: new ServerContentIntegrationOption()
|
||||
{
|
||||
CVarOverrides =
|
||||
{
|
||||
[CVars.NetPVS.Name] = "false"
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
[Parallelizable(ParallelScope.None)]
|
||||
[Test]
|
||||
[TestCase("ClickTestRotatingCornerVisible", 0.25f, 0.25f, DirSouth, 1, ExpectedResult = true)]
|
||||
[TestCase("ClickTestRotatingCornerVisible", 0.35f, 0.5f, DirSouth, 2, ExpectedResult = true)]
|
||||
@@ -64,26 +47,29 @@ namespace Content.IntegrationTests.Tests
|
||||
[TestCase("ClickTestRotatingCornerInvisibleNoRot", 0.25f, 0.25f, DirSouthEastJustShy, 1, ExpectedResult = true)]
|
||||
public async Task<bool> Test(string prototype, float clickPosX, float clickPosY, double angle, float scale)
|
||||
{
|
||||
await using var pairTracker = await PoolManager.GetServerClient();
|
||||
var server = pairTracker.Pair.Server;
|
||||
var client = pairTracker.Pair.Client;
|
||||
EntityUid entity = default;
|
||||
var clientEntManager = _client.ResolveDependency<IEntityManager>();
|
||||
var serverEntManager = _server.ResolveDependency<IEntityManager>();
|
||||
var eyeManager = _client.ResolveDependency<IEyeManager>();
|
||||
var mapManager = _server.ResolveDependency<IMapManager>();
|
||||
var clientEntManager = client.ResolveDependency<IEntityManager>();
|
||||
var serverEntManager = server.ResolveDependency<IEntityManager>();
|
||||
var eyeManager = client.ResolveDependency<IEyeManager>();
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
|
||||
await _server.WaitPost(() =>
|
||||
await server.WaitPost(() =>
|
||||
{
|
||||
var ent = serverEntManager.SpawnEntity(prototype, GetMainEntityCoordinates(mapManager));
|
||||
var ent = serverEntManager.SpawnEntity(prototype, PoolManager.GetMainEntityCoordinates(mapManager));
|
||||
serverEntManager.GetComponent<TransformComponent>(ent).WorldRotation = angle;
|
||||
serverEntManager.GetComponent<SpriteComponent>(ent).Scale = (scale, scale);
|
||||
entity = ent;
|
||||
});
|
||||
|
||||
// Let client sync up.
|
||||
await RunTicksSync(_client, _server, 5);
|
||||
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
|
||||
|
||||
var hit = false;
|
||||
|
||||
await _client.WaitPost(() =>
|
||||
await client.WaitPost(() =>
|
||||
{
|
||||
// these tests currently all assume player eye is 0
|
||||
eyeManager.CurrentEye.Rotation = 0;
|
||||
@@ -94,11 +80,13 @@ namespace Content.IntegrationTests.Tests
|
||||
hit = clickable.CheckClick((clickPosX, clickPosY) + pos, out _, out _);
|
||||
});
|
||||
|
||||
await _server.WaitPost(() =>
|
||||
await server.WaitPost(() =>
|
||||
{
|
||||
serverEntManager.DeleteEntity(entity);
|
||||
});
|
||||
|
||||
await pairTracker.CleanReturnAsync();
|
||||
|
||||
return hit;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user