From 3943fe96f4fe7084235c09fe1772bd6d23a9ac62 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 23 Aug 2024 20:44:35 +0900
Subject: [PATCH] Add failing test showing deserialise failing with some skins

---
 .../Archives/argon-invalid-drawable.osk          | Bin 0 -> 2403 bytes
 osu.Game.Tests/Skins/SkinDeserialisationTest.cs  |  13 +++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 osu.Game.Tests/Resources/Archives/argon-invalid-drawable.osk

diff --git a/osu.Game.Tests/Resources/Archives/argon-invalid-drawable.osk b/osu.Game.Tests/Resources/Archives/argon-invalid-drawable.osk
new file mode 100644
index 0000000000000000000000000000000000000000..23c318149cbe3840c4219611ea22cdebf8a60a17
GIT binary patch
literal 2403
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

literal 0
HcmV?d00001

diff --git a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
index 82b46ee75f..7372557161 100644
--- a/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
+++ b/osu.Game.Tests/Skins/SkinDeserialisationTest.cs
@@ -12,6 +12,7 @@ using osu.Framework.IO.Stores;
 using osu.Game.Audio;
 using osu.Game.IO;
 using osu.Game.IO.Archives;
+using osu.Game.Screens.Menu;
 using osu.Game.Screens.Play.HUD;
 using osu.Game.Screens.Play.HUD.HitErrorMeters;
 using osu.Game.Skinning;
@@ -125,6 +126,18 @@ namespace osu.Game.Tests.Skins
             }
         }
 
+        [Test]
+        public void TestDeserialiseInvalidDrawables()
+        {
+            using (var stream = TestResources.OpenResource("Archives/argon-invalid-drawable.osk"))
+            using (var storage = new ZipArchiveReader(stream))
+            {
+                var skin = new TestSkin(new SkinInfo(), null, storage);
+
+                Assert.That(skin.LayoutInfos.Any(kvp => kvp.Value.AllDrawables.Any(d => d.Type == typeof(StarFountain))), Is.False);
+            }
+        }
+
         [Test]
         public void TestDeserialiseModifiedClassic()
         {