From 19872d9e24009e29ae27f547d8ee568268f26b16 Mon Sep 17 00:00:00 2001
From: Andrei Zavatski <megaman9919@gmail.com>
Date: Mon, 17 Feb 2020 22:05:10 +0300
Subject: [PATCH] Simplify test scene

---
 .../TestSceneBeatmapListingSort.cs            | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
index 4638b2bb54..a5fa085abf 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneBeatmapListingSort.cs
@@ -24,39 +24,32 @@ namespace osu.Game.Tests.Visual.UserInterface
         [Cached]
         private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
 
-        private readonly FillFlowContainer placeholder;
-        private readonly BeatmapListingSortTabControl control;
-
         public TestSceneBeatmapListingSort()
         {
+            BeatmapListingSortTabControl control;
+            OsuSpriteText current;
+            OsuSpriteText direction;
+
             Add(control = new BeatmapListingSortTabControl
             {
                 Anchor = Anchor.Centre,
                 Origin = Anchor.Centre,
             });
 
-            Add(placeholder = new FillFlowContainer
+            Add(new FillFlowContainer
             {
                 AutoSizeAxes = Axes.Both,
                 Direction = FillDirection.Vertical,
                 Spacing = new Vector2(0, 5),
+                Children = new Drawable[]
+                {
+                    current = new OsuSpriteText(),
+                    direction = new OsuSpriteText()
+                }
             });
-        }
 
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
-            control.SortDirection.BindValueChanged(_ => updateBindablesVisual());
-            control.Current.BindValueChanged(_ => updateBindablesVisual(), true);
-        }
-
-        private void updateBindablesVisual()
-        {
-            placeholder.Clear();
-
-            placeholder.Add(new OsuSpriteText { Text = $"Current: {control.Current.Value}" });
-            placeholder.Add(new OsuSpriteText { Text = $"Sort direction: {control.SortDirection.Value}" });
+            control.SortDirection.BindValueChanged(sortDirection => direction.Text = $"Sort direction: {sortDirection.NewValue}", true);
+            control.Current.BindValueChanged(criteria => current.Text = $"Criteria: {criteria.NewValue}", true);
         }
     }
 }