Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

AtmosphereSystem no longer creates a component manually. (#3839)

Browse Source 
- Maps get SpaceGridAtmosphereComponent added automatically
This commit is contained in:
Vera Aguilera Puerto
2021-04-13 13:17:10 +02:00
committed by GitHub
parent 30d5b58319
commit c17426dfa7
21 changed files with 97 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
Content.IntegrationTests/Tests/Atmos/AtmosHelpersTest.cs
View File

@@ -1,172 +0,0 @@
using System.Threading.Tasks;
using Content.Server.Atmos;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests.Atmos
{
[TestFixture]
[TestOf(typeof(AtmosHelpersTest))]
public class AtmosHelpersTest : ContentIntegrationTest
{
[Test]
public async Task GetTileAtmosphereEntityCoordinatesNotNullTest()
{
var server = StartServerDummyTicker();
await server.WaitIdleAsync();
var entityManager = server.ResolveDependency<IEntityManager>();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var atmosphere1 = default(EntityCoordinates).GetTileAtmosphere();
var atmosphere2 = default(EntityCoordinates).GetTileAtmosphere(entityManager);
Assert.NotNull(atmosphere1);
Assert.NotNull(atmosphere2);
});
});
await server.WaitIdleAsync();
}
[Test]
public async Task GetTileAirEntityCoordinatesNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var air = default(EntityCoordinates).GetTileAir();
Assert.NotNull(air);
});
});
await server.WaitIdleAsync();
}
[Test]
public async Task TryGetTileAtmosphereEntityCoordinatesNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var hasAtmosphere = default(EntityCoordinates).TryGetTileAtmosphere(out var atmosphere);
Assert.True(hasAtmosphere);
Assert.NotNull(atmosphere);
});
});
await server.WaitIdleAsync();
}
[Test]
public async Task TryGetTileTileAirEntityCoordinatesNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var hasAir = default(EntityCoordinates).TryGetTileAir(out var air);
Assert.True(hasAir);
Assert.NotNull(air);
});
});
await server.WaitIdleAsync();
}
// ReSharper disable once InconsistentNaming
[Test]
public async Task GetTileAtmosphereVector2iNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var atmosphere = default(Vector2i).GetTileAtmosphere(default);
Assert.NotNull(atmosphere);
});
});
await server.WaitIdleAsync();
}
// ReSharper disable once InconsistentNaming
[Test]
public async Task GetTileAirVector2iNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var air = default(Vector2i).GetTileAir(default);
Assert.NotNull(air);
});
});
await server.WaitIdleAsync();
}
// ReSharper disable once InconsistentNaming
[Test]
public async Task TryGetTileAtmosphereVector2iNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var hasAtmosphere = default(Vector2i).TryGetTileAtmosphere(default, out var atmosphere);
Assert.True(hasAtmosphere);
Assert.NotNull(atmosphere);
});
});
await server.WaitIdleAsync();
}
// ReSharper disable once InconsistentNaming
[Test]
public async Task TryGetTileAirVector2iNotNullTest()
{
var server = StartServerDummyTicker();
server.Assert(() =>
{
Assert.DoesNotThrow(() =>
{
var hasAir = default(Vector2i).TryGetTileAir(default, out var air);
Assert.True(hasAir);
Assert.NotNull(air);
});
});
await server.WaitIdleAsync();
}
}
}

6
Content.IntegrationTests/Tests/Body/LegTest.cs
View File

@@ -8,6 +8,7 @@ using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests.Body
{
@@ -40,11 +41,10 @@ namespace Content.IntegrationTests.Tests.Body
{
var mapManager = IoCManager.Resolve<IMapManager>();
var mapId = new MapId(0);
mapManager.CreateNewMapEntity(mapId);
var mapId = mapManager.CreateMap();
var entityManager = IoCManager.Resolve<IEntityManager>();
var human = entityManager.SpawnEntity("HumanBodyAndAppearanceDummy", MapCoordinates.Nullspace);
var human = entityManager.SpawnEntity("HumanBodyAndAppearanceDummy", new MapCoordinates(Vector2.Zero, mapId));
Assert.That(human.TryGetComponent(out IBody body));
Assert.That(human.TryGetComponent(out appearance));

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

@@ -57,11 +57,11 @@ namespace Content.IntegrationTests.Tests.Body
{
var mapManager = IoCManager.Resolve<IMapManager>();
mapManager.CreateNewMapEntity(MapId.Nullspace);
var mapId = mapManager.CreateMap();
var entityManager = IoCManager.Resolve<IEntityManager>();
var human = entityManager.SpawnEntity("HumanBodyAndBloodstreamDummy", MapCoordinates.Nullspace);
var human = entityManager.SpawnEntity("HumanBodyAndBloodstreamDummy", new MapCoordinates(Vector2.Zero, mapId));
Assert.That(human.TryGetComponent(out IBody body));
Assert.That(body.TryGetMechanismBehaviors(out List<LungBehavior> lungs));

6
Content.IntegrationTests/Tests/Body/MechanismBehaviorEventsTest.cs
View File

@@ -9,6 +9,7 @@ using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests.Body
{
@@ -122,11 +123,10 @@ namespace Content.IntegrationTests.Tests.Body
{
var mapManager = IoCManager.Resolve<IMapManager>();
var mapId = new MapId(0);
mapManager.CreateNewMapEntity(mapId);
var mapId = mapManager.CreateMap();
var entityManager = IoCManager.Resolve<IEntityManager>();
var human = entityManager.SpawnEntity("HumanBodyDummy", MapCoordinates.Nullspace);
var human = entityManager.SpawnEntity("HumanBodyDummy", new MapCoordinates(Vector2.Zero, mapId));
Assert.That(human.TryGetComponent(out IBody? body));
Assert.NotNull(body);

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

@@ -10,6 +10,7 @@ using Robust.Server.Console;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
{
@@ -52,15 +53,16 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components.ActionBlocking
server.Assert(() =>
{
var mapManager = IoCManager.Resolve<IMapManager>();
mapManager.CreateNewMapEntity(MapId.Nullspace);
var mapId = mapManager.CreateMap();
var coordinates = new MapCoordinates(Vector2.Zero, mapId);
var entityManager = IoCManager.Resolve<IEntityManager>();
// Spawn the entities
human = entityManager.SpawnEntity("HumanDummy", MapCoordinates.Nullspace);
otherHuman = entityManager.SpawnEntity("HumanDummy", MapCoordinates.Nullspace);
cuffs = entityManager.SpawnEntity("HandcuffsDummy", MapCoordinates.Nullspace);
secondCuffs = entityManager.SpawnEntity("HandcuffsDummy", MapCoordinates.Nullspace);
human = entityManager.SpawnEntity("HumanDummy", coordinates);
otherHuman = entityManager.SpawnEntity("HumanDummy", coordinates);
cuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
secondCuffs = entityManager.SpawnEntity("HandcuffsDummy", coordinates);
human.Transform.WorldPosition = otherHuman.Transform.WorldPosition;

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

@@ -6,6 +6,7 @@ using NUnit.Framework;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
using Robust.Shared.Maths;
namespace Content.IntegrationTests.Tests.Interaction
{
@@ -44,8 +45,8 @@ namespace Content.IntegrationTests.Tests.Interaction
server.Assert(() =>
{
mapManager.CreateNewMapEntity(MapId.Nullspace);
var coordinates = MapCoordinates.Nullspace;
var mapId = mapManager.CreateMap();
var coordinates = new MapCoordinates(Vector2.Zero, mapId);
origin = entityManager.SpawnEntity(HumanId, coordinates);
other = entityManager.SpawnEntity(HumanId, coordinates);