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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Content.IntegrationTests/Tests/Buckle/BuckleTest.cs
View File

@@ -1,4 +1,3 @@
using System.Linq;
using System.Threading.Tasks;
using Content.Server.Buckle.Components;
using Content.Server.Hands.Components;
@@ -7,10 +6,8 @@ using Content.Shared.ActionBlocker;
using Content.Shared.Body.Components;
using Content.Shared.Body.Part;
using Content.Shared.Buckle.Components;
using Content.Shared.Coordinates;
using Content.Shared.Standing;
using NUnit.Framework;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
@@ -58,8 +55,8 @@ namespace Content.IntegrationTests.Tests.Buckle
var sOptions = new ServerIntegrationOptions {ExtraPrototypes = Prototypes};
var (_, server) = await StartConnectedServerClientPair(cOptions, sOptions);
IEntity human = null;
IEntity chair = null;
EntityUid human = default;
EntityUid chair = default;
BuckleComponent buckle = null;
StrapComponent strap = null;
@@ -72,23 +69,23 @@ namespace Content.IntegrationTests.Tests.Buckle
var standingState = EntitySystem.Get<StandingStateSystem>();
var grid = GetMainGrid(mapManager);
var coordinates = grid.GridEntityId.ToCoordinates();
var coordinates = new EntityCoordinates(grid.GridEntityId, 0, 0);
human = entityManager.SpawnEntity(BuckleDummyId, coordinates);
chair = entityManager.SpawnEntity(StrapDummyId, coordinates);
// Default state, unbuckled
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out buckle));
Assert.True(entityManager.TryGetComponent(human, out buckle));
Assert.NotNull(buckle);
Assert.Null(buckle.BuckledTo);
Assert.False(buckle.Buckled);
Assert.True(actionBlocker.CanMove(human));
Assert.True(actionBlocker.CanChangeDirection(human));
Assert.True(standingState.Down((EntityUid) human));
Assert.True(standingState.Stand((EntityUid) human));
Assert.True(standingState.Down(human));
Assert.True(standingState.Stand(human));
// Default state, no buckled entities, strap
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(chair, out strap));
Assert.True(entityManager.TryGetComponent(chair, out strap));
Assert.NotNull(strap);
Assert.IsEmpty(strap.BuckledEntities);
Assert.Zero(strap.OccupiedSize);
@@ -98,12 +95,11 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.NotNull(buckle.BuckledTo);
Assert.True(buckle.Buckled);
var player = IoCManager.Resolve<IPlayerManager>().Sessions.Single();
Assert.True(((BuckleComponentState) buckle.GetComponentState()).Buckled);
Assert.False(actionBlocker.CanMove(human));
Assert.False(actionBlocker.CanChangeDirection(human));
Assert.False(standingState.Down((EntityUid) human));
Assert.That((IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition - IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(chair).WorldPosition).Length, Is.LessThanOrEqualTo(buckle.BuckleOffset.Length));
Assert.False(standingState.Down(human));
Assert.That((entityManager.GetComponent<TransformComponent>(human).WorldPosition - entityManager.GetComponent<TransformComponent>(chair).WorldPosition).Length, Is.LessThanOrEqualTo(buckle.BuckleOffset.Length));
// Side effects of buckling for the strap
Assert.That(strap.BuckledEntities, Does.Contain(human));
@@ -136,7 +132,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.False(buckle.Buckled);
Assert.True(actionBlocker.CanMove(human));
Assert.True(actionBlocker.CanChangeDirection(human));
Assert.True(standingState.Down((EntityUid) human));
Assert.True(standingState.Down(human));
// Unbuckle, strap
Assert.IsEmpty(strap.BuckledEntities);
@@ -160,6 +156,7 @@ namespace Content.IntegrationTests.Tests.Buckle
await server.WaitAssertion(() =>
{
var entityManager = IoCManager.Resolve<IEntityManager>();
var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
var standingState = EntitySystem.Get<StandingStateSystem>();
@@ -171,7 +168,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.False(buckle.Buckled);
// Move away from the chair
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition += (1000, 1000);
entityManager.GetComponent<TransformComponent>(human).WorldPosition += (1000, 1000);
// Out of range
Assert.False(buckle.TryBuckle(human, chair));
@@ -179,7 +176,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.False(buckle.ToggleBuckle(human, chair));
// Move near the chair
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(chair).WorldPosition + (0.5f, 0);
entityManager.GetComponent<TransformComponent>(human).WorldPosition = entityManager.GetComponent<TransformComponent>(chair).WorldPosition + (0.5f, 0);
// In range
Assert.True(buckle.TryBuckle(human, chair));
@@ -194,13 +191,13 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.False(buckle.Buckled);
Assert.True(actionBlocker.CanMove(human));
Assert.True(actionBlocker.CanChangeDirection(human));
Assert.True(standingState.Down((EntityUid) human));
Assert.True(standingState.Down(human));
// Re-buckle
Assert.True(buckle.TryBuckle(human, chair));
// Move away from the chair
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition += (1, 0);
entityManager.GetComponent<TransformComponent>(human).WorldPosition += (1, 0);
});
await server.WaitRunTicks(1);
@@ -220,7 +217,7 @@ namespace Content.IntegrationTests.Tests.Buckle
var options = new ServerContentIntegrationOption {ExtraPrototypes = Prototypes};
var server = StartServer(options);
IEntity human = null;
EntityUid human = default;
BuckleComponent buckle = null;
HandsComponent hands = null;
SharedBodyComponent body = null;
@@ -233,16 +230,16 @@ namespace Content.IntegrationTests.Tests.Buckle
var entityManager = IoCManager.Resolve<IEntityManager>();
var grid = GetMainGrid(mapManager);
var coordinates = grid.GridEntityId.ToCoordinates();
var coordinates = new EntityCoordinates(grid.GridEntityId, 0, 0);
human = entityManager.SpawnEntity(BuckleDummyId, coordinates);
IEntity chair = entityManager.SpawnEntity(StrapDummyId, coordinates);
var chair = entityManager.SpawnEntity(StrapDummyId, coordinates);
// Component sanity check
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out buckle));
Assert.True(IoCManager.Resolve<IEntityManager>().HasComponent<StrapComponent>(chair));
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out hands));
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out body));
Assert.True(entityManager.TryGetComponent(human, out buckle));
Assert.True(entityManager.HasComponent<StrapComponent>(chair));
Assert.True(entityManager.TryGetComponent(human, out hands));
Assert.True(entityManager.TryGetComponent(human, out body));
// Buckle
Assert.True(buckle.TryBuckle(human, chair));
@@ -255,7 +252,7 @@ namespace Content.IntegrationTests.Tests.Buckle
var akms = entityManager.SpawnEntity(ItemDummyId, coordinates);
// Equip items
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(akms, out ItemComponent item));
Assert.True(entityManager.TryGetComponent(akms, out ItemComponent item));
Assert.True(hands.PutInHand(item));
}
});
@@ -308,8 +305,8 @@ namespace Content.IntegrationTests.Tests.Buckle
};
var server = StartServer(options);
IEntity human = null;
IEntity chair = null;
EntityUid human = default;
EntityUid chair = default;
BuckleComponent buckle = null;
await server.WaitAssertion(() =>
@@ -318,14 +315,14 @@ namespace Content.IntegrationTests.Tests.Buckle
var entityManager = IoCManager.Resolve<IEntityManager>();
var grid = GetMainGrid(mapManager);
var coordinates = grid.GridEntityId.ToCoordinates();
var coordinates = new EntityCoordinates(grid.GridEntityId, 0, 0);
human = entityManager.SpawnEntity(BuckleDummyId, coordinates);
chair = entityManager.SpawnEntity(StrapDummyId, coordinates);
// Component sanity check
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out buckle));
Assert.True(IoCManager.Resolve<IEntityManager>().HasComponent<StrapComponent>(chair));
Assert.True(entityManager.TryGetComponent(human, out buckle));
Assert.True(entityManager.HasComponent<StrapComponent>(chair));
// Buckle
Assert.True(buckle.TryBuckle(human, chair));
@@ -333,7 +330,7 @@ namespace Content.IntegrationTests.Tests.Buckle
Assert.True(buckle.Buckled);
// Move the buckled entity away
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition += (100, 0);
entityManager.GetComponent<TransformComponent>(human).WorldPosition += (100, 0);
});
await WaitUntil(server, () => !buckle.Buckled, 10);
@@ -342,8 +339,10 @@ namespace Content.IntegrationTests.Tests.Buckle
await server.WaitAssertion(() =>
{
var entityManager = IoCManager.Resolve<IEntityManager>();
// Move the now unbuckled entity back onto the chair
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition -= (100, 0);
entityManager.GetComponent<TransformComponent>(human).WorldPosition -= (100, 0);
// Buckle
Assert.True(buckle.TryBuckle(human, chair));