Add AssertMultiple to ContrabandTest (#35662)

* add AssertMultiple to ContrabandTest

* do the same for magazine visuals test

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

diff --git a/Content.IntegrationTests/Tests/ContrabandTest.cs b/Content.IntegrationTests/Tests/ContrabandTest.cs
index ebd6afa7efe232b89890f4fcf09d386b3b3dd3a6..a33e7c2067bc15033b2535b36fd6060ea4a8e6f2 100644 (file)
--- a/Content.IntegrationTests/Tests/ContrabandTest.cs
+++ b/Content.IntegrationTests/Tests/ContrabandTest.cs
@@ -17,23 +17,26 @@ public sealed class ContrabandTest
 
         await client.WaitAssertion(() =>
         {
-            foreach (var proto in protoMan.EnumeratePrototypes<EntityPrototype>())
+            Assert.Multiple(() =>
             {
-                if (proto.Abstract || pair.IsTestPrototype(proto))
-                    continue;
+                foreach (var proto in protoMan.EnumeratePrototypes<EntityPrototype>())
+                {
+                    if (proto.Abstract || pair.IsTestPrototype(proto))
+                        continue;
 
-                if (!proto.TryGetComponent<ContrabandComponent>(out var contraband, componentFactory))
-                    continue;
+                    if (!proto.TryGetComponent<ContrabandComponent>(out var contraband, componentFactory))
+                        continue;
 
-                Assert.That(protoMan.TryIndex(contraband.Severity, out var severity, false),
-                    @$"{proto.ID} has a ContrabandComponent with a unknown severity.");
+                    Assert.That(protoMan.TryIndex(contraband.Severity, out var severity, false),
+                        @$"{proto.ID} has a ContrabandComponent with a unknown severity.");
 
-                if (!severity.ShowDepartmentsAndJobs)
-                    continue;
+                    if (!severity.ShowDepartmentsAndJobs)
+                        continue;
 
-                Assert.That(contraband.AllowedDepartments.Count + contraband.AllowedJobs.Count, Is.Not.EqualTo(0),
-                    @$"{proto.ID} has a ContrabandComponent with ShowDepartmentsAndJobs but no allowed departments or jobs.");
-            }
+                    Assert.That(contraband.AllowedDepartments.Count + contraband.AllowedJobs.Count, Is.Not.EqualTo(0),
+                        @$"{proto.ID} has a ContrabandComponent with ShowDepartmentsAndJobs but no allowed departments or jobs.");
+                }
+            });
         });
 
         await pair.CleanReturnAsync();

diff --git a/Content.IntegrationTests/Tests/MagazineVisualsSpriteTest.cs b/Content.IntegrationTests/Tests/MagazineVisualsSpriteTest.cs
index f0f3b72d8dfdc535762fcce84d5069747b6612ef..fb0c67afd7a1b6f7dfcc9f718d046cdc3cd2e8f5 100644 (file)
--- a/Content.IntegrationTests/Tests/MagazineVisualsSpriteTest.cs
+++ b/Content.IntegrationTests/Tests/MagazineVisualsSpriteTest.cs
@@ -23,46 +23,49 @@ public sealed class MagazineVisualsSpriteTest
 
         await client.WaitAssertion(() =>
         {
-            foreach (var proto in protoMan.EnumeratePrototypes<EntityPrototype>())
+            Assert.Multiple(() =>
             {
-                if (proto.Abstract || pair.IsTestPrototype(proto))
-                    continue;
+                foreach (var proto in protoMan.EnumeratePrototypes<EntityPrototype>())
+                {
+                    if (proto.Abstract || pair.IsTestPrototype(proto))
+                        continue;
 
-                if (!proto.TryGetComponent<MagazineVisualsComponent>(out var visuals, componentFactory))
-                    continue;
+                    if (!proto.TryGetComponent<MagazineVisualsComponent>(out var visuals, componentFactory))
+                        continue;
 
-                Assert.That(proto.TryGetComponent<SpriteComponent>(out var sprite, componentFactory),
-                    @$"{proto.ID} has MagazineVisualsComponent but no SpriteComponent.");
-                Assert.That(proto.HasComponent<AppearanceComponent>(componentFactory),
-                    @$"{proto.ID} has MagazineVisualsComponent but no AppearanceComponent.");
+                    Assert.That(proto.TryGetComponent<SpriteComponent>(out var sprite, componentFactory),
+                        @$"{proto.ID} has MagazineVisualsComponent but no SpriteComponent.");
+                    Assert.That(proto.HasComponent<AppearanceComponent>(componentFactory),
+                        @$"{proto.ID} has MagazineVisualsComponent but no AppearanceComponent.");
 
-                var toTest = new List<(int, string)>();
-                if (sprite.LayerMapTryGet(GunVisualLayers.Mag, out var magLayerId))
-                    toTest.Add((magLayerId, ""));
-                if (sprite.LayerMapTryGet(GunVisualLayers.MagUnshaded, out var magUnshadedLayerId))
-                    toTest.Add((magUnshadedLayerId, "-unshaded"));
+                    var toTest = new List<(int, string)>();
+                    if (sprite.LayerMapTryGet(GunVisualLayers.Mag, out var magLayerId))
+                        toTest.Add((magLayerId, ""));
+                    if (sprite.LayerMapTryGet(GunVisualLayers.MagUnshaded, out var magUnshadedLayerId))
+                        toTest.Add((magUnshadedLayerId, "-unshaded"));
 
-                Assert.That(toTest, Is.Not.Empty,
-                    @$"{proto.ID} has MagazineVisualsComponent but no Mag or MagUnshaded layer map.");
+                    Assert.That(toTest, Is.Not.Empty,
+                        @$"{proto.ID} has MagazineVisualsComponent but no Mag or MagUnshaded layer map.");
 
-                var start = visuals.ZeroVisible ? 0 : 1;
-                foreach (var (id, midfix) in toTest)
-                {
-                    Assert.That(sprite.TryGetLayer(id, out var layer));
-                    var rsi = layer.ActualRsi;
-                    for (var i = start; i < visuals.MagSteps; i++)
+                    var start = visuals.ZeroVisible ? 0 : 1;
+                    foreach (var (id, midfix) in toTest)
                     {
-                        var state = $"{visuals.MagState}{midfix}-{i}";
-                        Assert.That(rsi.TryGetState(state, out _),
-                            @$"{proto.ID} has MagazineVisualsComponent with MagSteps = {visuals.MagSteps}, but {rsi.Path} doesn't have state {state}!");
-                    }
+                        Assert.That(sprite.TryGetLayer(id, out var layer));
+                        var rsi = layer.ActualRsi;
+                        for (var i = start; i < visuals.MagSteps; i++)
+                        {
+                            var state = $"{visuals.MagState}{midfix}-{i}";
+                            Assert.That(rsi.TryGetState(state, out _),
+                                @$"{proto.ID} has MagazineVisualsComponent with MagSteps = {visuals.MagSteps}, but {rsi.Path} doesn't have state {state}!");
+                        }
 
-                    // MagSteps includes the 0th step, so sometimes people are off by one.
-                    var extraState = $"{visuals.MagState}{midfix}-{visuals.MagSteps}";
-                    Assert.That(rsi.TryGetState(extraState, out _), Is.False,
-                        @$"{proto.ID} has MagazineVisualsComponent with MagSteps = {visuals.MagSteps}, but more states exist!");
+                        // MagSteps includes the 0th step, so sometimes people are off by one.
+                        var extraState = $"{visuals.MagState}{midfix}-{visuals.MagSteps}";
+                        Assert.That(rsi.TryGetState(extraState, out _), Is.False,
+                            @$"{proto.ID} has MagazineVisualsComponent with MagSteps = {visuals.MagSteps}, but more states exist!");
+                    }
                 }
-            }
+            });
         });
 
         await pair.CleanReturnAsync();