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

Update content to mapsystem (#12387)

Browse Source
This commit is contained in:
metalgearsloth
2022-11-13 17:47:48 +11:00
committed by GitHub
parent 9f5c3318c9
commit 6ab864fcda
16 changed files with 70 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,10 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
using Robust.Server.GameObjects;
using Robust.Server.Maps;
using Robust.Shared.ContentPack;
using Robust.Shared.GameObjects;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Utility;
@@ -19,18 +21,20 @@ namespace Content.IntegrationTests.Tests
[Test]
public async Task SaveLoadSave()
{
await using var pairTracker = await PoolManager.GetServerClient(new (){Fresh = true, Disconnected = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings {Fresh = true, Disconnected = true});
var server = pairTracker.Pair.Server;
var mapLoader = server.ResolveDependency<IMapLoader>();
var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
var mapManager = server.ResolveDependency<IMapManager>();
await server.WaitPost(() =>
{
var mapId0 = mapManager.CreateMap();
// TODO: Properly find the "main" station grid.
var grid0 = mapManager.GetAllGrids().First();
mapLoader.SaveGrid(grid0.GridEntityId, "save load save 1.yml");
var mapId = mapManager.CreateMap();
var grid = mapLoader.LoadGrid(mapId, "save load save 1.yml").gridId;
mapLoader.SaveGrid(grid!.Value, "save load save 2.yml");
var grid0 = mapManager.CreateGrid(mapId0);
mapLoader.Save(grid0.GridEntityId, "save load save 1.yml");
var mapId1 = mapManager.CreateMap();
var grid1 = mapLoader.LoadGrid(mapId1, "save load save 1.yml", new MapLoadOptions() {LoadMap = false});
mapLoader.Save(grid1!.Value, "save load save 2.yml");
});
await server.WaitIdleAsync();
@@ -40,17 +44,17 @@ namespace Content.IntegrationTests.Tests
string two;
var rp1 = new ResourcePath("/save load save 1.yml");
using (var stream = userData.Open(rp1, FileMode.Open))
await using (var stream = userData.Open(rp1, FileMode.Open))
using (var reader = new StreamReader(stream))
{
one = reader.ReadToEnd();
one = await reader.ReadToEndAsync();
}
var rp2 = new ResourcePath("/save load save 2.yml");
using (var stream = userData.Open(rp2, FileMode.Open))
await using (var stream = userData.Open(rp2, FileMode.Open))
using (var reader = new StreamReader(stream))
{
two = reader.ReadToEnd();
two = await reader.ReadToEndAsync();
}
Assert.Multiple(() => {
@@ -82,7 +86,7 @@ namespace Content.IntegrationTests.Tests
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
var server = pairTracker.Pair.Server;
var mapLoader = server.ResolveDependency<IMapLoader>();
var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
var mapManager = server.ResolveDependency<IMapManager>();
MapId mapId = default;
@@ -111,16 +115,16 @@ namespace Content.IntegrationTests.Tests
string one;
string two;
using (var stream = userData.Open(new ResourcePath("/load save ticks save 1.yml"), FileMode.Open))
await using (var stream = userData.Open(new ResourcePath("/load save ticks save 1.yml"), FileMode.Open))
using (var reader = new StreamReader(stream))
{
one = reader.ReadToEnd();
one = await reader.ReadToEndAsync();
}
using (var stream = userData.Open(new ResourcePath("/load save ticks save 2.yml"), FileMode.Open))
await using (var stream = userData.Open(new ResourcePath("/load save ticks save 2.yml"), FileMode.Open))
using (var reader = new StreamReader(stream))
{
two = reader.ReadToEnd();
two = await reader.ReadToEndAsync();
}
Assert.Multiple(() => {