From af35df4077015c5b45ebb5b8f304e9bdc58702f0 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 6 Dec 2019 15:42:11 +0900
Subject: [PATCH] Add multiple mod testing and update test code style

---
 .../TestSceneModCustomizationSettings.cs      | 56 +++++++++++--------
 osu.Game/Overlays/Mods/ModSelectOverlay.cs    |  2 +-
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModCustomizationSettings.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModCustomizationSettings.cs
index 83d77cccdb..f789e60252 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModCustomizationSettings.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModCustomizationSettings.cs
@@ -27,7 +27,7 @@ private void load()
                 Anchor = Anchor.BottomCentre,
             });
 
-            var testMod = new TestModCustomizable();
+            var testMod = new TestModCustomizable1();
 
             AddStep("open", modSelect.Show);
             AddAssert("button disabled", () => !modSelect.CustomizeButton.Enabled.Value);
@@ -44,64 +44,74 @@ private class TestModSelectOverlay : ModSelectOverlay
             public new TriangleButton CustomizeButton => base.CustomizeButton;
 
             public void SelectMod(Mod mod) =>
-                ModSectionsContainer.Children.Single((s) => s.ModType == mod.Type)
-                    .ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType())).SelectNext(1);
+                ModSectionsContainer.Children.Single(s => s.ModType == mod.Type)
+                                    .ButtonsContainer.OfType<ModButton>().Single(b => b.Mods.Any(m => m.GetType() == mod.GetType())).SelectNext(1);
 
             public ModControlSection GetControlSection(Mod mod) =>
-                ModSettingsContent.Children.FirstOrDefault((s) => s.Mod == mod);
+                ModSettingsContent.Children.FirstOrDefault(s => s.Mod == mod);
 
             protected override void LoadComplete()
             {
                 base.LoadComplete();
 
                 foreach (var section in ModSectionsContainer)
+                {
                     if (section.ModType == ModType.Conversion)
-                        section.Mods = new Mod[] { new TestModCustomizable() };
+                    {
+                        section.Mods = new Mod[]
+                        {
+                            new TestModCustomizable1(),
+                            new TestModCustomizable2()
+                        };
+                    }
                     else
                         section.Mods = new Mod[] { };
+                }
             }
         }
 
-        private class TestModCustomizable : Mod, IModHasSettings
+        private class TestModCustomizable1 : TestModCustomizable
         {
-            public override string Name => "Customizable Mod";
+            public override string Name => "Customizable Mod 1";
 
-            public override string Acronym => "CM";
+            public override string Acronym => "CM1";
+        }
 
+        private class TestModCustomizable2 : TestModCustomizable
+        {
+            public override string Name => "Customizable Mod 2";
+
+            public override string Acronym => "CM2";
+        }
+
+        private abstract class TestModCustomizable : Mod, IModHasSettings
+        {
             public override double ScoreMultiplier => 1.0;
 
             public override ModType Type => ModType.Conversion;
 
-            public readonly BindableFloat sliderBindable = new BindableFloat
+            public readonly BindableFloat SliderBindable = new BindableFloat
             {
                 MinValue = 0,
                 MaxValue = 10,
             };
 
-            public readonly BindableBool tickBindable = new BindableBool();
+            public readonly BindableBool TickBindable = new BindableBool();
 
-            public Drawable[] CreateControls()
-            {
-                BindableFloat sliderControl = new BindableFloat();
-                BindableBool tickControl = new BindableBool();
-
-                sliderControl.BindTo(sliderBindable);
-                tickControl.BindTo(tickBindable);
-
-                return new Drawable[]
+            public Drawable[] CreateControls() =>
+                new Drawable[]
                 {
                     new SettingsSlider<float>
                     {
                         LabelText = "Slider",
-                        Bindable = sliderControl
+                        Bindable = SliderBindable
                     },
                     new SettingsCheckbox
                     {
                         LabelText = "Checkbox",
-                        Bindable = tickControl
+                        Bindable = TickBindable
                     }
                 };
-            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
index fc5ed1b3f3..d7d1135e81 100644
--- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs
+++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs
@@ -345,7 +345,7 @@ private void updateModSettings(ValueChangedEvent<IReadOnlyList<Mod>> selectedMod
             if (added is IModHasSettings)
                 ModSettingsContent.Add(new ModControlSection(added));
             else if (removed is IModHasSettings)
-                ModSettingsContent.Remove(ModSettingsContent.Children.Where(section => section.Mod == removed).Single());
+                ModSettingsContent.Remove(ModSettingsContent.Children.Single(section => section.Mod == removed));
 
             CustomizeButton.Enabled.Value = ModSettingsContent.Children.Count > 0;