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

Purge IoC resolves from integration tests (#17185)

Browse Source
This commit is contained in:
metalgearsloth
2023-06-07 21:08:52 +10:00
committed by GitHub
parent dfdab6c269
commit 559574ccb9
20 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.IntegrationTests/Tests/Networking/ReconnectTest.cs
View File

@@ -16,7 +16,10 @@ namespace Content.IntegrationTests.Tests.Networking
var server = pairTracker.Pair.Server;
var client = pairTracker.Pair.Client;
await client.WaitPost(() => IoCManager.Resolve<IClientConsoleHost>().ExecuteCommand("disconnect"));
var host = client.ResolveDependency<IClientConsoleHost>();
var netManager = client.ResolveDependency<IClientNetManager>();
await client.WaitPost(() => host.ExecuteCommand("disconnect"));
// Run some ticks for the disconnect to complete and such.
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
@@ -26,7 +29,7 @@ namespace Content.IntegrationTests.Tests.Networking
// Reconnect.
client.SetConnectTarget(server);
await client.WaitPost(() => IoCManager.Resolve<IClientNetManager>().ClientConnect(null, 0, null));
await client.WaitPost(() => netManager.ClientConnect(null, 0, null));
// Run some ticks for the handshake to complete and such.
await PoolManager.RunTicksSync(pairTracker.Pair, 10);

6
Content.IntegrationTests/Tests/Networking/SimplePredictReconcileTest.cs
View File

@@ -70,7 +70,7 @@ namespace Content.IntegrationTests.Tests.Networking
var map = sMapManager.CreateMap();
var player = sPlayerManager.ServerSessions.Single();
serverEnt = sEntityManager.SpawnEntity(null, new MapCoordinates((0, 0), map));
serverComponent = IoCManager.Resolve<IEntityManager>().AddComponent<PredictionTestComponent>(serverEnt);
serverComponent = sEntityManager.AddComponent<PredictionTestComponent>(serverEnt);
// Make client "join game" so they receive game state updates.
player.JoinGame();
@@ -364,7 +364,7 @@ namespace Content.IntegrationTests.Tests.Networking
Assert.That(clientComponent.Foo, Is.True);
}
}
cfg.SetCVar(CVars.NetLogging, log);
await pairTracker.CleanReturnAsync();
}
@@ -432,7 +432,7 @@ namespace Content.IntegrationTests.Tests.Networking
private void HandleMessage(SetFooMessage message, EntitySessionEventArgs args)
{
var component = IoCManager.Resolve<IEntityManager>().GetComponent<PredictionTestComponent>(message.Uid);
var component = EntityManager.GetComponent<PredictionTestComponent>(message.Uid);
var old = component.Foo;
if (Allow)
{