Add an integration test for solution fill level sprites. (#28564)

diff --git a/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
new file mode 100644 (file)
index 0000000..37e777f
--- /dev/null
+++ b/Content.IntegrationTests/Tests/FillLevelSpriteTest.cs
@@ -0,0 +1,71 @@
+using System.Linq;
+using Content.Shared.Chemistry.Components;
+using Robust.Client.GameObjects;
+using Robust.Shared.GameObjects;
+using Robust.Shared.Prototypes;
+
+namespace Content.IntegrationTests.Tests;
+
+/// <summary>
+/// Tests to see if any entity prototypes specify solution fill level sprites that don't exist.
+/// </summary>
+[TestFixture]
+public sealed class FillLevelSpriteTest
+{
+    private static readonly string[] HandStateNames = ["left", "right"];
+
+    [Test]
+    public async Task FillLevelSpritesExist()
+    {
+        await using var pair = await PoolManager.GetServerClient();
+        var client = pair.Client;
+        var protoMan = client.ResolveDependency<IPrototypeManager>();
+        var componentFactory = client.ResolveDependency<IComponentFactory>();
+
+        await client.WaitAssertion(() =>
+        {
+            var protos = protoMan.EnumeratePrototypes<EntityPrototype>()
+                .Where(p => !p.Abstract)
+                .Where(p => !pair.IsTestPrototype(p))
+                .Where(p => p.TryGetComponent<SolutionContainerVisualsComponent>(out _, componentFactory))
+                .OrderBy(p => p.ID)
+                .ToList();
+
+            foreach (var proto in protos)
+            {
+                Assert.That(proto.TryGetComponent<SolutionContainerVisualsComponent>(out var visuals, componentFactory));
+                Assert.That(proto.TryGetComponent<SpriteComponent>(out var sprite, componentFactory));
+
+                var rsi = sprite.BaseRSI;
+
+                // Test base sprite fills
+                if (!string.IsNullOrEmpty(visuals.FillBaseName))
+                {
+                    for (var i = 1; i <= visuals.MaxFillLevels; i++)
+                    {
+                        var state = $"{visuals.FillBaseName}{i}";
+                        Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                            MaxFillLevels = {visuals.MaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                    }
+                }
+
+                // Test inhand sprite fills
+                if (!string.IsNullOrEmpty(visuals.InHandsFillBaseName))
+                {
+                    for (var i = 1; i <= visuals.InHandsMaxFillLevels; i++)
+                    {
+                        foreach (var handname in HandStateNames)
+                        {
+                            var state = $"inhand-{handname}{visuals.InHandsFillBaseName}{i}";
+                            Assert.That(rsi.TryGetState(state, out _), @$"{proto.ID} has SolutionContainerVisualsComponent with
+                                InHandsMaxFillLevels = {visuals.InHandsMaxFillLevels}, but {rsi.Path} doesn't have state {state}!");
+                        }
+
+                    }
+                }
+            }
+        });
+
+        await pair.CleanReturnAsync();
+    }
+}

diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
index 36c841995e5c7bbdf070546bc7769edbd03fd734..c0b5eb33999d9b9b4b40ed151af578242d2ef056 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml
@@ -83,10 +83,6 @@
             max: 1
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
-  - type: Appearance
-  - type: SolutionContainerVisuals
-    maxFillLevels: 1
-    fillBaseName: dart
 
 - type: entity
   parent: Dart

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index ce0e0b629a3e605bdada7e90515c171941510500..dd15a90baa2384b774d7717ad817ed7a17e8e2f4 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -233,6 +233,8 @@
     sprite: Objects/Specific/Chemistry/beaker_cryostasis.rsi
     layers:
       - state: beakernoreact
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
   - type: SolutionContainerManager
     solutions:
       beaker:
@@ -251,6 +253,8 @@
     sprite: Objects/Specific/Chemistry/beaker_bluespace.rsi
     layers:
       - state: beakerbluespace
+  - type: SolutionContainerVisuals
+    maxFillLevels: 0
   - type: SolutionContainerManager
     solutions:
       beaker: