diff --git a/Content.IntegrationTests/Tests/EntityTest.cs b/Content.IntegrationTests/Tests/EntityTest.cs index ae458d078b..a7353a5634 100644 --- a/Content.IntegrationTests/Tests/EntityTest.cs +++ b/Content.IntegrationTests/Tests/EntityTest.cs @@ -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(); @@ -123,16 +124,11 @@ namespace Content.IntegrationTests.Tests var mapLoader = server.ResolveDependency(); var pauseManager = server.ResolveDependency(); var componentFactory = server.ResolveDependency(); - var prototypeManager = server.ResolveDependency(); 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(); @@ -209,16 +205,11 @@ namespace Content.IntegrationTests.Tests var mapLoader = server.ResolveDependency(); var pauseManager = server.ResolveDependency(); var componentFactory = server.ResolveDependency(); - var prototypeManager = server.ResolveDependency(); 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);