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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/GameObjects/Components/EntityPrototypeComponentsTest.cs
View File

@@ -24,7 +24,7 @@ namespace Content.IntegrationTests.Tests.GameObjects.Components
var client = pairTracker.Pair.Client;
var sResourceManager = server.ResolveDependency<IResourceManager>();
var prototypePath = new ResourcePath("/Prototypes/");
var prototypePath = new ResPath("/Prototypes/");
var paths = sResourceManager.ContentFindFiles(prototypePath)
.ToList()
.AsParallel()

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

@@ -89,7 +89,7 @@ namespace Content.IntegrationTests.Tests
var server = pairTracker.Pair.Server;
var resourceManager = server.ResolveDependency<IResourceManager>();
var mapFolder = new ResourcePath("/Maps");
var mapFolder = new ResPath("/Maps");
var maps = resourceManager
.ContentFindFiles(mapFolder)
.Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))
@@ -299,7 +299,7 @@ namespace Content.IntegrationTests.Tests
var gameMaps = protoManager.EnumeratePrototypes<GameMapPrototype>().Select(o => o.MapPath).ToHashSet();
var mapFolder = new ResourcePath("/Maps");
var mapFolder = new ResPath("/Maps");
var maps = resourceManager
.ContentFindFiles(mapFolder)
.Where(filePath => filePath.Extension == "yml" && !filePath.Filename.StartsWith(".", StringComparison.Ordinal))

10
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
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();
}
}

12
Content.IntegrationTests/Tests/SaveLoadSaveTest.cs
View File

@@ -43,14 +43,14 @@ namespace Content.IntegrationTests.Tests
string one;
string two;
var rp1 = new ResourcePath("/save load save 1.yml");
var rp1 = new ResPath("/save load save 1.yml");
await using (var stream = userData.Open(rp1, FileMode.Open))
using (var reader = new StreamReader(stream))
{
one = await reader.ReadToEndAsync();
}
var rp2 = new ResourcePath("/save load save 2.yml");
var rp2 = new ResPath("/save load save 2.yml");
await using (var stream = userData.Open(rp2, FileMode.Open))
using (var reader = new StreamReader(stream))
{
@@ -117,13 +117,13 @@ namespace Content.IntegrationTests.Tests
string one;
string two;
await using (var stream = userData.Open(new ResourcePath("/load save ticks save 1.yml"), FileMode.Open))
await using (var stream = userData.Open(new ResPath("/load save ticks save 1.yml"), FileMode.Open))
using (var reader = new StreamReader(stream))
{
one = await reader.ReadToEndAsync();
}
await using (var stream = userData.Open(new ResourcePath("/load save ticks save 2.yml"), FileMode.Open))
await using (var stream = userData.Open(new ResPath("/load save ticks save 2.yml"), FileMode.Open))
using (var reader = new StreamReader(stream))
{
two = await reader.ReadToEndAsync();
@@ -189,7 +189,7 @@ namespace Content.IntegrationTests.Tests
});
await server.WaitIdleAsync();
await using (var stream = userData.Open(new ResourcePath(fileA), FileMode.Open))
await using (var stream = userData.Open(new ResPath(fileA), FileMode.Open))
using (var reader = new StreamReader(stream))
{
yamlA = await reader.ReadToEndAsync();
@@ -210,7 +210,7 @@ namespace Content.IntegrationTests.Tests
await server.WaitIdleAsync();
await using (var stream = userData.Open(new ResourcePath(fileB), FileMode.Open))
await using (var stream = userData.Open(new ResPath(fileB), FileMode.Open))
using (var reader = new StreamReader(stream))
{
yamlB = await reader.ReadToEndAsync();