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

Fix content.integration tests warnings (#17817)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
TemporalOroboros
2023-07-05 21:54:25 -07:00
committed by GitHub
parent 20c1754abd
commit ba91023a85
121 changed files with 3658 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,9 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Content.Shared.CCVar;
using Content.Shared.Coordinates;
using NUnit.Framework;
using Robust.Shared;
using Robust.Shared.Configuration;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
@@ -24,7 +19,7 @@ namespace Content.IntegrationTests.Tests
[Test]
public async Task SpawnAndDeleteAllEntitiesOnDifferentMaps()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, Destructive = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, Destructive = true });
var server = pairTracker.Pair.Server;
var entityMan = server.ResolveDependency<IEntityManager>();
@@ -35,7 +30,7 @@ namespace Content.IntegrationTests.Tests
{
var protoIds = prototypeMan
.EnumeratePrototypes<EntityPrototype>()
.Where(p=>!p.Abstract)
.Where(p => !p.Abstract)
.Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
.Select(p => p.ID)
.ToList();
@@ -52,11 +47,19 @@ namespace Content.IntegrationTests.Tests
await server.WaitPost(() =>
{
var entityMetas = entityMan.EntityQuery<MetaDataComponent>(true).ToList();
foreach (var meta in entityMetas)
static IEnumerable<(EntityUid, TComp)> Query<TComp>(IEntityManager entityMan)
where TComp : Component
{
if(!meta.EntityDeleted)
entityMan.DeleteEntity(meta.Owner);
var query = entityMan.AllEntityQueryEnumerator<TComp>();
while (query.MoveNext(out var uid, out var meta))
yield return (uid, meta);
};
var entityMetas = Query<MetaDataComponent>(entityMan).ToList();
foreach (var (uid, meta) in entityMetas)
{
if (!meta.EntityDeleted)
entityMan.DeleteEntity(uid);
}
Assert.That(entityMan.EntityCount, Is.Zero);
@@ -68,7 +71,7 @@ namespace Content.IntegrationTests.Tests
[Test]
public async Task SpawnAndDeleteAllEntitiesInTheSameSpot()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, Destructive = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, Destructive = true });
var server = pairTracker.Pair.Server;
var map = await PoolManager.CreateTestMap(pairTracker);
@@ -80,7 +83,7 @@ namespace Content.IntegrationTests.Tests
var protoIds = prototypeMan
.EnumeratePrototypes<EntityPrototype>()
.Where(p=>!p.Abstract)
.Where(p => !p.Abstract)
.Where(p => !p.Components.ContainsKey("MapGrid")) // This will smash stuff otherwise.
.Select(p => p.ID)
.ToList();
@@ -92,11 +95,19 @@ namespace Content.IntegrationTests.Tests
await server.WaitRunTicks(15);
await server.WaitPost(() =>
{
var entityMetas = entityMan.EntityQuery<MetaDataComponent>(true).ToList();
foreach (var meta in entityMetas)
static IEnumerable<(EntityUid, TComp)> Query<TComp>(IEntityManager entityMan)
where TComp : Component
{
if(!meta.EntityDeleted)
entityMan.DeleteEntity(meta.Owner);
var query = entityMan.AllEntityQueryEnumerator<TComp>();
while (query.MoveNext(out var uid, out var meta))
yield return (uid, meta);
};
var entityMetas = Query<MetaDataComponent>(entityMan).ToList();
foreach (var (uid, meta) in entityMetas)
{
if (!meta.EntityDeleted)
entityMan.DeleteEntity(uid);
}
Assert.That(entityMan.EntityCount, Is.Zero);
@@ -132,7 +143,7 @@ namespace Content.IntegrationTests.Tests
// for whatever reason, stealth boxes are breaking this test. Surplus crates have a chance of spawning them.
// TODO fix whatever is going wrong here.
HashSet<string> ignored = new() {"GhostBox", "StealthBox", "CrateSyndicateSurplusBundle", "CrateSyndicateSuperSurplusBundle"};
HashSet<string> ignored = new() { "GhostBox", "StealthBox", "CrateSyndicateSurplusBundle", "CrateSyndicateSuperSurplusBundle" };
await server.WaitPost(() =>
{
@@ -159,11 +170,19 @@ namespace Content.IntegrationTests.Tests
await server.WaitPost(() =>
{
var entityMetas = sEntMan.EntityQuery<MetaDataComponent>(true).ToList();
foreach (var meta in entityMetas)
static IEnumerable<(EntityUid, TComp)> Query<TComp>(IEntityManager entityMan)
where TComp : Component
{
var query = entityMan.AllEntityQueryEnumerator<TComp>();
while (query.MoveNext(out var uid, out var meta))
yield return (uid, meta);
};
var entityMetas = Query<MetaDataComponent>(sEntMan).ToList();
foreach (var (uid, meta) in entityMetas)
{
if (!meta.EntityDeleted)
sEntMan.DeleteEntity(meta.Owner);
sEntMan.DeleteEntity(uid);
}
Assert.That(sEntMan.EntityCount, Is.Zero);
@@ -196,13 +215,14 @@ namespace Content.IntegrationTests.Tests
- type: entity
id: AllComponentsOneToOneDeleteTestEntity";
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, ExtraPrototypes = testEntity});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, ExtraPrototypes = testEntity });
var server = pairTracker.Pair.Server;
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
var logmill = server.ResolveDependency<ILogManager>().GetSawmill("EntityTest");
MapGridComponent grid = default;
@@ -255,8 +275,7 @@ namespace Content.IntegrationTests.Tests
}
component.Owner = entity;
Logger.LogS(LogLevel.Debug, "EntityTest", $"Adding component: {name}");
logmill.Debug($"Adding component: {name}");
Assert.DoesNotThrow(() =>
{
@@ -296,13 +315,14 @@ namespace Content.IntegrationTests.Tests
- type: entity
id: AllComponentsOneEntityDeleteTestEntity";
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, ExtraPrototypes = testEntity});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, ExtraPrototypes = testEntity });
var server = pairTracker.Pair.Server;
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
var logmill = server.ResolveDependency<ILogManager>().GetSawmill("EntityTest");
MapGridComponent grid = default;
@@ -335,9 +355,9 @@ namespace Content.IntegrationTests.Tests
for (var i = 0; i < distinctComponents.Count; i++)
{
var distinct = distinctComponents[i];
var (components, references) = distinctComponents[i];
if (distinct.references.Intersect(registration.References).Any())
if (references.Intersect(registration.References).Any())
{
// Ensure the next list if this one has conflicting references
if (i + 1 >= distinctComponents.Count)
@@ -349,8 +369,8 @@ namespace Content.IntegrationTests.Tests
}
// Add the component and its references if no conflicting references were found
distinct.components.Add(registration.Idx);
distinct.references.AddRange(registration.References);
components.Add(registration.Idx);
references.AddRange(registration.References);
}
}
@@ -361,14 +381,14 @@ namespace Content.IntegrationTests.Tests
{
Assert.Multiple(() =>
{
foreach (var distinct in distinctComponents)
foreach (var (components, _) in distinctComponents)
{
var testLocation = grid.ToCoordinates();
var entity = entityManager.SpawnEntity("AllComponentsOneEntityDeleteTestEntity", testLocation);
Assert.That(entityManager.GetComponent<MetaDataComponent>(entity).EntityInitialized);
foreach (var type in distinct.components)
foreach (var type in components)
{
var component = (Component) componentFactory.GetComponent(type);
@@ -385,7 +405,7 @@ namespace Content.IntegrationTests.Tests
continue;
component.Owner = entity;
Logger.LogS(LogLevel.Debug, "EntityTest", $"Adding component: {name}");
logmill.Debug($"Adding component: {name}");
// Note for the future coder: if an exception occurs where a component reference
// was already occupied it might be because some component is ensuring another // initialize.