Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

30
Content.IntegrationTests/Tests/Interaction/Click/InteractionSystemTests.cs
View File

@@ -39,8 +39,8 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
[Test]
public async Task InteractionTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -103,14 +103,14 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
testInteractionSystem.ClearHandlers();
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task InteractionObstructionTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -174,14 +174,14 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
testInteractionSystem.ClearHandlers();
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task InteractionInRangeTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -243,15 +243,15 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
testInteractionSystem.ClearHandlers();
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task InteractionOutOfRangeTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -313,14 +313,14 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
testInteractionSystem.ClearHandlers();
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Test]
public async Task InsideContainerInteractionBlockTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -404,7 +404,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
});
testInteractionSystem.ClearHandlers();
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
[Reflect(false)]

6
Content.IntegrationTests/Tests/Interaction/InRangeUnobstructed.cs
View File

@@ -26,8 +26,8 @@ namespace Content.IntegrationTests.Tests.Interaction
[Test]
public async Task EntityEntityTest()
{
await using var pairTracker = await PoolManager.GetServerClient();
var server = pairTracker.Pair.Server;
await using var pair = await PoolManager.GetServerClient();
var server = pair.Server;
var sEntities = server.ResolveDependency<IEntityManager>();
var mapManager = server.ResolveDependency<IMapManager>();
@@ -107,7 +107,7 @@ namespace Content.IntegrationTests.Tests.Interaction
});
});
await pairTracker.CleanReturnAsync();
await pair.CleanReturnAsync();
}
}
}

4
Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs
View File

@@ -66,7 +66,7 @@ public abstract partial class InteractionTest
Task? tickTask = null;
while (!task.IsCompleted)
{
tickTask = PoolManager.RunTicksSync(PairTracker.Pair, 1);
tickTask = PoolManager.RunTicksSync(Pair, 1);
await Task.WhenAny(task, tickTask);
}
@@ -699,7 +699,7 @@ public abstract partial class InteractionTest
protected async Task RunTicks(int ticks)
{
await PoolManager.RunTicksSync(PairTracker.Pair, ticks);
await PoolManager.RunTicksSync(Pair, ticks);
}
protected int SecondsToTicks(float seconds)

16
Content.IntegrationTests/Tests/Interaction/InteractionTest.cs
View File

@@ -41,11 +41,11 @@ public abstract partial class InteractionTest
{
protected virtual string PlayerPrototype => "InteractionTestMob";
protected TestPair PairTracker = default!;
protected TestMapData MapData => PairTracker.TestMap!;
protected TestPair Pair = default!;
protected TestMapData MapData => Pair.TestMap!;
protected RobustIntegrationTest.ServerIntegrationInstance Server => PairTracker.Server;
protected RobustIntegrationTest.ClientIntegrationInstance Client => PairTracker.Client;
protected RobustIntegrationTest.ServerIntegrationInstance Server => Pair.Server;
protected RobustIntegrationTest.ClientIntegrationInstance Client => Pair.Client;
protected MapId MapId => MapData.MapId;
@@ -141,7 +141,7 @@ public abstract partial class InteractionTest
[SetUp]
public virtual async Task Setup()
{
PairTracker = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
Pair = await PoolManager.GetServerClient(new PoolSettings { Connected = true });
// server dependencies
SEntMan = Server.ResolveDependency<IEntityManager>();
@@ -173,7 +173,7 @@ public abstract partial class InteractionTest
CLogger = Client.ResolveDependency<ILogManager>().RootSawmill;
// Setup map.
await PairTracker.CreateTestMap();
await Pair.CreateTestMap();
PlayerCoords = MapData.GridCoords.Offset(new Vector2(0.5f, 0.5f)).WithEntityId(MapData.MapUid, Transform, SEntMan);
TargetCoords = MapData.GridCoords.Offset(new Vector2(1.5f, 0.5f)).WithEntityId(MapData.MapUid, Transform, SEntMan);
await SetTile(Plating, grid: MapData.MapGrid);
@@ -226,7 +226,7 @@ public abstract partial class InteractionTest
});
// Final player asserts/checks.
await PairTracker.ReallyBeIdle(5);
await Pair.ReallyBeIdle(5);
Assert.Multiple(() =>
{
Assert.That(cPlayerMan.LocalPlayer.ControlledEntity, Is.EqualTo(Player));
@@ -238,7 +238,7 @@ public abstract partial class InteractionTest
public async Task TearDownInternal()
{
await Server.WaitPost(() => MapMan.DeleteMap(MapId));
await PairTracker.CleanReturnAsync();
await Pair.CleanReturnAsync();
await TearDown();
}