Fix EntityTest to load prototypes at init properly.

This commit is contained in:
Pieter-Jan Briers
2020-08-29 07:53:04 +02:00
parent 56909d3392
commit f3315feba1

View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using NUnit.Framework;
@@ -54,6 +53,7 @@ namespace Content.IntegrationTests.Tests
{
continue;
}
prototypes.Add(prototype);
}
@@ -91,7 +91,8 @@ namespace Content.IntegrationTests.Tests
continue;
}
Assert.That(prototype.Components.ContainsKey("Icon"), $"Entity {prototype.ID} does not have an Icon component, but is not abstract");
Assert.That(prototype.Components.ContainsKey("Icon"),
$"Entity {prototype.ID} does not have an Icon component, but is not abstract");
}
});
@@ -115,7 +116,7 @@ namespace Content.IntegrationTests.Tests
- type: entity
id: AllComponentsOneToOneDeleteTestEntity";
var server = StartServerDummyTicker();
var server = StartServerDummyTicker(new ServerContentIntegrationOption {ExtraPrototypes = testEntity});
await server.WaitIdleAsync();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -123,16 +124,11 @@ namespace Content.IntegrationTests.Tests
var mapLoader = server.ResolveDependency<IMapLoader>();
var pauseManager = server.ResolveDependency<IPauseManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>();
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
IMapGrid grid = default;
server.Post(() =>
{
// Load test entity
using var reader = new StringReader(testEntity);
prototypeManager.LoadFromStream(reader);
// Load test map
var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId);
@@ -201,7 +197,7 @@ namespace Content.IntegrationTests.Tests
- type: entity
id: AllComponentsOneEntityDeleteTestEntity";
var server = StartServerDummyTicker();
var server = StartServerDummyTicker(new ServerContentIntegrationOption {ExtraPrototypes = testEntity});
await server.WaitIdleAsync();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -209,16 +205,11 @@ namespace Content.IntegrationTests.Tests
var mapLoader = server.ResolveDependency<IMapLoader>();
var pauseManager = server.ResolveDependency<IPauseManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>();
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
IMapGrid grid = default;
server.Post(() =>
{
// Load test entity
using var reader = new StringReader(testEntity);
prototypeManager.LoadFromStream(reader);
// Load test map
var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId);