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

Remove obsolete TestPair.Pair (#19496)

Browse Source
This commit is contained in:
Visne
2023-08-25 02:56:51 +02:00
committed by GitHub
parent e1639b05b5
commit 3c667b6f7e
101 changed files with 717 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,8 +69,8 @@ namespace Content.IntegrationTests.Tests
[Test, TestCaseSource(nameof(Grids))]
public async Task GridsLoadableTest(string mapFile)
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var entManager = server.ResolveDependency<IEntityManager>();
var mapLoader = entManager.System<MapLoaderSystem>();
@@ -104,14 +104,14 @@ namespace Content.IntegrationTests.Tests
});
await server.WaitRunTicks(1);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task NoSavedPostMapInitTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var resourceManager = server.ResolveDependency<IResourceManager>();
var mapFolder = new ResPath("/Maps");
@@ -146,14 +146,14 @@ namespace Content.IntegrationTests.Tests
Assert.That(postMapInit, Is.False, $"Map {map.Filename} was saved postmapinit");
}
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test, TestCaseSource(nameof(GameMaps))]
public async Task GameMapsLoadableTest(string mapProto)
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var mapManager = server.ResolveDependency<IMapManager>();
var entManager = server.ResolveDependency<IEntityManager>();
@@ -278,18 +278,18 @@ namespace Content.IntegrationTests.Tests
});
await server.WaitRunTicks(1);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task AllMapsTested()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var protoMan = server.ResolveDependency<IPrototypeManager>();
var gameMaps = protoMan.EnumeratePrototypes<GameMapPrototype>()
.Where(x => !pairTracker.Pair.IsTestPrototype(x))
.Where(x => !pair.IsTestPrototype(x))
.Select(x => x.ID)
.ToHashSet();
@@ -297,14 +297,14 @@ namespace Content.IntegrationTests.Tests
CollectionAssert.AreEquivalent(GameMaps.ToHashSet(), gameMaps, "Game map prototype missing from test cases.");
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task NonGameMapsLoadableTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var mapLoader = server.ResolveDependency<IEntitySystemManager>().GetEntitySystem<MapLoaderSystem>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -364,7 +364,7 @@ namespace Content.IntegrationTests.Tests
});
await server.WaitRunTicks(1);
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}