juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions 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

3
Content.IntegrationTests/Tests/Administration/Logs/AddTests.cs
View File

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
using Content.Server.Administration.Logs;
using Content.Server.Database;
using Content.Server.GameTicking;
using Content.Shared.Administration.Logs;
using Content.Shared.CCVar;
using Content.Shared.Database;
using NUnit.Framework;
@@ -161,7 +160,7 @@ public class AddTests : ContentIntegrationTest
await server.WaitPost(() =>
{
var coordinates = GetMainEntityCoordinates(sMaps);
var entity = sEntities.SpawnEntity(null, coordinates).Uid;
var entity = sEntities.SpawnEntity(null, coordinates);
if (parallel)
{

2
Content.IntegrationTests/Tests/Body/LungTest.cs
View File

@@ -153,7 +153,7 @@ namespace Content.IntegrationTests.Tests.Body
MapId mapId;
IMapGrid grid = null;
RespiratorComponent respirator = null;
EntityUid human = null;
EntityUid human = default;
var testMapName = "Maps/Test/Breathing/3by3-20oxy-80nit.yml";

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));

4
Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
View File

@@ -43,7 +43,7 @@ namespace Content.IntegrationTests.Tests.Chemistry
//since i have no clue how to isolate each loop assert-wise im just gonna throw this one in for good measure
Console.WriteLine($"Testing {reactionPrototype.ID}");
IEntity beaker;
EntityUid beaker;
Solution component = null;
server.Assert(() =>
@@ -67,7 +67,7 @@ namespace Content.IntegrationTests.Tests.Chemistry
//(i'm sorry)
var foundProductsMap = reactionPrototype.Products
.Concat(reactionPrototype.Reactants.Where(x => x.Value.Catalyst).ToDictionary(x => x.Key, x => x.Value.Amount))
.ToDictionary(x => x, x => false);
.ToDictionary(x => x, _ => false);
foreach (var reagent in component.Contents)
{
Assert.That(foundProductsMap.TryFirstOrNull(x => x.Key.Key == reagent.ReagentId && x.Key.Value == reagent.Quantity, out var foundProduct));

6
Content.IntegrationTests/Tests/ClickableTest.cs
View File

@@ -77,8 +77,7 @@ namespace Content.IntegrationTests.Tests
await _server.WaitPost(() =>
{
var gridEnt = mapManager.GetAllGrids().First().GridEntityId;
IEntity tempQualifier = serverEntManager.GetEntity(gridEnt);
worldPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(tempQualifier).WorldPosition;
worldPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEnt).WorldPosition;
var ent = serverEntManager.SpawnEntity(prototype, new EntityCoordinates(gridEnt, 0f, 0f));
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(ent).LocalRotation = angle;
@@ -93,8 +92,7 @@ namespace Content.IntegrationTests.Tests
await _client.WaitPost(() =>
{
var ent = clientEntManager.GetEntity(entity);
var clickable = IoCManager.Resolve<IEntityManager>().GetComponent<ClickableComponent>(ent);
var clickable = IoCManager.Resolve<IEntityManager>().GetComponent<ClickableComponent>(entity);
hit = clickable.CheckClick((clickPosX, clickPosY) + worldPos!.Value, out _, out _);
});

42
Content.IntegrationTests/Tests/ContainerOcclusionTest.cs
View File

@@ -74,14 +74,17 @@ namespace Content.IntegrationTests.Tests
{
var (c, s) = await Start();
EntityUid dummyUid = default;
await c.WaitIdleAsync();
var cEntities = c.ResolveDependency<IEntityManager>();
EntityUid dummy = default;
s.Post(() =>
{
var pos = new MapCoordinates(Vector2.Zero, new MapId(1));
var ent = IoCManager.Resolve<IEntityManager>();
var container = ent.SpawnEntity("ContainerOcclusionA", pos);
var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
dummyUid = dummy;
dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(container).Insert(dummy);
});
@@ -90,9 +93,8 @@ namespace Content.IntegrationTests.Tests
c.Assert(() =>
{
var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy);
var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy);
var sprite = cEntities.GetComponent<SpriteComponent>(dummy);
var light = cEntities.GetComponent<PointLightComponent>(dummy);
Assert.True(sprite.ContainerOccluded);
Assert.True(light.ContainerOccluded);
});
@@ -105,14 +107,17 @@ namespace Content.IntegrationTests.Tests
{
var (c, s) = await Start();
EntityUid dummyUid = default;
await c.WaitIdleAsync();
var cEntities = c.ResolveDependency<IEntityManager>();
EntityUid dummy = default;
s.Post(() =>
{
var pos = new MapCoordinates(Vector2.Zero, new MapId(1));
var ent = IoCManager.Resolve<IEntityManager>();
var container = ent.SpawnEntity("ContainerOcclusionB", pos);
var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
dummyUid = dummy;
dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(container).Insert(dummy);
});
@@ -121,9 +126,8 @@ namespace Content.IntegrationTests.Tests
c.Assert(() =>
{
var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy);
var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy);
var sprite = cEntities.GetComponent<SpriteComponent>(dummy);
var light = cEntities.GetComponent<PointLightComponent>(dummy);
Assert.False(sprite.ContainerOccluded);
Assert.False(light.ContainerOccluded);
});
@@ -136,15 +140,18 @@ namespace Content.IntegrationTests.Tests
{
var (c, s) = await Start();
EntityUid dummyUid = default;
await c.WaitIdleAsync();
var cEntities = c.ResolveDependency<IEntityManager>();
EntityUid dummy = default;
s.Post(() =>
{
var pos = new MapCoordinates(Vector2.Zero, new MapId(1));
var ent = IoCManager.Resolve<IEntityManager>();
var containerA = ent.SpawnEntity("ContainerOcclusionA", pos);
var containerB = ent.SpawnEntity("ContainerOcclusionB", pos);
var dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
dummyUid = dummy;
dummy = ent.SpawnEntity("ContainerOcclusionDummy", pos);
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(containerA).Insert(containerB);
IoCManager.Resolve<IEntityManager>().GetComponent<EntityStorageComponent>(containerB).Insert(dummy);
@@ -154,9 +161,8 @@ namespace Content.IntegrationTests.Tests
c.Assert(() =>
{
var dummy = IoCManager.Resolve<IEntityManager>().GetEntity(dummyUid);
var sprite = IoCManager.Resolve<IEntityManager>().GetComponent<SpriteComponent>(dummy);
var light = IoCManager.Resolve<IEntityManager>().GetComponent<PointLightComponent>(dummy);
var sprite = cEntities.GetComponent<SpriteComponent>(dummy);
var light = cEntities.GetComponent<PointLightComponent>(dummy);
Assert.True(sprite.ContainerOccluded);
Assert.True(light.ContainerOccluded);
});

2
Content.IntegrationTests/Tests/Damageable/DamageableTest.cs
View File

@@ -95,7 +95,7 @@ namespace Content.IntegrationTests.Tests.Damageable
sEntityManager.EventBus.SubscribeLocalEvent<DamageableComponent, DamageChangedEvent>(DamageChangedListener);
IEntity sDamageableEntity = null;
EntityUid sDamageableEntity = default;
DamageableComponent sDamageableComponent = null;
DamageableSystem sDamageableSystem = null;

6
Content.IntegrationTests/Tests/DeleteInventoryTest.cs
View File

@@ -28,17 +28,17 @@ namespace Content.IntegrationTests.Tests
var entMgr = IoCManager.Resolve<IEntityManager>();
var container = entMgr.SpawnEntity(null, MapCoordinates.Nullspace);
var inv = (InventoryComponent) IoCManager.Resolve<IEntityManager>().AddComponent<InventoryComponent>(container);
var inv = IoCManager.Resolve<IEntityManager>().AddComponent<InventoryComponent>(container);
var child = entMgr.SpawnEntity(null, MapCoordinates.Nullspace);
var item = (ClothingComponent) IoCManager.Resolve<IEntityManager>().AddComponent<ClothingComponent>(child);
var item = IoCManager.Resolve<IEntityManager>().AddComponent<ClothingComponent>(child);
item.SlotFlags = SlotFlags.HEAD;
// Equip item.
Assert.That(inv.Equip(Slots.HEAD, item, false), Is.True);
// Delete parent.
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) container);
IoCManager.Resolve<IEntityManager>().DeleteEntity(container);
// Assert that child item was also deleted.
Assert.That(item.Deleted, Is.True);

2
Content.IntegrationTests/Tests/Destructible/DestructibleDamageGroupTest.cs
View File

@@ -32,7 +32,7 @@ namespace Content.IntegrationTests.Tests.Destructible
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
IEntity sDestructibleEntity = null;
EntityUid sDestructibleEntity = default;
DamageableComponent sDamageableComponent = null;
TestDestructibleListenerSystem sTestThresholdListenerSystem = null;
DamageableSystem sDamageableSystem = null;

2
Content.IntegrationTests/Tests/Destructible/DestructibleDamageTypeTest.cs
View File

@@ -30,7 +30,7 @@ namespace Content.IntegrationTests.Tests.Destructible
var sMapManager = server.ResolveDependency<IMapManager>();
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
IEntity sDestructibleEntity = null;
EntityUid sDestructibleEntity = default;
DamageableComponent sDamageableComponent = null;
TestDestructibleListenerSystem sTestThresholdListenerSystem = null;
DamageableSystem sDamageableSystem = null;

8
Content.IntegrationTests/Tests/Destructible/DestructibleDestructionTest.cs
View File

@@ -30,8 +30,7 @@ namespace Content.IntegrationTests.Tests.Destructible
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
IEntity sDestructibleEntity = null;
DamageableComponent sDamageableComponent = null;
EntityUid sDestructibleEntity = default;
TestDestructibleListenerSystem sTestThresholdListenerSystem = null;
await server.WaitPost(() =>
@@ -40,7 +39,6 @@ namespace Content.IntegrationTests.Tests.Destructible
var coordinates = new EntityCoordinates(gridId, 0, 0);
sDestructibleEntity = sEntityManager.SpawnEntity(DestructibleDestructionEntityId, coordinates);
sDamageableComponent = IoCManager.Resolve<IEntityManager>().GetComponent<DamageableComponent>(sDestructibleEntity);
sTestThresholdListenerSystem = sEntitySystemManager.GetEntitySystem<TestDestructibleListenerSystem>();
});
@@ -73,12 +71,12 @@ namespace Content.IntegrationTests.Tests.Destructible
foreach (var entity in entitiesInRange)
{
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype == null)
if (sEntityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype == null)
{
continue;
}
if (IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(entity).EntityPrototype.Name != SpawnedEntityId)
if (sEntityManager.GetComponent<MetaDataComponent>(entity).EntityPrototype?.Name != SpawnedEntityId)
{
continue;
}

2
Content.IntegrationTests/Tests/Destructible/DestructibleThresholdActivationTest.cs
View File

@@ -36,7 +36,7 @@ namespace Content.IntegrationTests.Tests.Destructible
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
var sEntitySystemManager = server.ResolveDependency<IEntitySystemManager>();
EntityUid sDestructibleEntity = null; ;
EntityUid sDestructibleEntity = default;
DamageableComponent sDamageableComponent = null;
DestructibleComponent sDestructibleComponent = null;
TestDestructibleListenerSystem sTestThresholdListenerSystem = null;

12
Content.IntegrationTests/Tests/DeviceNetwork/DeviceNetworkTest.cs
View File

@@ -64,8 +64,8 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
IEntity device1 = null;
IEntity device2 = null;
EntityUid device1 = default;
EntityUid device2 = default;
DeviceNetworkComponent networkComponent1 = null;
DeviceNetworkComponent networkComponent2 = null;
@@ -126,8 +126,8 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
IEntity device1 = null;
IEntity device2 = null;
EntityUid device1 = default;
EntityUid device2 = default;
DeviceNetworkComponent networkComponent1 = null;
DeviceNetworkComponent networkComponent2 = null;
WirelessNetworkComponent wirelessNetworkComponent = null;
@@ -208,8 +208,8 @@ namespace Content.IntegrationTests.Tests.DeviceNetwork
var deviceNetTestSystem = entityManager.EntitySysManager.GetEntitySystem<DeviceNetworkTestSystem>();
IEntity device1 = null;
IEntity device2 = null;
EntityUid device1 = default;
EntityUid device2 = default;
DeviceNetworkComponent networkComponent1 = null;
DeviceNetworkComponent networkComponent2 = null;
WiredNetworkComponent wiredNetworkComponent = null;

16
Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
View File

@@ -37,7 +37,7 @@ namespace Content.IntegrationTests.Tests.Disposal
}
}
private void UnitInsert(DisposalUnitComponent unit, bool result, params IEntity[] entities)
private void UnitInsert(DisposalUnitComponent unit, bool result, params EntityUid[] entities)
{
var system = EntitySystem.Get<DisposalUnitSystem>();
@@ -48,7 +48,7 @@ namespace Content.IntegrationTests.Tests.Disposal
}
}
private void UnitContains(DisposalUnitComponent unit, bool result, params IEntity[] entities)
private void UnitContains(DisposalUnitComponent unit, bool result, params EntityUid[] entities)
{
foreach (var entity in entities)
{
@@ -56,13 +56,13 @@ namespace Content.IntegrationTests.Tests.Disposal
}
}
private void UnitInsertContains(DisposalUnitComponent unit, bool result, params IEntity[] entities)
private void UnitInsertContains(DisposalUnitComponent unit, bool result, params EntityUid[] entities)
{
UnitInsert(unit, result, entities);
UnitContains(unit, result, entities);
}
private void Flush(DisposalUnitComponent unit, bool result, params IEntity[] entities)
private void Flush(DisposalUnitComponent unit, bool result, params EntityUid[] entities)
{
Assert.That(unit.ContainedEntities, Is.SupersetOf(entities));
Assert.That(entities.Length, Is.EqualTo(unit.ContainedEntities.Count));
@@ -127,10 +127,10 @@ namespace Content.IntegrationTests.Tests.Disposal
var server = StartServer(options);
await server.WaitIdleAsync();
IEntity human = default!;
IEntity wrench = default!;
IEntity disposalUnit = default!;
IEntity disposalTrunk = default!;
EntityUid human = default!;
EntityUid wrench = default!;
EntityUid disposalUnit = default!;
EntityUid disposalTrunk = default!;
DisposalUnitComponent unit = default!;
var mapManager = server.ResolveDependency<IMapManager>();

8
Content.IntegrationTests/Tests/Doors/AirlockTest.cs
View File

@@ -56,7 +56,7 @@ namespace Content.IntegrationTests.Tests.Doors
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
EntityUid airlock = null;
EntityUid airlock = default;
ServerDoorComponent doorComponent = null;
server.Assert(() =>
@@ -97,7 +97,7 @@ namespace Content.IntegrationTests.Tests.Doors
{
Assert.DoesNotThrow(() =>
{
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) airlock);
IoCManager.Resolve<IEntityManager>().DeleteEntity(airlock);
});
});
@@ -121,8 +121,8 @@ namespace Content.IntegrationTests.Tests.Doors
var entityManager = server.ResolveDependency<IEntityManager>();
IPhysBody physBody = null;
EntityUid physicsDummy = null;
EntityUid airlock = null;
EntityUid physicsDummy = default;
EntityUid airlock = default;
ServerDoorComponent doorComponent = null;
var physicsDummyStartingX = -1;

8
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -15,7 +15,7 @@ using Robust.Shared.Timing;
namespace Content.IntegrationTests.Tests
{
[TestFixture]
[TestOf(typeof(IEntity))]
[TestOf(typeof(EntityUid))]
public class EntityTest : ContentIntegrationTest
{
[Test]
@@ -89,7 +89,7 @@ namespace Content.IntegrationTests.Tests
testEntity = entityMan.SpawnEntity(prototype.ID, testLocation);
server.RunTicks(2);
Assert.That((!IoCManager.Resolve<IEntityManager>().EntityExists(testEntity) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(testEntity).EntityLifeStage) >= EntityLifeStage.Initialized);
entityMan.DeleteEntity((EntityUid) testEntity);
entityMan.DeleteEntity(testEntity);
}, "Entity '{0}' threw an exception.",
prototype.ID);
}
@@ -194,7 +194,7 @@ namespace Content.IntegrationTests.Tests
server.RunTicks(2);
entityManager.DeleteEntity((EntityUid) entity);
entityManager.DeleteEntity(entity);
}
});
});
@@ -336,7 +336,7 @@ namespace Content.IntegrationTests.Tests
}
server.RunTicks(2);
entityManager.DeleteEntity((EntityUid) entity);
entityManager.DeleteEntity(entity);
}
});
});

5
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -85,12 +85,11 @@ namespace Content.IntegrationTests.Tests.Fluids
var sPauseManager = server.ResolveDependency<IPauseManager>();
var sTileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
var sGameTiming = server.ResolveDependency<IGameTiming>();
var sEntityManager = server.ResolveDependency<IEntityManager>();
MapId sMapId = default;
IMapGrid sGrid;
GridId sGridId = default;
EntityUid sGridEntity = null;
EntityUid sGridEntity = default;
EntityCoordinates sCoordinates = default;
// Spawn a paused map with one tile to spawn puddles on
@@ -100,7 +99,7 @@ namespace Content.IntegrationTests.Tests.Fluids
sPauseManager.SetMapPaused(sMapId, true);
sGrid = sMapManager.CreateGrid(sMapId);
sGridId = sGrid.Index;
sGridEntity = sEntityManager.GetEntity(sGrid.GridEntityId);
sGridEntity = sGrid.GridEntityId;
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(sGridEntity).EntityPaused = true; // See https://github.com/space-wizards/RobustToolbox/issues/1444
var tileDefinition = sTileDefinitionManager["underplating"];

24
Content.IntegrationTests/Tests/GameObjects/Components/ActionBlocking/HandCuffTest.cs
View File

@@ -42,10 +42,10 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes};
var server = StartServer(options);
IEntity human;
IEntity otherHuman;
IEntity cuffs;
IEntity secondCuffs;
EntityUid human;
EntityUid otherHuman;
EntityUid cuffs;
EntityUid secondCuffs;
CuffableComponent cuffed;
HandsComponent hands;
@@ -63,16 +63,14 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
cuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
secondCuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(otherHuman).WorldPosition;
entityManager.GetComponent<TransformComponent>(human).WorldPosition = entityManager.GetComponent<TransformComponent>(otherHuman).WorldPosition;
// Test for components existing
ref CuffableComponent? comp = ref cuffed!;
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out comp), $"Human has no {nameof(CuffableComponent)}");
ref HandsComponent? comp1 = ref hands!;
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out comp1), $"Human has no {nameof(HandsComponent)}");
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out SharedBodyComponent? _), $"Human has no {nameof(SharedBodyComponent)}");
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(cuffs, out HandcuffComponent? _), $"Handcuff has no {nameof(HandcuffComponent)}");
Assert.True(IoCManager.Resolve<IEntityManager>().TryGetComponent(secondCuffs, out HandcuffComponent? _), $"Second handcuffs has no {nameof(HandcuffComponent)}");
Assert.True(entityManager.TryGetComponent(human, out cuffed), $"Human has no {nameof(CuffableComponent)}");
Assert.True(entityManager.TryGetComponent(human, out hands), $"Human has no {nameof(HandsComponent)}");
Assert.True(entityManager.TryGetComponent(human, out SharedBodyComponent? _), $"Human has no {nameof(SharedBodyComponent)}");
Assert.True(entityManager.TryGetComponent(cuffs, out HandcuffComponent? _), $"Handcuff has no {nameof(HandcuffComponent)}");
Assert.True(entityManager.TryGetComponent(secondCuffs, out HandcuffComponent? _), $"Second handcuffs has no {nameof(HandcuffComponent)}");
// Test to ensure cuffed players register the handcuffs
cuffed.TryAddNewCuffs(human, cuffs);
@@ -94,7 +92,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
await server.WaitIdleAsync();
}
private void AddHand(IEntity to)
private void AddHand(EntityUid to)
{
var host = IoCManager.Resolve<IServerConsoleHost>();
host.ExecuteCommand(null, $"addhand {to}");

41
Content.IntegrationTests/Tests/GameObjects/Components/Mobs/ActionsComponentTests.cs
View File

@@ -66,13 +66,16 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitIdleAsync();
await client.WaitIdleAsync();
var cEntities = IoCManager.Resolve<IEntityManager>();
var sEntities = IoCManager.Resolve<IEntityManager>();
var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
var innateActions = new List<ActionType>();
await server.WaitAssertion(() =>
{
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!);
var actionsComponent = sEntities.GetComponent<ServerActionsComponent>(playerEnt!.Value);
// player should begin with their innate actions granted
innateActions.AddRange(actionsComponent.InnateActions);
@@ -99,7 +102,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
{
var local = clientPlayerMgr.LocalPlayer;
var controlled = local!.ControlledEntity;
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!);
var actionsComponent = cEntities.GetComponent<ClientActionsComponent>(controlled!);
// we should have our innate actions and debug1.
foreach (var innateAction in innateActions)
@@ -123,14 +126,14 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
if (expectEmpty)
{
Assert.That(slot.HasAssignment, Is.False);
Assert.That(slot.Item, Is.Null);
Assert.That(slot.Item, Is.EqualTo(default));
Assert.That(slot.Action, Is.Null);
Assert.That(slot.ActionEnabled, Is.False);
continue;
}
Assert.That(slot.HasAssignment);
// all the actions we gave so far are not tied to an item
Assert.That(slot.Item, Is.Null);
Assert.That(slot.Item, Is.EqualTo(default));
Assert.That(slot.Action, Is.Not.Null);
Assert.That(slot.ActionEnabled);
var asAction = slot.Action as ActionPrototype;
@@ -154,7 +157,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() =>
{
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!);
var actionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(playerEnt!.Value);
actionsComponent.Revoke(ActionType.DebugInstant);
});
@@ -189,7 +192,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
var expected = expectedOrder[idx++];
Assert.That(slot.HasAssignment);
// all the actions we gave so far are not tied to an item
Assert.That(slot.Item, Is.Null);
Assert.That(slot.Item, Is.EqualTo(default));
Assert.That(slot.Action, Is.Not.Null);
var asAction = slot.Action as ActionPrototype;
Assert.That(asAction, Is.Not.Null);
@@ -207,7 +210,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
else
{
Assert.That(slot.HasAssignment, Is.False);
Assert.That(slot.Item, Is.Null);
Assert.That(slot.Item, Is.EqualTo(default));
Assert.That(slot.Action, Is.Null);
Assert.That(slot.ActionEnabled, Is.False);
}
@@ -232,6 +235,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitIdleAsync();
await client.WaitIdleAsync();
var clientEntities = client.ResolveDependency<IEntityManager>();
var serverPlayerManager = server.ResolveDependency<IPlayerManager>();
var serverEntManager = server.ResolveDependency<IEntityManager>();
var serverGameTiming = server.ResolveDependency<IGameTiming>();
@@ -240,18 +245,18 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
ServerActionsComponent serverActionsComponent = null;
ClientActionsComponent clientActionsComponent = null;
IEntity serverPlayerEnt = null;
IEntity serverFlashlight = null;
EntityUid serverPlayerEnt = default;
EntityUid serverFlashlight = default;
await server.WaitAssertion(() =>
{
serverPlayerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
serverActionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerActionsComponent>(serverPlayerEnt!);
serverPlayerEnt = serverPlayerManager.Sessions.Single().AttachedEntity!.Value;
serverActionsComponent = serverEntManager.GetComponent<ServerActionsComponent>(serverPlayerEnt);
// spawn and give them an item that has actions
serverFlashlight = serverEntManager.SpawnEntity("TestFlashlight",
new EntityCoordinates(serverPlayerEnt, (0, 0)));
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent<ItemActionsComponent?>(serverFlashlight, out var itemActions));
Assert.That(serverEntManager.TryGetComponent<ItemActionsComponent>(serverFlashlight, out var itemActions));
// we expect this only to have a toggle light action initially
var actionConfigs = itemActions.ActionConfigs.ToList();
Assert.That(actionConfigs.Count == 1);
@@ -260,11 +265,11 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
// grant an extra item action, before pickup, initially disabled
itemActions.GrantOrUpdate(ItemActionType.DebugToggle, false);
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt).PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(serverFlashlight), false);
serverEntManager.GetComponent<HandsComponent>(serverPlayerEnt).PutInHand(serverEntManager.GetComponent<ItemComponent>(serverFlashlight), false);
// grant an extra item action, after pickup, with a cooldown
itemActions.GrantOrUpdate(ItemActionType.DebugInstant, cooldown: cooldown);
Assert.That(serverActionsComponent.TryGetItemActionStates((EntityUid) serverFlashlight, out var state));
Assert.That(serverActionsComponent.TryGetItemActionStates(serverFlashlight, out var state));
// they should have been granted all 3 actions
Assert.That(state.Count == 3);
Assert.That(state.TryGetValue(ItemActionType.ToggleLight, out var toggleLightState));
@@ -286,7 +291,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
{
var local = clientPlayerMgr.LocalPlayer;
var controlled = local!.ControlledEntity;
clientActionsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ClientActionsComponent>(controlled!);
clientActionsComponent = clientEntities.GetComponent<ClientActionsComponent>(controlled!);
var lightEntry = clientActionsComponent.ItemActionStates()
.Where(entry => entry.Value.ContainsKey(ItemActionType.ToggleLight))
@@ -334,8 +339,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
await server.WaitAssertion(() =>
{
// drop the item, and the item actions should go away
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt)
.TryDropEntity(serverFlashlight, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(serverPlayerEnt).Coordinates, false);
serverEntManager.GetComponent<HandsComponent>(serverPlayerEnt)
.TryDropEntity(serverFlashlight, serverEntManager.GetComponent<TransformComponent>(serverPlayerEnt).Coordinates, false);
Assert.That(serverActionsComponent.ItemActionStates().ContainsKey(serverFlashlight), Is.False);
});
@@ -352,7 +357,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
{
// pick the item up again, the states should be back to what they were when dropped,
// as the states "stick" with the item
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(serverPlayerEnt).PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(serverFlashlight), false);
serverEntManager.GetComponent<HandsComponent>(serverPlayerEnt).PutInHand(serverEntManager.GetComponent<ItemComponent>(serverFlashlight), false);
Assert.That(serverActionsComponent.ItemActionStates().TryGetValue(serverFlashlight, out var lightStates));
Assert.That(lightStates.TryGetValue(ItemActionType.ToggleLight, out var lightState));
Assert.That(lightState.Equals(new ActionState(true, toggledOn: true)));

4
Content.IntegrationTests/Tests/GameObjects/Components/Mobs/AlertsComponentTests.cs
View File

@@ -31,7 +31,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
{
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
Assert.NotNull(playerEnt);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt!.Value);
Assert.NotNull(alertsComponent);
// show 2 alerts
@@ -71,7 +71,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Mobs
{
var playerEnt = serverPlayerManager.Sessions.Single().AttachedEntity;
Assert.NotNull(playerEnt);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt);
var alertsComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ServerAlertsComponent>(playerEnt!.Value);
Assert.NotNull(alertsComponent);
alertsComponent.ClearAlert(AlertType.Debug1);

12
Content.IntegrationTests/Tests/GameObjects/Components/Movement/ClimbUnitTest.cs
View File

@@ -37,8 +37,8 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement
var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes};
var server = StartServer(options);
IEntity human;
IEntity table;
EntityUid human;
EntityUid table;
ClimbingComponent climbing;
server.Assert(() =>
@@ -54,19 +54,17 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.Movement
// Test for climb components existing
// Players and tables should have these in their prototypes.
ref ClimbingComponent? comp = ref climbing!;
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(human, out comp), "Human has no climbing");
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(table, out ClimbableComponent? _), "Table has no climbable");
Assert.That(entityManager.TryGetComponent(human, out climbing), "Human has no climbing");
Assert.That(entityManager.TryGetComponent(table, out ClimbableComponent? _), "Table has no climbable");
// Now let's make the player enter a climbing transitioning state.
climbing.IsClimbing = true;
climbing.TryMoveTo(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(human).WorldPosition, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(table).WorldPosition);
var body = IoCManager.Resolve<IEntityManager>().GetComponent<IPhysBody>(human);
var body = entityManager.GetComponent<IPhysBody>(human);
// TODO: Check it's climbing
// Force the player out of climb state. It should immediately remove the ClimbController.
climbing.IsClimbing = false;
});
await server.WaitIdleAsync();

3
Content.IntegrationTests/Tests/Gravity/WeightlessStatusTests.cs
View File

@@ -1,7 +1,6 @@
using System.Threading.Tasks;
using Content.Server.Gravity;
using Content.Server.Gravity.EntitySystems;
using Content.Shared.Acts;
using Content.Shared.Alert;
using Content.Shared.Coordinates;
using NUnit.Framework;
@@ -44,7 +43,7 @@ namespace Content.IntegrationTests.Tests.Gravity
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
IEntity human = null;
EntityUid human = default;
SharedAlertsComponent alerts = null;
await server.WaitAssertion(() =>

10
Content.IntegrationTests/Tests/GravityGridTest.cs
View File

@@ -33,7 +33,7 @@ namespace Content.IntegrationTests.Tests
var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes};
var server = StartServer(options);
IEntity generator = null;
EntityUid generator = default;
IMapGrid grid1 = null;
IMapGrid grid2 = null;
@@ -65,9 +65,8 @@ namespace Content.IntegrationTests.Tests
Assert.That(generatorComponent.GravityActive, Is.True);
var entityMan = IoCManager.Resolve<IEntityManager>();
var grid1Entity = entityMan.GetEntity(grid1.GridEntityId);
var grid2Entity = entityMan.GetEntity(grid2.GridEntityId);
var grid1Entity = grid1.GridEntityId;
var grid2Entity = grid2.GridEntityId;
Assert.That(!IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid1Entity).Enabled);
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid2Entity).Enabled);
@@ -83,8 +82,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(generatorComponent.GravityActive, Is.False);
var entityMan = IoCManager.Resolve<IEntityManager>();
var grid2Entity = entityMan.GetEntity(grid2.GridEntityId);
var grid2Entity = grid2.GridEntityId;
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<GravityComponent>(grid2Entity).Enabled, Is.False);
});

2
Content.IntegrationTests/Tests/GridTileLookupTest.cs
View File

@@ -32,7 +32,7 @@ namespace Content.IntegrationTests.Tests
server.Assert(() =>
{
List<IEntity> entities;
List<EntityUid> entities;
var mapOne = mapManager.CreateMap();
var gridOne = mapManager.CreateGrid(mapOne);

10
Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
View File

@@ -61,10 +61,10 @@ namespace Content.IntegrationTests.Tests
var options = new ServerIntegrationOptions{ExtraPrototypes = Prototypes};
var server = StartServer(options);
IEntity human = null;
IEntity uniform = null;
IEntity idCard = null;
IEntity pocketItem = null;
EntityUid human = default;
EntityUid uniform = default;
EntityUid idCard = default;
EntityUid pocketItem = default;
InventoryComponent inventory = null;
server.Assert(() =>
@@ -121,7 +121,7 @@ namespace Content.IntegrationTests.Tests
await server.WaitIdleAsync();
}
private static bool IsDescendant(IEntity descendant, IEntity parent)
private static bool IsDescendant(EntityUid descendant, EntityUid parent)
{
var tmpParent = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(descendant).Parent;
while (tmpParent != null)

138
Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
View File

@@ -49,7 +49,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var mapId = MapId.Nullspace;
@@ -61,16 +61,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
await server.WaitIdleAsync();
IEntity user = null;
IEntity target = null;
IEntity item = null;
EntityUid user = default;
EntityUid target = default;
EntityUid item = default;
server.Assert(() =>
{
user = entityManager.SpawnEntity(null, coords);
user = sEntities.SpawnEntity(null, coords);
user.EnsureComponent<HandsComponent>().AddHand("hand", HandLocation.Left);
target = entityManager.SpawnEntity(null, coords);
item = entityManager.SpawnEntity(null, coords);
target = sEntities.SpawnEntity(null, coords);
item = sEntities.SpawnEntity(null, coords);
item.EnsureComponent<ItemComponent>();
});
@@ -89,16 +89,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
testInteractionSystem.InteractUsingEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactUsing = true; };
testInteractionSystem.InteractHandEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactHand = true; };
interactionSystem.DoAttack(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.DoAttack(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(attack);
Assert.That(interactUsing, Is.False);
Assert.That(interactHand);
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item)));
Assert.That(sEntities.TryGetComponent<HandsComponent>(user, out var hands));
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(interactUsing);
});
@@ -119,7 +119,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var mapId = MapId.Nullspace;
@@ -131,19 +131,19 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
await server.WaitIdleAsync();
IEntity user = null;
IEntity target = null;
IEntity item = null;
IEntity wall = null;
EntityUid user = default;
EntityUid target = default;
EntityUid item = default;
EntityUid wall = default;
server.Assert(() =>
{
user = entityManager.SpawnEntity(null, coords);
user = sEntities.SpawnEntity(null, coords);
user.EnsureComponent<HandsComponent>().AddHand("hand", HandLocation.Left);
target = entityManager.SpawnEntity(null, new MapCoordinates((1.9f, 0), mapId));
item = entityManager.SpawnEntity(null, coords);
target = sEntities.SpawnEntity(null, new MapCoordinates((1.9f, 0), mapId));
item = sEntities.SpawnEntity(null, coords);
item.EnsureComponent<ItemComponent>();
wall = entityManager.SpawnEntity("DummyDebugWall", new MapCoordinates((1, 0), IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(user).MapID));
wall = sEntities.SpawnEntity("DummyDebugWall", new MapCoordinates((1, 0), sEntities.GetComponent<TransformComponent>(user).MapID));
});
await server.WaitRunTicks(1);
@@ -161,16 +161,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
testInteractionSystem.InteractUsingEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactUsing = true; };
testInteractionSystem.InteractHandEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactHand = true; };
interactionSystem.DoAttack(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.DoAttack(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(attack, Is.False);
Assert.That(interactUsing, Is.False);
Assert.That(interactHand, Is.False);
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item)));
Assert.That(sEntities.TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(interactUsing, Is.False);
});
@@ -190,7 +190,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var mapId = MapId.Nullspace;
@@ -202,16 +202,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
await server.WaitIdleAsync();
IEntity user = null;
IEntity target = null;
IEntity item = null;
EntityUid user = default;
EntityUid target = default;
EntityUid item = default;
server.Assert(() =>
{
user = entityManager.SpawnEntity(null, coords);
user = sEntities.SpawnEntity(null, coords);
user.EnsureComponent<HandsComponent>().AddHand("hand", HandLocation.Left);
target = entityManager.SpawnEntity(null, new MapCoordinates((InteractionSystem.InteractionRange - 0.1f, 0), mapId));
item = entityManager.SpawnEntity(null, coords);
target = sEntities.SpawnEntity(null, new MapCoordinates((InteractionSystem.InteractionRange - 0.1f, 0), mapId));
item = sEntities.SpawnEntity(null, coords);
item.EnsureComponent<ItemComponent>();
});
@@ -230,16 +230,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
testInteractionSystem.InteractUsingEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactUsing = true; };
testInteractionSystem.InteractHandEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactHand = true; };
interactionSystem.DoAttack(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.DoAttack(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(attack);
Assert.That(interactUsing, Is.False);
Assert.That(interactHand);
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item)));
Assert.That(sEntities.TryGetComponent<HandsComponent>(user, out var hands));
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(interactUsing);
});
@@ -260,7 +260,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var mapId = MapId.Nullspace;
@@ -272,16 +272,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
await server.WaitIdleAsync();
IEntity user = null;
IEntity target = null;
IEntity item = null;
EntityUid user = default;
EntityUid target = default;
EntityUid item = default;
server.Assert(() =>
{
user = entityManager.SpawnEntity(null, coords);
user = sEntities.SpawnEntity(null, coords);
user.EnsureComponent<HandsComponent>().AddHand("hand", HandLocation.Left);
target = entityManager.SpawnEntity(null, new MapCoordinates((InteractionSystem.InteractionRange, 0), mapId));
item = entityManager.SpawnEntity(null, coords);
target = sEntities.SpawnEntity(null, new MapCoordinates((InteractionSystem.InteractionRange, 0), mapId));
item = sEntities.SpawnEntity(null, coords);
item.EnsureComponent<ItemComponent>();
});
@@ -300,16 +300,16 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
testInteractionSystem.InteractUsingEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactUsing = true; };
testInteractionSystem.InteractHandEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(target)); interactHand = true; };
interactionSystem.DoAttack(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.DoAttack(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(attack, Is.False);
Assert.That(interactUsing, Is.False);
Assert.That(interactHand, Is.False);
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item)));
Assert.That(sEntities.TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(interactUsing, Is.False);
});
@@ -330,7 +330,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var mapId = MapId.Nullspace;
@@ -342,21 +342,21 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
await server.WaitIdleAsync();
IEntity user = null;
IEntity target = null;
IEntity item = null;
IEntity containerEntity = null;
EntityUid user = default;
EntityUid target = default;
EntityUid item = default;
EntityUid containerEntity = default;
IContainer container = null;
server.Assert(() =>
{
user = entityManager.SpawnEntity(null, coords);
user = sEntities.SpawnEntity(null, coords);
user.EnsureComponent<HandsComponent>().AddHand("hand", HandLocation.Left);
target = entityManager.SpawnEntity(null, coords);
item = entityManager.SpawnEntity(null, coords);
target = sEntities.SpawnEntity(null, coords);
item = sEntities.SpawnEntity(null, coords);
item.EnsureComponent<ItemComponent>();
containerEntity = entityManager.SpawnEntity(null, coords);
container = ContainerHelpers.EnsureContainer<Container>(containerEntity, "InteractionTestContainer");
containerEntity = sEntities.SpawnEntity(null, coords);
container = containerEntity.EnsureContainer<Container>("InteractionTestContainer");
});
await server.WaitRunTicks(1);
@@ -373,31 +373,31 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
server.Assert(() =>
{
Assert.That(container.Insert(user));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(user).Parent.Owner, Is.EqualTo(containerEntity));
Assert.That(sEntities.GetComponent<TransformComponent>(user).Parent.Owner, Is.EqualTo(containerEntity));
testInteractionSystem.AttackEvent = (_, _, ev) => { Assert.That(ev.Target, Is.EqualTo(containerEntity)); attack = true; };
testInteractionSystem.InteractUsingEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(containerEntity)); interactUsing = true; };
testInteractionSystem.InteractHandEvent = (ev) => { Assert.That(ev.Target, Is.EqualTo(containerEntity)); interactHand = true; };
interactionSystem.DoAttack(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.DoAttack(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, false, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(attack, Is.False);
Assert.That(interactUsing, Is.False);
Assert.That(interactHand, Is.False);
interactionSystem.DoAttack(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(containerEntity).Coordinates, false, containerEntity);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(containerEntity).Coordinates, containerEntity);
interactionSystem.DoAttack(user, sEntities.GetComponent<TransformComponent>(containerEntity).Coordinates, false, containerEntity);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(containerEntity).Coordinates, containerEntity);
Assert.That(attack);
Assert.That(interactUsing, Is.False);
Assert.That(interactHand);
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(item)));
Assert.That(sEntities.TryGetComponent<HandsComponent?>(user, out var hands));
Assert.That(hands.PutInHand(sEntities.GetComponent<ItemComponent>(item)));
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(target).Coordinates, target);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(target).Coordinates, target);
Assert.That(interactUsing, Is.False);
interactionSystem.UserInteraction(user, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(containerEntity).Coordinates, containerEntity);
interactionSystem.UserInteraction(user, sEntities.GetComponent<TransformComponent>(containerEntity).Coordinates, containerEntity);
Assert.That(interactUsing, Is.True);
});

18
Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
View File

@@ -34,11 +34,11 @@ namespace Content.IntegrationTests.Tests.Interaction
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
IEntity origin = null;
IEntity other = null;
EntityUid origin = default;
EntityUid other = default;
IContainer container = null;
IComponent component = null;
EntityCoordinates entityCoordinates = default;
@@ -49,12 +49,12 @@ namespace Content.IntegrationTests.Tests.Interaction
var mapId = mapManager.CreateMap();
var coordinates = new MapCoordinates(Vector2.Zero, mapId);
origin = entityManager.SpawnEntity(HumanId, coordinates);
other = entityManager.SpawnEntity(HumanId, coordinates);
container = ContainerHelpers.EnsureContainer<Container>(other, "InRangeUnobstructedTestOtherContainer");
component = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(other);
entityCoordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(other).Coordinates;
mapCoordinates = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(other).MapPosition;
origin = sEntities.SpawnEntity(HumanId, coordinates);
other = sEntities.SpawnEntity(HumanId, coordinates);
container = other.EnsureContainer<Container>("InRangeUnobstructedTestOtherContainer");
component = sEntities.GetComponent<TransformComponent>(other);
entityCoordinates = sEntities.GetComponent<TransformComponent>(other).Coordinates;
mapCoordinates = sEntities.GetComponent<TransformComponent>(other).MapPosition;
});
await server.WaitIdleAsync();

27
Content.IntegrationTests/Tests/InventoryHelpersTest.cs
View File

@@ -8,7 +8,6 @@ using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Prototypes;
using static Content.Shared.Inventory.EquipmentSlotDefines;
namespace Content.IntegrationTests.Tests
@@ -50,19 +49,21 @@ namespace Content.IntegrationTests.Tests
var options = new ServerIntegrationOptions {ExtraPrototypes = Prototypes};
var server = StartServer(options);
IEntity human = null;
await server.WaitIdleAsync();
var sEntities = server.ResolveDependency<IEntityManager>();
EntityUid human = default;
InventoryComponent inventory = null;
server.Assert(() =>
await server.WaitAssertion(() =>
{
var mapMan = IoCManager.Resolve<IMapManager>();
mapMan.CreateNewMapEntity(MapId.Nullspace);
var entityMan = IoCManager.Resolve<IEntityManager>();
human = entityMan.SpawnEntity("InventoryStunnableDummy", MapCoordinates.Nullspace);
inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(human);
human = sEntities.SpawnEntity("InventoryStunnableDummy", MapCoordinates.Nullspace);
inventory = sEntities.GetComponent<InventoryComponent>(human);
// Can't do the test if this human doesn't have the slots for it.
Assert.That(inventory.HasSlot(Slots.INNERCLOTHING));
@@ -72,7 +73,10 @@ namespace Content.IntegrationTests.Tests
// Do we actually have the uniform equipped?
Assert.That(inventory.TryGetSlotItem(Slots.INNERCLOTHING, out ItemComponent uniform));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(uniform.Owner).EntityPrototype != null && IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(uniform.Owner).EntityPrototype.ID == "InventoryJumpsuitJanitorDummy");
Assert.That(sEntities.GetComponent<MetaDataComponent>(uniform.Owner).EntityPrototype is
{
ID: "InventoryJumpsuitJanitorDummy"
});
EntitySystem.Get<StunSystem>().TryStun(human, TimeSpan.FromSeconds(1f));
@@ -85,10 +89,11 @@ namespace Content.IntegrationTests.Tests
// Let's try skipping the interaction check and see if it equips it!
Assert.That(inventory.SpawnItemInSlot(Slots.IDCARD, "InventoryIDCardDummy"));
Assert.That(inventory.TryGetSlotItem(Slots.IDCARD, out ItemComponent id));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityPrototype != null && IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(id.Owner).EntityPrototype.ID == "InventoryIDCardDummy");
Assert.That(sEntities.GetComponent<MetaDataComponent>(id.Owner).EntityPrototype is
{
ID: "InventoryIDCardDummy"
});
});
await server.WaitIdleAsync();
}
}
}

14
Content.IntegrationTests/Tests/MindEntityDeletionTest.cs
View File

@@ -20,8 +20,8 @@ namespace Content.IntegrationTests.Tests
{
var (_, server) = await StartConnectedServerDummyTickerClientPair();
IEntity playerEnt = null;
IEntity visitEnt = null;
EntityUid playerEnt = default;
EntityUid visitEnt = default;
Mind mind = null;
server.Assert(() =>
{
@@ -49,12 +49,12 @@ namespace Content.IntegrationTests.Tests
server.Assert(() =>
{
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) visitEnt);
IoCManager.Resolve<IEntityManager>().DeleteEntity(visitEnt);
Assert.That(mind.VisitingEntity, Is.Null);
Assert.That(mind.VisitingEntity, Is.EqualTo(default));
// This used to throw so make sure it doesn't.
IoCManager.Resolve<IEntityManager>().DeleteEntity((EntityUid) playerEnt);
IoCManager.Resolve<IEntityManager>().DeleteEntity(playerEnt);
});
await server.WaitIdleAsync();
@@ -66,7 +66,7 @@ namespace Content.IntegrationTests.Tests
// Has to be a non-dummy ticker so we have a proper map.
var (_, server) = await StartConnectedServerClientPair();
IEntity playerEnt = null;
EntityUid playerEnt = default;
Mind mind = null;
server.Assert(() =>
{
@@ -110,7 +110,7 @@ namespace Content.IntegrationTests.Tests
// Has to be a non-dummy ticker so we have a proper map.
var (_, server) = await StartConnectedServerClientPair();
IEntity playerEnt = null;
EntityUid playerEnt = default;
Mind mind = null;
MapId map = default;
server.Assert(() =>

3
Content.IntegrationTests/Tests/Networking/ConnectTest.cs
View File

@@ -55,8 +55,7 @@ namespace Content.IntegrationTests.Tests.Networking
var clEntityManager = client.ResolveDependency<IEntityManager>();
var svEntityManager = server.ResolveDependency<IEntityManager>();
IEntity tempQualifier = svEntityManager.GetEntities().Last();
var lastSvEntity = (EntityUid) tempQualifier;
var lastSvEntity = svEntityManager.GetEntities().Last();
Assert.That(clEntityManager.GetComponent<TransformComponent>(lastSvEntity).Coordinates,
Is.EqualTo(svEntityManager.GetComponent<TransformComponent>(lastSvEntity).Coordinates));

9
Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
View File

@@ -12,7 +12,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.GameStates;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.Reflection;
using Robust.Shared.Serialization;
using Robust.Shared.Timing;
@@ -77,7 +76,7 @@ namespace Content.IntegrationTests.Tests.Networking
var cGameTiming = client.ResolveDependency<IGameTiming>();
var cGameStateManager = client.ResolveDependency<IClientGameStateManager>();
IEntity serverEnt = default!;
EntityUid serverEnt = default;
PredictionTestComponent serverComponent = default!;
PredictionTestComponent clientComponent = default!;
@@ -112,8 +111,7 @@ namespace Content.IntegrationTests.Tests.Networking
await client.WaitPost(() =>
{
IEntity tempQualifier = cEntityManager.GetEntity(serverEnt);
clientComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(tempQualifier);
clientComponent = cEntityManager.GetComponent<PredictionTestComponent>(serverEnt);
});
Assert.That(clientComponent.Foo, Is.False);
@@ -456,8 +454,7 @@ namespace Content.IntegrationTests.Tests.Networking
private void HandleMessage(SetFooMessage message, EntitySessionEventArgs args)
{
var entity = EntityManager.GetEntity(message.Uid);
var component = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(entity);
var component = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(message.Uid);
var old = component.Foo;
if (Allow)
{

29
Content.IntegrationTests/Tests/PDA/PDAExtensionsTests.cs
View File

@@ -9,7 +9,6 @@ using Content.Shared.Containers.ItemSlots;
using NUnit.Framework;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.IntegrationTests.Tests.PDA
{
@@ -60,7 +59,7 @@ namespace Content.IntegrationTests.Tests.PDA
await server.WaitAssertion(() =>
{
var player = sPlayerManager.Sessions.Single().AttachedEntity;
var player = sPlayerManager.Sessions.Single().AttachedEntity!.Value;
Assert.NotNull(player);
@@ -70,14 +69,14 @@ namespace Content.IntegrationTests.Tests.PDA
Assert.NotNull(id);
// Put PDA in hand
var dummyPda = sEntityManager.SpawnEntity(PdaDummy, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player).MapPosition);
var pdaItemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(dummyPda);
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player).PutInHand(pdaItemComponent);
var dummyPda = sEntityManager.SpawnEntity(PdaDummy, sEntityManager.GetComponent<TransformComponent>(player).MapPosition);
var pdaItemComponent = sEntityManager.GetComponent<ItemComponent>(dummyPda);
sEntityManager.GetComponent<HandsComponent>(player).PutInHand(pdaItemComponent);
var pdaComponent = IoCManager.Resolve<IEntityManager>().GetComponent<PDAComponent>(dummyPda);
var pdaIdCard = sEntityManager.SpawnEntity(IdCardDummy, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player).MapPosition);
var pdaComponent = sEntityManager.GetComponent<PDAComponent>(dummyPda);
var pdaIdCard = sEntityManager.SpawnEntity(IdCardDummy, sEntityManager.GetComponent<TransformComponent>(player).MapPosition);
var itemSlots = IoCManager.Resolve<IEntityManager>().GetComponent<ItemSlotsComponent>(dummyPda);
var itemSlots = sEntityManager.GetComponent<ItemSlotsComponent>(dummyPda);
sEntityManager.EntitySysManager.GetEntitySystem<ItemSlotsSystem>()
.TryInsert(dummyPda, pdaComponent.IdSlot, pdaIdCard);
var pdaContainedId = pdaComponent.ContainedID;
@@ -90,11 +89,11 @@ namespace Content.IntegrationTests.Tests.PDA
Assert.That(id, Is.EqualTo(pdaContainedId));
// Put ID card in hand
var idDummy = sEntityManager.SpawnEntity(IdCardDummy, IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player).MapPosition);
var idItemComponent = IoCManager.Resolve<IEntityManager>().GetComponent<ItemComponent>(idDummy);
IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player).PutInHand(idItemComponent);
var idDummy = sEntityManager.SpawnEntity(IdCardDummy, sEntityManager.GetComponent<TransformComponent>(player).MapPosition);
var idItemComponent = sEntityManager.GetComponent<ItemComponent>(idDummy);
sEntityManager.GetComponent<HandsComponent>(player).PutInHand(idItemComponent);
var idCardComponent = IoCManager.Resolve<IEntityManager>().GetComponent<IdCardComponent>(idDummy);
var idCardComponent = sEntityManager.GetComponent<IdCardComponent>(idDummy);
// The ID in the hand should be found first
Assert.NotNull(player.GetHeldId());
@@ -103,7 +102,7 @@ namespace Content.IntegrationTests.Tests.PDA
Assert.That(id, Is.EqualTo(idCardComponent));
// Remove all IDs and PDAs
var inventory = IoCManager.Resolve<IEntityManager>().GetComponent<InventoryComponent>(player);
var inventory = sEntityManager.GetComponent<InventoryComponent>(player);
foreach (var slot in inventory.Slots)
{
@@ -114,13 +113,13 @@ namespace Content.IntegrationTests.Tests.PDA
continue;
}
if (IoCManager.Resolve<IEntityManager>().HasComponent<PDAComponent>(item.Owner))
if (sEntityManager.HasComponent<PDAComponent>(item.Owner))
{
inventory.ForceUnequip(slot);
}
}
var hands = IoCManager.Resolve<IEntityManager>().GetComponent<HandsComponent>(player);
var hands = sEntityManager.GetComponent<HandsComponent>(player);
hands.Drop(dummyPda, false);
hands.Drop(idDummy, false);

11
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
View File

@@ -3,7 +3,6 @@ using NUnit.Framework;
using Robust.Server.Maps;
using Robust.Shared.ContentPack;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Maths;
@@ -26,7 +25,7 @@ namespace Content.IntegrationTests.Tests
await server.WaitIdleAsync();
var mapLoader = server.ResolveDependency<IMapLoader>();
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
var resManager = server.ResolveDependency<IResourceManager>();
server.Post(() =>
@@ -39,14 +38,14 @@ namespace Content.IntegrationTests.Tests
{
var mapGrid = mapManager.CreateGrid(mapId);
var mapGridEnt = entityManager.GetEntity(mapGrid.GridEntityId);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(mapGridEnt).WorldPosition = new Vector2(10, 10);
var mapGridEnt = mapGrid.GridEntityId;
sEntities.GetComponent<TransformComponent>(mapGridEnt).WorldPosition = new Vector2(10, 10);
mapGrid.SetTile(new Vector2i(0,0), new Tile(1, 512));
}
{
var mapGrid = mapManager.CreateGrid(mapId);
var mapGridEnt = entityManager.GetEntity(mapGrid.GridEntityId);
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(mapGridEnt).WorldPosition = new Vector2(-8, -8);
var mapGridEnt = mapGrid.GridEntityId;
sEntities.GetComponent<TransformComponent>(mapGridEnt).WorldPosition = new Vector2(-8, -8);
mapGrid.SetTile(new Vector2i(0, 0), new Tile(2, 511));
}

19
Content.IntegrationTests/Tests/ShuttleTest.cs
View File

@@ -1,10 +1,8 @@
#nullable enable
using System.Threading.Tasks;
using Content.Server.Shuttles;
using Content.Server.Shuttles.Components;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Physics;
@@ -21,30 +19,29 @@ namespace Content.IntegrationTests.Tests
await server.WaitIdleAsync();
var entMan = server.ResolveDependency<IEntityManager>();
var mapMan = server.ResolveDependency<IMapManager>();
IEntity? gridEnt = null;
var sEntities = server.ResolveDependency<IEntityManager>();
EntityUid gridEnt = default;
await server.WaitAssertion(() =>
{
var mapId = mapMan.CreateMap();
var grid = mapMan.CreateGrid(mapId);
gridEnt = entMan.GetEntity(grid.GridEntityId);
gridEnt = grid.GridEntityId;
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(gridEnt, out ShuttleComponent? shuttleComponent));
Assert.That(IoCManager.Resolve<IEntityManager>().TryGetComponent(gridEnt, out PhysicsComponent? physicsComponent));
Assert.That(sEntities.TryGetComponent(gridEnt, out ShuttleComponent? shuttleComponent));
Assert.That(sEntities.TryGetComponent(gridEnt, out PhysicsComponent? physicsComponent));
Assert.That(physicsComponent!.BodyType, Is.EqualTo(BodyType.Dynamic));
Assert.That(IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEnt).LocalPosition, Is.EqualTo(Vector2.Zero));
Assert.That(sEntities.GetComponent<TransformComponent>(gridEnt).LocalPosition, Is.EqualTo(Vector2.Zero));
physicsComponent.ApplyLinearImpulse(Vector2.One);
});
// TODO: Should have tests that collision + rendertree + pointlights work on a moved grid but I'll deal with that
// when we get rotations.
await server.WaitRunTicks(1);
await server.WaitAssertion(() =>
{
Assert.That<Vector2?>((gridEnt != null ? IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEnt) : null).LocalPosition, Is.Not.EqualTo(Vector2.Zero));
Assert.That<Vector2?>(sEntities.GetComponent<TransformComponent>(gridEnt).LocalPosition, Is.Not.EqualTo(Vector2.Zero));
});
}
}

2
Content.IntegrationTests/Tests/Tag/TagTest.cs
View File

@@ -54,7 +54,7 @@ namespace Content.IntegrationTests.Tests.Tag
var sEntityManager = server.ResolveDependency<IEntityManager>();
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
IEntity sTagDummy = null!;
EntityUid sTagDummy = default;
TagComponent sTagComponent = null!;
await server.WaitPost(() =>

2
Content.IntegrationTests/Tests/Utility/EntitySystemExtensionsTest.cs
View File

@@ -46,7 +46,7 @@ namespace Content.IntegrationTests.Tests.Utility
await server.WaitAssertion(() =>
{
var grid = GetMainGrid(sMapManager);
var gridEnt = sEntityManager.GetEntity(grid.GridEntityId);
var gridEnt = grid.GridEntityId;
var gridPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(gridEnt).WorldPosition;
var entityCoordinates = GetMainEntityCoordinates(sMapManager);

19
Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs
View File

@@ -4,7 +4,6 @@ using Content.Shared.Containers.ItemSlots;
using Content.Shared.Whitelist;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
namespace Content.IntegrationTests.Tests.Utility
@@ -66,22 +65,18 @@ namespace Content.IntegrationTests.Tests.Utility
await server.WaitIdleAsync();
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var sEntities = server.ResolveDependency<IEntityManager>();
await server.WaitAssertion(() =>
{
var mapId = GetMainMapId(mapManager);
var mapCoordinates = new MapCoordinates(0, 0, mapId);
IEntity tempQualifier = entityManager.SpawnEntity("ValidComponentDummy", mapCoordinates);
var validComponent = (EntityUid) tempQualifier;
IEntity tempQualifier1 = entityManager.SpawnEntity("ValidTagDummy", mapCoordinates);
var validTag = (EntityUid) tempQualifier1;
var validComponent = sEntities.SpawnEntity("ValidComponentDummy", mapCoordinates);
var validTag = sEntities.SpawnEntity("ValidTagDummy", mapCoordinates);
IEntity tempQualifier2 = entityManager.SpawnEntity("InvalidComponentDummy", mapCoordinates);
var invalidComponent = (EntityUid) tempQualifier2;
IEntity tempQualifier3 = entityManager.SpawnEntity("InvalidTagDummy", mapCoordinates);
var invalidTag = (EntityUid) tempQualifier3;
var invalidComponent = sEntities.SpawnEntity("InvalidComponentDummy", mapCoordinates);
var invalidTag = sEntities.SpawnEntity("InvalidTagDummy", mapCoordinates);
// Test instantiated on its own
var whitelistInst = new EntityWhitelist
@@ -102,8 +97,8 @@ namespace Content.IntegrationTests.Tests.Utility
Assert.That(whitelistInst.IsValid(invalidTag), Is.False);
// Test from serialized
var dummy = entityManager.SpawnEntity("WhitelistDummy", mapCoordinates);
var whitelistSer = IoCManager.Resolve<IEntityManager>().GetComponent<ItemSlotsComponent>(dummy).Slots.Values.First().Whitelist;
var dummy = sEntities.SpawnEntity("WhitelistDummy", mapCoordinates);
var whitelistSer = sEntities.GetComponent<ItemSlotsComponent>(dummy).Slots.Values.First().Whitelist;
Assert.That(whitelistSer, Is.Not.Null);
Assert.That(whitelistSer.Components, Is.Not.Null);