juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix migrations not being applied to PostMapInitTest (#35933)

Browse Source 
* Fix migrations not being applied to PostMapInitTest

* formatting

* Raise the event outside the loop so it only happens once
This commit is contained in:
Tayrtahn
2025-03-23 06:07:01 -04:00
committed by GitHub
parent c42d0913cb
commit d4c8ddb0ac
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.IntegrationTests/Tests/PostMapInitTest.cs
View File

@@ -22,6 +22,7 @@ using Robust.Shared.EntitySerialization.Systems;
using Robust.Shared.IoC;
using Robust.Shared.Utility;
using YamlDotNet.RepresentationModel;
using Robust.Shared.Map.Events;
namespace Content.IntegrationTests.Tests
{
@@ -223,9 +224,12 @@ namespace Content.IntegrationTests.Tests
}
var deps = server.ResolveDependency<IEntitySystemManager>().DependencyCollection;
var ev = new BeforeEntityReadEvent();
server.EntMan.EventBus.RaiseEvent(EventSource.Local, ev);
foreach (var map in v7Maps)
{
Assert.That(IsPreInit(map, loader, deps));
Assert.That(IsPreInit(map, loader, deps, ev.RenamedPrototypes, ev.DeletedPrototypes));
}
// Check that the test actually does manage to catch post-init maps and isn't just blindly passing everything.
@@ -238,12 +242,12 @@ namespace Content.IntegrationTests.Tests
// First check that a pre-init version passes
var path = new ResPath($"{nameof(NoSavedPostMapInitTest)}.yml");
Assert.That(loader.TrySaveMap(id, path));
Assert.That(IsPreInit(path, loader, deps));
Assert.That(IsPreInit(path, loader, deps, ev.RenamedPrototypes, ev.DeletedPrototypes));
// and the post-init version fails.
await server.WaitPost(() => mapSys.InitializeMap(id));
Assert.That(loader.TrySaveMap(id, path));
Assert.That(IsPreInit(path, loader, deps), Is.False);
Assert.That(IsPreInit(path, loader, deps, ev.RenamedPrototypes, ev.DeletedPrototypes), Is.False);
await pair.CleanReturnAsync();
}
@@ -276,7 +280,11 @@ namespace Content.IntegrationTests.Tests
});
}
private bool IsPreInit(ResPath map, MapLoaderSystem loader, IDependencyCollection deps)
private bool IsPreInit(ResPath map,
MapLoaderSystem loader,
IDependencyCollection deps,
Dictionary<string, string> renamedPrototypes,
HashSet<string> deletedPrototypes)
{
if (!loader.TryReadFile(map, out var data))
{
@@ -284,7 +292,12 @@ namespace Content.IntegrationTests.Tests
return false;
}
var reader = new EntityDeserializer(deps, data, DeserializationOptions.Default);
var reader = new EntityDeserializer(deps,
data,
DeserializationOptions.Default,
renamedPrototypes,
deletedPrototypes);
if (!reader.TryProcessData())
{
Assert.Fail($"Failed to process {map}");