From 3b6349a14522c7bc7293ead59b47d508fdfa0061 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 1 Aug 2022 14:16:26 +0900
Subject: [PATCH] Add test coverage of remaining components which weren't
 already included

---
 .../Archives/modified-classic-20220801.osk    | Bin 0 -> 1182 bytes
 .../Skins/SkinDeserialisationTest.cs          |  20 ++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 osu.Game.Tests/Resources/Archives/modified-classic-20220801.osk

diff --git a/osu.Game.Tests/Resources/Archives/modified-classic-20220801.osk b/osu.Game.Tests/Resources/Archives/modified-classic-20220801.osk
new file mode 100644
index 0000000000000000000000000000000000000000..9236e1d77f181e680171e0ffb4374f4eb291944d
GIT binary patch
literal 1182
zcmWIWW@Zs#U|`^2cvrv}`s~Z3;}d|q)nE|@hT`nZJiW}kOxZJre1{Bp94^`}H;C3&
z)Vh}EljCEc$Yx%qsI)Qg(TZ0$B`k!(7o`64|Nr}6iR>JCp2f#j1W&N85KT6mv4J7%
za*LSFF$-oP!-EFR({?egs(h-r*W|Vsn~rx#qoIqK56@jI)pHYWOt?_+e4V@4If?vt
zTRQ&Pe-iZOl$*6g<k*2LPMh=ZF1+Pj%r9Qq<@cyA0L9hk>~tTM0A1V##JoTZa&=~2
zTE1RZaekiZ8Aq-|4nU{Z`U`H(TFA4bbhQHOOE(*b8EIY_vmMl3UH0ted-d(}kMmp%
z)lm}s4b!&A&e2To4A3|85R#Kx@tt?uQQ2^{?OQL*_RA{&`^|6j<XscGGnb#N+g$Lk
z=WwY|=taXh78lKax4L)r2Sxu-UK5v(>O9TeKD;bIXE6aWKM)7!=cNay=A<T<fF0P~
z$I5`J!RW)`BX<}X7*29CFo*#)_$FrNd4#$+=jRsW=cVSA6od6$ofeyY+d!o4{b%i-
z^|FbP+fsRpF7CX|bUPwr*4-&_8t-N*ukv!8v@q?>{_}ow0%nVOW!QCnJX)!{_qdIf
z`=zrdKL0aY|NQ6mugX8>+r;1Is(sAg@a(&j=0dM8%wBO<cGg9_iU~i}$hqh3iUYrS
zk8!P4Q;f22oF0BDlueCGD}4vgp2)3J7X9G+x^*ABY2ef;bsIdbE{E+%E1O*LS-SVz
z6_&LZ&DNQJwEA=X?Cwi_<)6!(|5hGU<(X^HwP{|c_Ln_+Asa6(`zus>N?+M);XG|_
z?r*Crns(oPU>_58LyhgZRKT{gdrQxTJKdAah|SA$kKJazXrB131IL|Zm8S8niTGud
z<<z#K{8V9JyohV+wX3yKw>TY55_N7#|D5n+C-Z!!>3OA^Zx%oK%C41XQ*elRxvY&D
z%UQoemFq$+jdz(Oygg{xUnrw|=*EKonN1OgHmTT|d=_72Z71~g5Q9c{ny=~Nmyd*e
zTYo3@nAtD9>8JDSjIY1t@-F$!-yg}hI{&k<5&Yk}sZU=urm%dAvPiq(p-7)abw8I&
zsH%8oZc6{D-XSzAHSqs|8y#PIXY((6evy6Wv|Uz3+6i5oM2<)P|7Xr8sA$5)dHP$-
z^s?32*BXx5-uFvge@B=9mg3^u{{y@knM4?H=SyIsfPh921<R%Ay3q3lR1X6~<2I-+
vcrHQLik@Z>T0?;e6D<X!YerAM2+eIk&Dc|OfHx}}NF56hege|dm_a-MILX5&

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 2ef8de387b..9181dc80f3 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -7,6 +7,7 @@ using System.Linq;
 using NUnit.Framework;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.IO.Stores;
@@ -14,6 +15,7 @@ using osu.Game.Audio;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
 using osu.Game.Screens.Play.HUD;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
 using osu.Game.Tests.Resources;
 
@@ -34,7 +36,9 @@ namespace osu.Game.Tests.Skins
         {
             // Covers song progress before namespace changes, and most other components.
             "Archives/modified-default-20220723.osk",
-            "Archives/modified-classic-20220723.osk"
+            "Archives/modified-classic-20220723.osk",
+            // Covers legacy song progress, UR counter, colour hit error metre.
+            "Archives/modified-classic-20220801.osk"
         };
 
         /// <summary>
@@ -60,7 +64,9 @@ namespace osu.Game.Tests.Skins
                 }
             }
 
-            Assert.That(SkinnableInfo.GetAllAvailableDrawables(), Is.EquivalentTo(instantiatedTypes));
+            var editableTypes = SkinnableInfo.GetAllAvailableDrawables().Where(t => (Activator.CreateInstance(t) as ISkinnableDrawable)?.IsEditable == true);
+
+            Assert.That(instantiatedTypes, Is.EquivalentTo(editableTypes));
         }
 
         [Test]
@@ -94,6 +100,16 @@ namespace osu.Game.Tests.Skins
                 Assert.That(skinnableInfo.Settings.First().Key, Is.EqualTo("sprite_name"));
                 Assert.That(skinnableInfo.Settings.First().Value, Is.EqualTo("ppy_logo-2.png"));
             }
+
+            using (var stream = TestResources.OpenResource("Archives/modified-classic-20220801.osk"))
+            using (var storage = new ZipArchiveReader(stream))
+            {
+                var skin = new TestSkin(new SkinInfo(), null, storage);
+                Assert.That(skin.DrawableComponentInfo[SkinnableTarget.MainHUDComponents], Has.Length.EqualTo(8));
+                Assert.That(skin.DrawableComponentInfo[SkinnableTarget.MainHUDComponents].Select(i => i.Type), Contains.Item(typeof(UnstableRateCounter)));
+                Assert.That(skin.DrawableComponentInfo[SkinnableTarget.MainHUDComponents].Select(i => i.Type), Contains.Item(typeof(ColourHitErrorMeter)));
+                Assert.That(skin.DrawableComponentInfo[SkinnableTarget.MainHUDComponents].Select(i => i.Type), Contains.Item(typeof(LegacySongProgress)));
+            }
         }
 
         private class TestSkin : Skin