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

Fix content.integration tests warnings (#17817)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
TemporalOroboros
2023-07-05 21:54:25 -07:00
committed by GitHub
parent 20c1754abd
commit ba91023a85
121 changed files with 3658 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
Content.IntegrationTests/Tests/PostMapInitTest.cs
View File

@@ -1,25 +1,21 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Content.Server.GameTicking;
using Content.Server.Maps;
using Content.Server.Shuttles.Components;
using Content.Server.Spawners.Components;
using Content.Server.Station.Components;
using Content.Server.Station.Systems;
using Content.Shared.CCVar;
using Content.Shared.Roles;
using NUnit.Framework;
using Robust.Server.GameObjects;
using Robust.Server.Maps;
using Robust.Shared.Configuration;
using Robust.Shared.ContentPack;
using Robust.Shared.GameObjects;
using Robust.Shared.Utility;
using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Prototypes;
using YamlDotNet.RepresentationModel;
using ShuttleSystem = Content.Server.Shuttles.Systems.ShuttleSystem;
@@ -38,7 +34,7 @@ namespace Content.IntegrationTests.Tests
"Dart",
};
private static string[] Grids =
private static readonly string[] Grids =
{
"/Maps/centcomm.yml",
"/Maps/Shuttles/cargo.yml",
@@ -52,10 +48,11 @@ namespace Content.IntegrationTests.Tests
[Test, TestCaseSource(nameof(Grids))]
public async Task GridsLoadableTest(string mapFile)
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
var entManager = server.ResolveDependency<IEntityManager>();
var mapLoader = entManager.System<MapLoaderSystem>();
var mapManager = server.ResolveDependency<IMapManager>();
var cfg = server.ResolveDependency<IConfigurationManager>();
Assert.That(cfg.GetCVar(CCVars.GridFill), Is.False);
@@ -65,7 +62,10 @@ namespace Content.IntegrationTests.Tests
var mapId = mapManager.CreateMap();
try
{
mapLoader.LoadGrid(mapId, mapFile);
#pragma warning disable NUnit2045
Assert.That(mapLoader.TryLoad(mapId, mapFile, out var roots));
Assert.That(roots.Where(uid => entManager.HasComponent<MapGridComponent>(uid)), Is.Not.Empty);
#pragma warning restore NUnit2045
}
catch (Exception ex)
{
@@ -89,7 +89,7 @@ namespace Content.IntegrationTests.Tests
[Test]
public async Task NoSavedPostMapInitTest()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var resourceManager = server.ResolveDependency<IResourceManager>();
@@ -123,14 +123,14 @@ namespace Content.IntegrationTests.Tests
var meta = root["meta"];
var postMapInit = meta["postmapinit"].AsBool();
Assert.False(postMapInit, $"Map {map.Filename} was saved postmapinit");
Assert.That(postMapInit, Is.False, $"Map {map.Filename} was saved postmapinit");
}
await pairTracker.CleanReturnAsync();
}
private static string[] GetGameMapNames()
{
Task<string[]> task;
Task<string[]> task;
using (ExecutionContext.SuppressFlow())
{
task = Task.Run(static async () =>
@@ -168,7 +168,7 @@ namespace Content.IntegrationTests.Tests
await pairTracker.CleanReturnAsync();
return mapNames.ToArray();
});
Task.WaitAll(task);
Task.WaitAny(task);
}
return task.GetAwaiter().GetResult();
@@ -177,7 +177,7 @@ namespace Content.IntegrationTests.Tests
[Test, TestCaseSource(nameof(GetGameMapNames))]
public async Task GameMapsLoadableTest(string mapProto)
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var mapManager = server.ResolveDependency<IMapManager>();
@@ -212,7 +212,8 @@ namespace Content.IntegrationTests.Tests
foreach (var grid in grids)
{
if (!memberQuery.HasComponent(grid.Owner))
var gridEnt = grid.Owner;
if (!memberQuery.HasComponent(gridEnt))
continue;
var area = grid.LocalAABB.Width * grid.LocalAABB.Height;
@@ -220,7 +221,7 @@ namespace Content.IntegrationTests.Tests
if (area > largest)
{
largest = area;
targetGrid = grid.Owner;
targetGrid = gridEnt;
}
}
@@ -230,11 +231,18 @@ namespace Content.IntegrationTests.Tests
if (entManager.TryGetComponent<StationEmergencyShuttleComponent>(station, out var stationEvac))
{
var shuttlePath = stationEvac.EmergencyShuttlePath;
var shuttle = mapLoader.LoadGrid(shuttleMap, shuttlePath.ToString());
#pragma warning disable NUnit2045
Assert.That(mapLoader.TryLoad(shuttleMap, shuttlePath.ToString(), out var roots));
EntityUid shuttle = default!;
Assert.DoesNotThrow(() =>
{
shuttle = roots.First(uid => entManager.HasComponent<MapGridComponent>(uid));
}, $"Failed to load {shuttlePath}");
Assert.That(
shuttle != null && shuttleSystem.TryFTLDock(shuttle.Value,
entManager.GetComponent<ShuttleComponent>(shuttle.Value), targetGrid.Value),
shuttleSystem.TryFTLDock(shuttle,
entManager.GetComponent<ShuttleComponent>(shuttle), targetGrid.Value),
$"Unable to dock {shuttlePath} to {mapProto}");
#pragma warning restore NUnit2045
}
mapManager.DeleteMap(shuttleMap);
@@ -246,12 +254,13 @@ namespace Content.IntegrationTests.Tests
{
var lateSpawns = 0;
foreach (var comp in entManager.EntityQuery<SpawnPointComponent>(true))
var query = entManager.AllEntityQueryEnumerator<SpawnPointComponent>();
while (query.MoveNext(out var uid, out var comp))
{
if (comp.SpawnType != SpawnPointType.LateJoin ||
!xformQuery.TryGetComponent(comp.Owner, out var xform) ||
xform.GridUid == null ||
!gridUids.Contains(xform.GridUid.Value))
if (comp.SpawnType != SpawnPointType.LateJoin
|| !xformQuery.TryGetComponent(uid, out var xform)
|| xform.GridUid == null
|| !gridUids.Contains(xform.GridUid.Value))
{
continue;
}
@@ -279,8 +288,8 @@ namespace Content.IntegrationTests.Tests
missingSpawnPoints.Add(spawnpoint);
}
Assert.That(missingSpawnPoints.Count() == 0,
$"There is no spawnpoint for {String.Join(", ", missingSpawnPoints)} on {mapProto}.");
Assert.That(missingSpawnPoints, Has.Count.EqualTo(0),
$"There is no spawnpoint for {string.Join(", ", missingSpawnPoints)} on {mapProto}.");
}
try
@@ -308,7 +317,7 @@ namespace Content.IntegrationTests.Tests
task = Task.Run(static async () =>
{
await Task.Yield();
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{Disconnected = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { Disconnected = true });
var server = pairTracker.Pair.Server;
var resourceManager = server.ResolveDependency<IResourceManager>();
var protoManager = server.ResolveDependency<IPrototypeManager>();
@@ -337,7 +346,7 @@ namespace Content.IntegrationTests.Tests
await pairTracker.CleanReturnAsync();
return mapNames.ToArray();
});
Task.WaitAll(task);
Task.WaitAny(task);
}
return task.GetAwaiter().GetResult();
@@ -346,7 +355,7 @@ namespace Content.IntegrationTests.Tests
[Test, TestCaseSource(nameof(GetMaps))]
public async Task MapsLoadableTest(string mapName)
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{NoClient = true});
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
@@ -359,7 +368,7 @@ namespace Content.IntegrationTests.Tests
var mapId = mapManager.CreateMap();
try
{
mapLoader.LoadMap(mapId, mapName);
Assert.That(mapLoader.TryLoad(mapId, mapName, out _));
}
catch (Exception ex)
{