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

Fix some build warnings (#6832)

Browse Source 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2022-02-21 14:41:50 +11:00
committed by GitHub
parent f9c853f100
commit b87806f7ed
36 changed files with 53 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.IntegrationTests/Tests/EntityTest.cs
View File

@@ -32,7 +32,6 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>();
var entityMan = server.ResolveDependency<IEntityManager>();
var prototypeMan = server.ResolveDependency<IPrototypeManager>();
var pauseManager = server.ResolveDependency<IPauseManager>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
var prototypes = new List<EntityPrototype>();
@@ -45,7 +44,7 @@ namespace Content.IntegrationTests.Tests
// Create a one tile grid to stave off the grid 0 monsters
var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId);
mapManager.AddUninitializedMap(mapId);
var gridId = new GridId(1);
@@ -60,7 +59,7 @@ namespace Content.IntegrationTests.Tests
grid.SetTile(coordinates, tile);
pauseManager.DoMapInitialize(mapId);
mapManager.DoMapInitialize(mapId);
});
server.Assert(() =>
@@ -126,7 +125,6 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var pauseManager = server.ResolveDependency<IPauseManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
@@ -137,7 +135,7 @@ namespace Content.IntegrationTests.Tests
// Create a one tile grid to stave off the grid 0 monsters
var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId);
mapManager.AddUninitializedMap(mapId);
var gridId = new GridId(1);
@@ -152,7 +150,7 @@ namespace Content.IntegrationTests.Tests
grid.SetTile(coordinates, tile);
pauseManager.DoMapInitialize(mapId);
mapManager.DoMapInitialize(mapId);
});
server.Assert(() =>
@@ -230,7 +228,6 @@ namespace Content.IntegrationTests.Tests
var mapManager = server.ResolveDependency<IMapManager>();
var entityManager = server.ResolveDependency<IEntityManager>();
var pauseManager = server.ResolveDependency<IPauseManager>();
var componentFactory = server.ResolveDependency<IComponentFactory>();
var tileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
@@ -241,7 +238,7 @@ namespace Content.IntegrationTests.Tests
// Create a one tile grid to stave off the grid 0 monsters
var mapId = mapManager.CreateMap();
pauseManager.AddUninitializedMap(mapId);
mapManager.AddUninitializedMap(mapId);
var gridId = new GridId(1);
@@ -256,7 +253,7 @@ namespace Content.IntegrationTests.Tests
grid.SetTile(coordinates, tile);
pauseManager.DoMapInitialize(mapId);
mapManager.DoMapInitialize(mapId);
});
var distinctComponents = new List<(List<Type> components, List<Type> references)>

13
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -87,7 +87,6 @@ namespace Content.IntegrationTests.Tests.Fluids
await server.WaitIdleAsync();
var sMapManager = server.ResolveDependency<IMapManager>();
var sPauseManager = server.ResolveDependency<IPauseManager>();
var sTileDefinitionManager = server.ResolveDependency<ITileDefinitionManager>();
var sGameTiming = server.ResolveDependency<IGameTiming>();
var entityManager = server.ResolveDependency<IEntityManager>();
@@ -102,7 +101,7 @@ namespace Content.IntegrationTests.Tests.Fluids
await server.WaitPost(() =>
{
sMapId = sMapManager.CreateMap();
sPauseManager.SetMapPaused(sMapId, true);
sMapManager.SetMapPaused(sMapId, true);
sGrid = sMapManager.CreateGrid(sMapId);
sGridId = sGrid.Index;
sGridEntity = sGrid.GridEntityId;
@@ -118,8 +117,8 @@ namespace Content.IntegrationTests.Tests.Fluids
// Check that the map and grid are paused
await server.WaitAssertion(() =>
{
Assert.True(sPauseManager.IsGridPaused(sGridId));
Assert.True(sPauseManager.IsMapPaused(sMapId));
Assert.True(sMapManager.IsGridPaused(sGridId));
Assert.True(sMapManager.IsMapPaused(sMapId));
});
float evaporateTime = default;
@@ -171,13 +170,13 @@ namespace Content.IntegrationTests.Tests.Fluids
});
// Unpause the map
await server.WaitPost(() => { sPauseManager.SetMapPaused(sMapId, false); });
await server.WaitPost(() => { sMapManager.SetMapPaused(sMapId, false); });
// Check that the map, grid and puddle are unpaused
await server.WaitAssertion(() =>
{
Assert.False(sPauseManager.IsMapPaused(sMapId));
Assert.False(sPauseManager.IsGridPaused(sGridId));
Assert.False(sMapManager.IsMapPaused(sMapId));
Assert.False(sMapManager.IsGridPaused(sGridId));
Assert.False(meta.EntityPaused);
// Check that the puddle still exists

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

@@ -82,7 +82,6 @@ namespace Content.IntegrationTests.Tests
await server.WaitIdleAsync();
var mapLoader = server.ResolveDependency<IMapLoader>();
var mapManager = server.ResolveDependency<IMapManager>();
var pauseMgr = server.ResolveDependency<IPauseManager>();
IMapGrid grid = default;
@@ -90,8 +89,8 @@ namespace Content.IntegrationTests.Tests
server.Post(() =>
{
var mapId = mapManager.CreateMap();
pauseMgr.AddUninitializedMap(mapId);
pauseMgr.SetMapPaused(mapId, true);
mapManager.AddUninitializedMap(mapId);
mapManager.SetMapPaused(mapId, true);
grid = mapLoader.LoadBlueprint(mapId, "Maps/saltern.yml");
mapLoader.SaveBlueprint(grid.Index, "load save ticks save 1.yml");
});