Remove PoolSettings.ExtraPrototypes option (#18678)

This commit is contained in:
Leon Friedrich
2023-08-05 16:16:48 +12:00
committed by GitHub
parent c2beaff3ac
commit d58786faf4
51 changed files with 463 additions and 399 deletions

View File

@@ -17,6 +17,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
[TestOf(typeof(InteractionSystem))]
public sealed class InteractionSystemTests
{
[TestPrototypes]
private const string Prototypes = @"
- type: entity
id: DummyDebugWall
@@ -40,8 +41,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
{
NoClient = true,
ExtraPrototypes = Prototypes
NoClient = true
});
var server = pairTracker.Pair.Server;
@@ -114,8 +114,7 @@ namespace Content.IntegrationTests.Tests.Interaction.Click
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings
{
NoClient = true,
ExtraPrototypes = Prototypes
NoClient = true
});
var server = pairTracker.Pair.Server;

View File

@@ -120,7 +120,8 @@ public abstract partial class InteractionTest
// Simple mob that has one hand and can perform misc interactions.
public const string TestPrototypes = @"
[TestPrototypes]
private const string TestPrototypes = @"
- type: entity
id: InteractionTestMob
components:
@@ -139,7 +140,7 @@ public abstract partial class InteractionTest
[SetUp]
public virtual async Task Setup()
{
PairTracker = await PoolManager.GetServerClient(new PoolSettings { ExtraPrototypes = TestPrototypes });
PairTracker = await PoolManager.GetServerClient();
// server dependencies
SEntMan = Server.ResolveDependency<IEntityManager>();
@@ -239,7 +240,7 @@ public abstract partial class InteractionTest
await PairTracker.CleanReturnAsync();
await TearDown();
}
protected virtual async Task TearDown()
{
}