Remove obsolete TestPair.Pair (#19496)
This commit is contained in:
@@ -105,8 +105,8 @@ namespace Content.IntegrationTests.Tests
|
||||
[Test]
|
||||
public async Task TestAllRestocksAreAvailableToBuy()
|
||||
{
|
||||
await using var pairTracker = await PoolManager.GetServerClient();
|
||||
var server = pairTracker.Pair.Server;
|
||||
await using var pair = await PoolManager.GetServerClient();
|
||||
var server = pair.Server;
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
|
||||
@@ -120,7 +120,7 @@ namespace Content.IntegrationTests.Tests
|
||||
foreach (var proto in prototypeManager.EnumeratePrototypes<EntityPrototype>())
|
||||
{
|
||||
if (proto.Abstract
|
||||
|| pairTracker.Pair.IsTestPrototype(proto)
|
||||
|| pair.IsTestPrototype(proto)
|
||||
|| !proto.HasComponent<VendingMachineRestockComponent>())
|
||||
{
|
||||
continue;
|
||||
@@ -170,14 +170,14 @@ namespace Content.IntegrationTests.Tests
|
||||
});
|
||||
});
|
||||
|
||||
await pairTracker.CleanReturnAsync();
|
||||
await pair.CleanReturnAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task TestCompleteRestockProcess()
|
||||
{
|
||||
await using var pairTracker = await PoolManager.GetServerClient();
|
||||
var server = pairTracker.Pair.Server;
|
||||
await using var pair = await PoolManager.GetServerClient();
|
||||
var server = pair.Server;
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
@@ -193,7 +193,7 @@ namespace Content.IntegrationTests.Tests
|
||||
VendingMachineRestockComponent restockWrongComponent = default!;
|
||||
WiresPanelComponent machineWiresPanel = default!;
|
||||
|
||||
var testMap = await PoolManager.CreateTestMap(pairTracker);
|
||||
var testMap = await PoolManager.CreateTestMap(pair);
|
||||
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
@@ -256,14 +256,14 @@ namespace Content.IntegrationTests.Tests
|
||||
mapManager.DeleteMap(testMap.MapId);
|
||||
});
|
||||
|
||||
await pairTracker.CleanReturnAsync();
|
||||
await pair.CleanReturnAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task TestRestockBreaksOpen()
|
||||
{
|
||||
await using var pairTracker = await PoolManager.GetServerClient();
|
||||
var server = pairTracker.Pair.Server;
|
||||
await using var pair = await PoolManager.GetServerClient();
|
||||
var server = pair.Server;
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var prototypeManager = server.ResolveDependency<IPrototypeManager>();
|
||||
@@ -273,7 +273,7 @@ namespace Content.IntegrationTests.Tests
|
||||
|
||||
var damageableSystem = entitySystemManager.GetEntitySystem<DamageableSystem>();
|
||||
|
||||
var testMap = await PoolManager.CreateTestMap(pairTracker);
|
||||
var testMap = await PoolManager.CreateTestMap(pair);
|
||||
|
||||
EntityUid restock = default;
|
||||
|
||||
@@ -320,14 +320,14 @@ namespace Content.IntegrationTests.Tests
|
||||
mapManager.DeleteMap(testMap.MapId);
|
||||
});
|
||||
|
||||
await pairTracker.CleanReturnAsync();
|
||||
await pair.CleanReturnAsync();
|
||||
}
|
||||
|
||||
[Test]
|
||||
public async Task TestRestockInventoryBounds()
|
||||
{
|
||||
await using var pairTracker = await PoolManager.GetServerClient();
|
||||
var server = pairTracker.Pair.Server;
|
||||
await using var pair = await PoolManager.GetServerClient();
|
||||
var server = pair.Server;
|
||||
await server.WaitIdleAsync();
|
||||
|
||||
var mapManager = server.ResolveDependency<IMapManager>();
|
||||
@@ -336,7 +336,7 @@ namespace Content.IntegrationTests.Tests
|
||||
|
||||
var vendingMachineSystem = entitySystemManager.GetEntitySystem<SharedVendingMachineSystem>();
|
||||
|
||||
var testMap = await PoolManager.CreateTestMap(pairTracker);
|
||||
var testMap = await PoolManager.CreateTestMap(pair);
|
||||
|
||||
await server.WaitAssertion(() =>
|
||||
{
|
||||
@@ -366,7 +366,7 @@ namespace Content.IntegrationTests.Tests
|
||||
"Machine's available inventory did not stay the same after a third restock.");
|
||||
});
|
||||
|
||||
await pairTracker.CleanReturnAsync();
|
||||
await pair.CleanReturnAsync();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user