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

Fix some UserData file system usage inconsistencies with map save tests.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-08-20 18:47:16 +02:00
parent 496b456120
commit 4cb0040045
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.IntegrationTests/Tests/SaveLoadMapTest.cs
View File

@@ -3,8 +3,11 @@ using NUnit.Framework;
using Robust.Server.Interfaces.Maps; using Robust.Server.Interfaces.Maps;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map; using Robust.Shared.Interfaces.Map;
using Robust.Shared.Interfaces.Resources;
using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Utility;
namespace Content.IntegrationTests.Tests namespace Content.IntegrationTests.Tests
{ {
@@ -14,7 +17,7 @@ namespace Content.IntegrationTests.Tests
[Test] [Test]
public async Task SaveLoadMultiGridMap() public async Task SaveLoadMultiGridMap()
{ {
const string mapPath = @"Maps/Test/TestMap.yml"; const string mapPath = @"/Maps/Test/TestMap.yml";
var server = StartServer(); var server = StartServer();
await server.WaitIdleAsync(); await server.WaitIdleAsync();
@@ -24,6 +27,10 @@ namespace Content.IntegrationTests.Tests
server.Post(() => server.Post(() =>
{ {
var dir = new ResourcePath(mapPath).Directory;
IoCManager.Resolve<IResourceManager>()
.UserData.CreateDir(dir);
var mapId = mapManager.CreateMap(new MapId(5)); var mapId = mapManager.CreateMap(new MapId(5));
{ {

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

@@ -38,14 +38,14 @@ namespace Content.IntegrationTests.Tests
string one; string one;
string two; string two;
var rp1 = new ResourcePath("save load save 1.yml"); var rp1 = new ResourcePath("/save load save 1.yml");
using (var stream = userData.Open(rp1, FileMode.Open)) using (var stream = userData.Open(rp1, FileMode.Open))
using (var reader = new StreamReader(stream)) using (var reader = new StreamReader(stream))
{ {
one = reader.ReadToEnd(); one = reader.ReadToEnd();
} }
var rp2 = new ResourcePath("save load save 2.yml"); var rp2 = new ResourcePath("/save load save 2.yml");
using (var stream = userData.Open(rp2, FileMode.Open)) using (var stream = userData.Open(rp2, FileMode.Open))
using (var reader = new StreamReader(stream)) using (var reader = new StreamReader(stream))
{ {
@@ -96,7 +96,7 @@ namespace Content.IntegrationTests.Tests
server.Post(() => server.Post(() =>
{ {
mapLoader.SaveBlueprint(grid.Index, "load save ticks save 2.yml"); mapLoader.SaveBlueprint(grid.Index, "/load save ticks save 2.yml");
}); });
await server.WaitIdleAsync(); await server.WaitIdleAsync();
@@ -105,13 +105,13 @@ namespace Content.IntegrationTests.Tests
string one; string one;
string two; string two;
using (var stream = userData.Open(new ResourcePath("load save ticks save 1.yml"), FileMode.Open)) using (var stream = userData.Open(new ResourcePath("/load save ticks save 1.yml"), FileMode.Open))
using (var reader = new StreamReader(stream)) using (var reader = new StreamReader(stream))
{ {
one = reader.ReadToEnd(); one = reader.ReadToEnd();
} }
using (var stream = userData.Open(new ResourcePath("load save ticks save 2.yml"), FileMode.Open)) using (var stream = userData.Open(new ResourcePath("/load save ticks save 2.yml"), FileMode.Open))
using (var reader = new StreamReader(stream)) using (var reader = new StreamReader(stream))
{ {
two = reader.ReadToEnd(); two = reader.ReadToEnd();