From 1cf240b5fff1c269f9e668970a4046d963521b41 Mon Sep 17 00:00:00 2001
From: Endrik Tombak <enduslittlecomputer@gmail.com>
Date: Sun, 12 Apr 2020 20:04:25 +0300
Subject: [PATCH] Test new predicate behaviour

---
 .../Navigation/TestScenePresentBeatmap.cs     | 57 +++++++++++++++----
 1 file changed, 45 insertions(+), 12 deletions(-)

diff --git a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
index 909409835c..27f5b29738 100644
--- a/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
+++ b/osu.Game.Tests/Visual/Navigation/TestScenePresentBeatmap.cs
@@ -20,26 +20,30 @@ namespace osu.Game.Tests.Visual.Navigation
         public void TestFromMainMenu()
         {
             var firstImport = importBeatmap(1);
+            var secondimport = importBeatmap(3);
+
             presentAndConfirm(firstImport);
-
-            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
-            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
-
-            var secondimport = importBeatmap(2);
+            returnToMenu();
             presentAndConfirm(secondimport);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]
         public void TestFromMainMenuDifferentRuleset()
         {
             var firstImport = importBeatmap(1);
+            var secondimport = importBeatmap(3, new ManiaRuleset().RulesetInfo);
+
             presentAndConfirm(firstImport);
-
-            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
-            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
-
-            var secondimport = importBeatmap(2, new ManiaRuleset().RulesetInfo);
+            returnToMenu();
             presentAndConfirm(secondimport);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            returnToMenu();
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]
@@ -48,8 +52,11 @@ namespace osu.Game.Tests.Visual.Navigation
             var firstImport = importBeatmap(1);
             presentAndConfirm(firstImport);
 
-            var secondimport = importBeatmap(2);
+            var secondimport = importBeatmap(3);
             presentAndConfirm(secondimport);
+
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            presentSecondDifficultyAndConfirm(secondimport, 3);
         }
 
         [Test]
@@ -58,8 +65,17 @@ namespace osu.Game.Tests.Visual.Navigation
             var firstImport = importBeatmap(1);
             presentAndConfirm(firstImport);
 
-            var secondimport = importBeatmap(2, new ManiaRuleset().RulesetInfo);
+            var secondimport = importBeatmap(3, new ManiaRuleset().RulesetInfo);
             presentAndConfirm(secondimport);
+
+            presentSecondDifficultyAndConfirm(firstImport, 1);
+            presentSecondDifficultyAndConfirm(secondimport, 3);
+        }
+
+        private void returnToMenu()
+        {
+            AddStep("return to menu", () => Game.ScreenStack.CurrentScreen.Exit());
+            AddUntilStep("wait for menu", () => Game.ScreenStack.CurrentScreen is MainMenu);
         }
 
         private Func<BeatmapSetInfo> importBeatmap(int i, RulesetInfo ruleset = null)
@@ -89,6 +105,13 @@ namespace osu.Game.Tests.Visual.Navigation
                             BaseDifficulty = difficulty,
                             Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
                         },
+                        new BeatmapInfo
+                        {
+                            OnlineBeatmapID = i * 2048,
+                            Metadata = metadata,
+                            BaseDifficulty = difficulty,
+                            Ruleset = ruleset ?? new OsuRuleset().RulesetInfo
+                        },
                     }
                 }).Result;
             });
@@ -106,5 +129,15 @@ namespace osu.Game.Tests.Visual.Navigation
             AddUntilStep("correct beatmap displayed", () => Game.Beatmap.Value.BeatmapSetInfo.ID == getImport().ID);
             AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
         }
+
+        private void presentSecondDifficultyAndConfirm(Func<BeatmapSetInfo> getImport, int importedID)
+        {
+            Predicate<BeatmapInfo> pred = b => b.OnlineBeatmapID == importedID * 2048;
+            AddStep("present difficulty", () => Game.PresentBeatmap(getImport(), pred));
+
+            AddUntilStep("wait for song select", () => Game.ScreenStack.CurrentScreen is Screens.Select.SongSelect);
+            AddUntilStep("correct beatmap displayed", () => Game.Beatmap.Value.BeatmapInfo.OnlineBeatmapID == importedID * 2048);
+            AddAssert("correct ruleset selected", () => Game.Ruleset.Value.ID == getImport().Beatmaps.First().Ruleset.ID);
+        }
     }
 }