From ed4dda19363a1a112b4d55b6719c4d456073a459 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 31 Jul 2019 19:49:25 +0900
Subject: [PATCH] Support beatmap conversion tests with mods

---
 .../CatchBeatmapConversionTest.cs                         | 2 +-
 .../ManiaBeatmapConversionTest.cs                         | 2 +-
 osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs   | 2 +-
 .../TaikoBeatmapConversionTest.cs                         | 2 +-
 osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs          | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
index e45ed8c6f4..3a695ca179 100644
--- a/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         [TestCase("spinner")]
         [TestCase("spinner-and-circles")]
         [TestCase("slider")]
-        public new void Test(string name)
+        public void Test(string name)
         {
             base.Test(name);
         }
diff --git a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
index 51c7ba029a..3ca9dcc42c 100644
--- a/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Mania.Tests/ManiaBeatmapConversionTest.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Mania.Tests
         protected override string ResourceAssembly => "osu.Game.Rulesets.Mania";
 
         [TestCase("basic")]
-        public new void Test(string name)
+        public void Test(string name)
         {
             base.Test(name);
         }
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
index f98d63e6c7..6a6d0abe24 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuBeatmapConversionTest.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Tests
         [TestCase("basic")]
         [TestCase("colinear-perfect-curve")]
         [TestCase("slider-ticks")]
-        public new void Test(string name)
+        public void Test(string name)
         {
             base.Test(name);
         }
diff --git a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
index 68ae7544c2..bafa814582 100644
--- a/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
+++ b/osu.Game.Rulesets.Taiko.Tests/TaikoBeatmapConversionTest.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Rulesets.Taiko.Tests
         [NonParallelizable]
         [TestCase("basic")]
         [TestCase("slider-generating-drumroll")]
-        public new void Test(string name)
+        public void Test(string name)
         {
             base.Test(name);
         }
diff --git a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
index 1f2d457624..a555a52e42 100644
--- a/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
+++ b/osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
@@ -28,9 +28,9 @@ namespace osu.Game.Tests.Beatmaps
 
         protected abstract string ResourceAssembly { get; }
 
-        protected void Test(string name)
+        protected void Test(string name, params Type[] mods)
         {
-            var ourResult = convert(name);
+            var ourResult = convert(name, mods.Select(m => (Mod)Activator.CreateInstance(m)).ToArray());
             var expectedResult = read(name);
 
             Assert.Multiple(() =>
@@ -92,7 +92,7 @@ namespace osu.Game.Tests.Beatmaps
             });
         }
 
-        private ConvertResult convert(string name)
+        private ConvertResult convert(string name, Mod[] mods)
         {
             var beatmap = getBeatmap(name);
 
@@ -110,7 +110,7 @@ namespace osu.Game.Tests.Beatmaps
                 }
             };
 
-            working.GetPlayableBeatmap(rulesetInstance.RulesetInfo, Array.Empty<Mod>());
+            working.GetPlayableBeatmap(rulesetInstance.RulesetInfo, mods);
 
             return new ConvertResult
             {