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

Fix SpawnAndDirtyAllEntities test (#15771)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-25 21:27:57 +12:00
committed by GitHub
parent 8563f12a7c
commit db8a48ba33
6 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ 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;
@@ -112,7 +113,7 @@ namespace Content.IntegrationTests.Tests
}
/// <summary>
/// Variant of <see cref="SpawnAndDeleteAllEntitiesInTheSameSpot"/> that also launches a client and dirties
/// Variant of <see cref="SpawnAndDeleteAllEntitiesOnDifferentMaps"/> that also launches a client and dirties
/// all components on every entity.
/// </summary>
[Test]
@@ -120,49 +121,65 @@ namespace Content.IntegrationTests.Tests
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = false, Destructive = true });
var server = pairTracker.Pair.Server;
var map = await PoolManager.CreateTestMap(pairTracker);
IEntityManager entityMan = null;
var client = pairTracker.Pair.Client;
var cfg = server.ResolveDependency<IConfigurationManager>();
var prototypeMan = server.ResolveDependency<IPrototypeManager>();
var mapManager = server.ResolveDependency<IMapManager>();
var sEntMan = server.ResolveDependency<IEntityManager>();
await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, true));
Assert.That(cfg.GetCVar(CVars.NetPVS), Is.False);
var protoIds = prototypeMan
.EnumeratePrototypes<EntityPrototype>()
.Where(p => !p.Abstract)
.Select(p => p.ID)
.ToList();
// 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"};
await server.WaitPost(() =>
{
entityMan = IoCManager.Resolve<IEntityManager>();
var prototypeMan = IoCManager.Resolve<IPrototypeManager>();
var protoIds = prototypeMan
.EnumeratePrototypes<EntityPrototype>()
.Where(p => !p.Abstract)
.Select(p => p.ID)
.ToList();
foreach (var protoId in protoIds)
{
var ent = entityMan.SpawnEntity(protoId, map.GridCoords);
foreach (var (netId, component) in entityMan.GetNetComponents(ent))
if (ignored.Contains(protoId))
continue;
var mapId = mapManager.CreateMap();
var grid = mapManager.CreateGrid(mapId);
var ent = sEntMan.SpawnEntity(protoId, new EntityCoordinates(grid.Owner, 0.5f, 0.5f));
foreach (var (_, component) in sEntMan.GetNetComponents(ent))
{
entityMan.Dirty(component);
sEntMan.Dirty(component);
}
}
});
await server.WaitRunTicks(15);
await PoolManager.RunTicksSync(pairTracker.Pair, 15);
// Make sure the client actually received the entities
// 500 is completely arbitrary. Note that the client & sever entity counts aren't expected to match.
Assert.That(client.ResolveDependency<IEntityManager>().EntityCount, Is.GreaterThan(500));
await server.WaitPost(() =>
{
var entityMetas = entityMan.EntityQuery<MetaDataComponent>(true).ToList();
var entityMetas = sEntMan.EntityQuery<MetaDataComponent>(true).ToList();
foreach (var meta in entityMetas)
{
if (!meta.EntityDeleted)
entityMan.DeleteEntity(meta.Owner);
sEntMan.DeleteEntity(meta.Owner);
}
Assert.That(entityMan.EntityCount, Is.Zero);
Assert.That(sEntMan.EntityCount, Is.Zero);
});
await server.WaitPost(() => cfg.SetCVar(CCVars.DisableGridFill, false));
await pairTracker.CleanReturnAsync();
}
[Test]
public async Task AllComponentsOneToOneDeleteTest()
{