Merge pull request #32938 from bdach/ruleset-skin-combo-testing

Add test scene coverage of HUD layouts on various ruleset/skin combinations
2026-05-19 03:11:23 +08:00 · 2025-04-26 05:48:26 +09:00
parent 3cbdf2b890 0301463810
commit 4d3631cf96
2 changed files with 161 additions and 4 deletions
@@ -0,0 +1,156 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Track;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Rendering;
+using osu.Framework.Graphics.Textures;
+using osu.Framework.IO.Stores;
+using osu.Framework.Platform;
+using osu.Game.Beatmaps;
+using osu.Game.Database;
+using osu.Game.IO;
+using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Online.Spectator;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Rulesets.UI.Scrolling;
+using osu.Game.Scoring;
+using osu.Game.Screens.Play;
+using osu.Game.Screens.Select.Leaderboards;
+using osu.Game.Skinning;
+using osu.Game.Tests.Gameplay;
+using osu.Game.Tests.Visual.Spectator;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+    [Description(@"Exercises the appearance of the HUD overlay on various skin and ruleset combinations.")]
+    public partial class TestSceneHUDOverlayRulesetLayouts : OsuTestScene, IStorageResourceProvider
+    {
+        private readonly Dictionary<string, ISkin> skins = new Dictionary<string, ISkin>();
+
+        [Resolved]
+        private GameHost host { get; set; } = null!;
+
+        [Resolved]
+        private RulesetStore rulesets { get; set; } = null!;
+
+        [BackgroundDependencyLoader]
+        private void load()
+        {
+            skins["argon"] = new ArgonSkin(this);
+            skins["triangles"] = new TrianglesSkin(this);
+            skins["legacy"] = new DefaultLegacySkin(this);
+        }
+
+        [Test]
+        public void TestLayout(
+            [Values("argon", "triangles", "legacy")]
+            string skinName,
+            [Values("osu", "taiko", "fruits", "mania")]
+            string rulesetName)
+        {
+            AddStep("create content", () =>
+            {
+                var rulesetInfo = rulesets.GetRuleset(rulesetName);
+                var ruleset = rulesetInfo!.CreateInstance();
+                var beatmap = ruleset.CreateBeatmapConverter(new Beatmap()).Convert();
+                var drawableRuleset = ruleset.CreateDrawableRulesetWith(beatmap);
+
+                ISkin provider = ruleset.CreateSkinTransformer(skins[skinName], beatmap)!;
+
+                var gameplayState = TestGameplayState.Create(ruleset);
+                ((Bindable<LocalUserPlayingState>)gameplayState.PlayingState).Value = LocalUserPlayingState.Playing;
+                var spectatorClient = new TestSpectatorClient();
+
+                for (int i = 0; i < 15; ++i)
+                {
+                    ((ISpectatorClient)spectatorClient).UserStartedWatching([
+                        new SpectatorUser
+                        {
+                            OnlineID = i,
+                            Username = $"User {i}"
+                        }
+                    ]);
+                }
+
+                GameplayClockContainer gameplayClock;
+
+                List<(Type, object)> dependencies =
+                [
+                    (typeof(GameplayState), gameplayState),
+                    (typeof(ScoreProcessor), gameplayState.ScoreProcessor),
+                    (typeof(HealthProcessor), gameplayState.HealthProcessor),
+                    (typeof(IGameplayClock), gameplayClock = new GameplayClockContainer(new TrackVirtual(60000), false, false)),
+                    (typeof(SpectatorClient), spectatorClient),
+                    (typeof(IGameplayLeaderboardProvider), new TestGameplayLeaderboardProvider()),
+                ];
+
+                if (drawableRuleset is IDrawableScrollingRuleset scrolling)
+                    dependencies.Add((typeof(IScrollingInfo), scrolling.ScrollingInfo));
+
+                Child = new DependencyProvidingContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    CachedDependencies = dependencies.ToArray(),
+                    Children = new Drawable[]
+                    {
+                        spectatorClient,
+                        new SkinProvidingContainer(provider)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Children = new Drawable[]
+                            {
+                                drawableRuleset,
+                                new HUDOverlay(drawableRuleset, [])
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                }
+                            }
+                        }
+                    }
+                };
+
+                gameplayClock.Start();
+            });
+        }
+
+        private class TestGameplayLeaderboardProvider : IGameplayLeaderboardProvider
+        {
+            IBindableList<GameplayLeaderboardScore> IGameplayLeaderboardProvider.Scores => Scores;
+            public BindableList<GameplayLeaderboardScore> Scores { get; } = new BindableList<GameplayLeaderboardScore>();
+            public bool IsPartial { get; } = false;
+
+            public TestGameplayLeaderboardProvider()
+            {
+                for (int i = 0; i < 20; ++i)
+                {
+                    Scores.Add(new GameplayLeaderboardScore(new ScoreInfo
+                    {
+                        User = new APIUser { Username = $"User {i}" },
+                        TotalScore = (20 - i) * 50_000,
+                        Accuracy = i * 0.05,
+                        Combo = i * 50
+                    }, i == 19));
+                }
+            }
+        }
+
+        #region IResourceStorageProvider
+
+        public IRenderer Renderer => host.Renderer;
+        public AudioManager AudioManager => Audio;
+        public IResourceStore<byte[]> Files => null!;
+        public new IResourceStore<byte[]> Resources => base.Resources;
+        public IResourceStore<TextureUpload> CreateTextureLoaderStore(IResourceStore<byte[]> underlyingStore) => host.CreateTextureLoaderStore(underlyingStore);
+        RealmAccess IStorageResourceProvider.RealmAccess => null!;
+
+        #endregion
+    }
+}
@@ -68,10 +68,6 @@ namespace osu.Game.Skinning
            switch (lookup)
            {
                case GlobalSkinnableContainerLookup containerLookup:
-                    // Only handle global level defaults for now.
-                    if (containerLookup.Ruleset != null)
-                        return null;
-
                    switch (containerLookup.Lookup)
                    {
                        case GlobalSkinnableContainers.SongSelect:
@@ -83,6 +79,11 @@ namespace osu.Game.Skinning
                            return songSelectComponents;

                        case GlobalSkinnableContainers.MainHUDComponents:
+                            if (containerLookup.Ruleset != null)
+                            {
+                                return new DefaultSkinComponentsContainer(_ => { });
+                            }
+
                            var skinnableTargetWrapper = new DefaultSkinComponentsContainer(container =>
                            {
                                var score = container.OfType<DefaultScoreCounter>().FirstOrDefault();