diff --git a/Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs b/Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
index da061f052a..343a2fdb09 100644
--- a/Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
+++ b/Content.IntegrationTests/Tests/Chameleon/ChameleonJobLoadoutTest.cs
@@ -1,6 +1,4 @@
using System.Collections.Generic;
-using System.Text;
-using Content.Client.Implants;
using Content.IntegrationTests.Tests.Interaction;
using Content.Shared.Clothing;
using Content.Shared.Implants;
@@ -11,17 +9,17 @@ using Robust.Shared.Prototypes;
namespace Content.IntegrationTests.Tests.Chameleon;
///
-/// Ensures all round "round start jobs" have an associated chameleon loadout.
+/// Ensures all "round start jobs" have an associated chameleon loadout.
///
public sealed class ChameleonJobLoadoutTest : InteractionTest
{
- private readonly List> JobBlacklist =
+ private static readonly List> JobBlacklist =
[
];
[Test]
- public async Task CheckAllJobs()
+ public Task CheckAllJobs()
{
var alljobs = ProtoMan.EnumeratePrototypes();
@@ -47,24 +45,16 @@ public sealed class ChameleonJobLoadoutTest : InteractionTest
validJobs[chameleon.Job.Value] += 1;
}
- var errorMessage = new StringBuilder();
- errorMessage.AppendLine("The following job(s) have no chameleon prototype(s):");
- var invalid = false;
-
- // All round start jobs have a chameleon loadout
- foreach (var job in validJobs)
+ Assert.Multiple(() =>
{
- if (job.Value != 0)
- continue;
+ foreach (var job in validJobs)
+ {
+ Assert.That(job.Value, Is.Not.Zero,
+ $"{job.Key} has no chameleonOutfit prototype.");
+ }
+ });
- errorMessage.AppendLine(job.Key + " has no chameleonOutfit prototype.");
- invalid = true;
- }
-
- if (!invalid)
- return;
-
- Assert.Fail(errorMessage.ToString());
+ return Task.CompletedTask;
}
///