Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566)

This commit is contained in:
metalgearsloth
2023-04-20 20:16:01 +10:00
committed by GitHub
parent 0c38a6db8d
commit ae01618874
125 changed files with 279 additions and 276 deletions

View File

@@ -27,9 +27,9 @@ namespace Content.IntegrationTests.Tests
var xformSystem = sEntities.EntitySysManager.GetEntitySystem<SharedTransformSystem>();
var resManager = server.ResolveDependency<IResourceManager>();
await server.WaitPost(() =>
await server.WaitAssertion(() =>
{
var dir = new ResourcePath(mapPath).Directory;
var dir = new ResPath(mapPath).Directory;
resManager.UserData.CreateDir(dir);
var mapId = mapManager.CreateMap();
@@ -50,14 +50,17 @@ namespace Content.IntegrationTests.Tests
Assert.Multiple(() => mapLoader.SaveMap(mapId, mapPath));
Assert.Multiple(() => mapManager.DeleteMap(mapId));
});
await server.WaitIdleAsync();
await server.WaitPost(() =>
await server.WaitAssertion(() =>
{
Assert.Multiple(() => mapLoader.LoadMap(new MapId(10), mapPath));
});
await server.WaitIdleAsync();
await server.WaitAssertion(() =>
{
{
@@ -84,6 +87,7 @@ namespace Content.IntegrationTests.Tests
Assert.That(mapGrid.GetTileRef(new Vector2i(0, 0)).Tile, Is.EqualTo(new Tile(2, (TileRenderFlag)1, 254)));
}
});
await pairTracker.CleanReturnAsync();
}
}