From ed1918cd43984e68e23da1bfd03f7f7375d1ba7f Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Sun, 3 Jun 2018 23:10:44 +0900
Subject: [PATCH] Wait for loading beatmaps

---
 .../Visual/TestCaseBeatmapCarousel.cs         | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
index f819e882d9..4679fca855 100644
--- a/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
+++ b/osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs
@@ -65,11 +65,7 @@ private void load(RulesetStore rulesets)
 
             carousel.SelectionChanged = s => currentSelection = s;
 
-            AddStep("Load Beatmaps", () => { carousel.BeatmapSets = beatmapSets; });
-
-            bool changed = false;
-            carousel.BeatmapSetsChanged = () => changed = true;
-            AddUntilStep(() => changed, "Wait for load");
+            loadBeatmaps(beatmapSets);
 
             testTraversal();
             testFiltering();
@@ -84,6 +80,17 @@ private void load(RulesetStore rulesets)
             testCarouselRootIsRandom();
         }
 
+        private void loadBeatmaps(List<BeatmapSetInfo> beatmapSets)
+        {
+            bool changed = false;
+            AddStep($"Load {beatmapSets.Count} Beatmaps", () =>
+            {
+                carousel.BeatmapSetsChanged = () => changed = true;
+                carousel.BeatmapSets = beatmapSets;
+            });
+            AddUntilStep(() => changed, "Wait for load");
+        }
+
         private void ensureRandomFetchSuccess() =>
             AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
 
@@ -423,7 +430,7 @@ private void testCarouselRootIsRandom()
             for (int i = 1; i <= 50; i++)
                 beatmapSets.Add(createTestBeatmapSet(i));
 
-            AddStep("Load 50 Beatmaps", () => { carousel.BeatmapSets = beatmapSets; });
+            loadBeatmaps(beatmapSets);
             advanceSelection(direction: 1, diff: false);
             checkNonmatchingFilter();
             checkNonmatchingFilter();