tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove PoolSettings.ExtraPrototypes option (#18678)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.IntegrationTests/Tests/Utility/EntityWhitelistTest.cs
View File

@@ -12,11 +12,12 @@ namespace Content.IntegrationTests.Tests.Utility
private const string InvalidComponent = "Sprite";
private const string ValidComponent = "Physics";
private static readonly string Prototypes = $@"
[TestPrototypes]
private const string Prototypes = $@"
- type: Tag
id: ValidTag
id: WhitelistTestValidTag
- type: Tag
id: InvalidTag
id: WhitelistTestInvalidTag
- type: entity
id: WhitelistDummy
@@ -30,34 +31,34 @@ namespace Content.IntegrationTests.Tests.Utility
components:
- {ValidComponent}
tags:
- ValidTag
- WhitelistTestValidTag
- type: entity
id: InvalidComponentDummy
components:
- type: {InvalidComponent}
- type: entity
id: InvalidTagDummy
id: WhitelistTestInvalidTagDummy
components:
- type: Tag
tags:
- InvalidTag
- WhitelistTestInvalidTag
- type: entity
id: ValidComponentDummy
components:
- type: {ValidComponent}
- type: entity
id: ValidTagDummy
id: WhitelistTestValidTagDummy
components:
- type: Tag
tags:
- ValidTag";
- WhitelistTestValidTag";
[Test]
public async Task Test()
{
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, ExtraPrototypes = Prototypes });
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings { NoClient = true });
var server = pairTracker.Pair.Server;
var testMap = await PoolManager.CreateTestMap(pairTracker);
@@ -68,16 +69,16 @@ namespace Content.IntegrationTests.Tests.Utility
await server.WaitAssertion(() =>
{
var validComponent = sEntities.SpawnEntity("ValidComponentDummy", mapCoordinates);
var validTag = sEntities.SpawnEntity("ValidTagDummy", mapCoordinates);
var WhitelistTestValidTag = sEntities.SpawnEntity("WhitelistTestValidTagDummy", mapCoordinates);
var invalidComponent = sEntities.SpawnEntity("InvalidComponentDummy", mapCoordinates);
var invalidTag = sEntities.SpawnEntity("InvalidTagDummy", mapCoordinates);
var WhitelistTestInvalidTag = sEntities.SpawnEntity("WhitelistTestInvalidTagDummy", mapCoordinates);
// Test instantiated on its own
var whitelistInst = new EntityWhitelist
{
Components = new[] { $"{ValidComponent}" },
Tags = new() { "ValidTag" }
Tags = new() { "WhitelistTestValidTag" }
};
whitelistInst.UpdateRegistrations();
Assert.That(whitelistInst, Is.Not.Null);
@@ -91,10 +92,10 @@ namespace Content.IntegrationTests.Tests.Utility
Assert.Multiple(() =>
{
Assert.That(whitelistInst.IsValid(validComponent), Is.True);
Assert.That(whitelistInst.IsValid(validTag), Is.True);
Assert.That(whitelistInst.IsValid(WhitelistTestValidTag), Is.True);
Assert.That(whitelistInst.IsValid(invalidComponent), Is.False);
Assert.That(whitelistInst.IsValid(invalidTag), Is.False);
Assert.That(whitelistInst.IsValid(WhitelistTestInvalidTag), Is.False);
});
// Test from serialized
@@ -111,10 +112,10 @@ namespace Content.IntegrationTests.Tests.Utility
Assert.Multiple(() =>
{
Assert.That(whitelistSer.IsValid(validComponent), Is.True);
Assert.That(whitelistSer.IsValid(validTag), Is.True);
Assert.That(whitelistSer.IsValid(WhitelistTestValidTag), Is.True);
Assert.That(whitelistSer.IsValid(invalidComponent), Is.False);
Assert.That(whitelistSer.IsValid(invalidTag), Is.False);
Assert.That(whitelistSer.IsValid(WhitelistTestInvalidTag), Is.False);
});
});
await pairTracker.CleanReturnAsync();