From 5fd6246d1b5e3b0d650cf4117d10df84b6d9f5de Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 24 Jun 2020 17:57:07 +0900
Subject: [PATCH] Fix remaining test scenes

---
 .../Screens/TestSceneTeamWinScreen.cs               | 10 ++--------
 osu.Game.Tournament.Tests/TournamentTestScene.cs    | 13 +++++--------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
index 6873fb0f4b..3ca58dcaf4 100644
--- a/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
+++ b/osu.Game.Tournament.Tests/Screens/TestSceneTeamWinScreen.cs
@@ -4,25 +4,19 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Tournament.Models;
 using osu.Game.Tournament.Screens.TeamWin;
 
 namespace osu.Game.Tournament.Tests.Screens
 {
     public class TestSceneTeamWinScreen : TournamentTestScene
     {
-        [Cached]
-        private readonly LadderInfo ladder = new LadderInfo();
-
         [BackgroundDependencyLoader]
         private void load()
         {
-            var match = new TournamentMatch();
-            match.Team1.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "USA");
-            match.Team2.Value = Ladder.Teams.FirstOrDefault(t => t.Acronym.Value == "JPN");
+            var match = Ladder.CurrentMatch.Value;
+
             match.Round.Value = Ladder.Rounds.FirstOrDefault(g => g.Name.Value == "Finals");
             match.Completed.Value = true;
-            ladder.CurrentMatch.Value = match;
 
             Add(new TeamWinScreen
             {
diff --git a/osu.Game.Tournament.Tests/TournamentTestScene.cs b/osu.Game.Tournament.Tests/TournamentTestScene.cs
index a7b141cf43..d22da25f9d 100644
--- a/osu.Game.Tournament.Tests/TournamentTestScene.cs
+++ b/osu.Game.Tournament.Tests/TournamentTestScene.cs
@@ -31,14 +31,6 @@ namespace osu.Game.Tournament.Tests
         {
             Ladder.Ruleset.Value ??= rulesetStore.AvailableRulesets.First();
 
-            Ruleset.BindTo(Ladder.Ruleset);
-            Dependencies.CacheAs(new StableInfo(storage));
-        }
-
-        protected override void LoadComplete()
-        {
-            base.LoadComplete();
-
             TournamentMatch match = CreateSampleMatch();
 
             Ladder.Rounds.Add(match.Round.Value);
@@ -47,6 +39,9 @@ namespace osu.Game.Tournament.Tests
             Ladder.Teams.Add(match.Team2.Value);
 
             Ladder.CurrentMatch.Value = match;
+
+            Ruleset.BindTo(Ladder.Ruleset);
+            Dependencies.CacheAs(new StableInfo(storage));
         }
 
         public static TournamentMatch CreateSampleMatch() => new TournamentMatch
@@ -55,6 +50,7 @@ namespace osu.Game.Tournament.Tests
             {
                 Value = new TournamentTeam
                 {
+                    Acronym = { Value = "JPN" },
                     FlagName = { Value = "JP" },
                     FullName = { Value = "Japan" },
                     LastYearPlacing = { Value = 10 },
@@ -128,6 +124,7 @@ namespace osu.Game.Tournament.Tests
             {
                 Value = new TournamentTeam
                 {
+                    Acronym = { Value = "USA" },
                     FlagName = { Value = "US" },
                     FullName = { Value = "United States" },
                     Players =