From 39738a997eab5c7a085c44633883c9bbab155b9a Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Jun 2018 15:26:05 +0900
Subject: [PATCH] Add check for player screens too

---
 osu.Game/Tests/Visual/TestCasePlayer.cs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Tests/Visual/TestCasePlayer.cs b/osu.Game/Tests/Visual/TestCasePlayer.cs
index 55fb9c483b..beaa6bb43a 100644
--- a/osu.Game/Tests/Visual/TestCasePlayer.cs
+++ b/osu.Game/Tests/Visual/TestCasePlayer.cs
@@ -6,7 +6,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Lists;
-using osu.Framework.Logging;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
@@ -55,6 +54,7 @@ namespace osu.Game.Tests.Visual
                     Player p = null;
                     AddStep(r.Name, () => p = loadPlayerFor(r));
                     AddUntilStep(() => ContinueCondition(p));
+
                     AddAssert("no leaked beatmaps", () =>
                     {
                         p = null;
@@ -64,9 +64,16 @@ namespace osu.Game.Tests.Visual
                         int count = 0;
 
                         workingWeakReferences.ForEachAlive(_ => count++);
+                        return count == 1;
+                    });
 
-                        Logger.Log($"reference count {count}");
+                    AddAssert("no leaked players", () =>
+                    {
+                        GC.Collect();
+                        GC.WaitForPendingFinalizers();
+                        int count = 0;
 
+                        playerWeakReferences.ForEachAlive(_ => count++);
                         return count == 1;
                     });
                 }
@@ -78,6 +85,7 @@ namespace osu.Game.Tests.Visual
         protected virtual IBeatmap CreateBeatmap(Ruleset ruleset) => new TestBeatmap(ruleset.RulesetInfo);
 
         private readonly WeakList<WorkingBeatmap> workingWeakReferences = new WeakList<WorkingBeatmap>();
+        private readonly WeakList<Player> playerWeakReferences = new WeakList<Player>();
 
         private Player loadPlayerFor(RulesetInfo ri) => loadPlayerFor(ri.CreateInstance());
 
@@ -95,6 +103,8 @@ namespace osu.Game.Tests.Visual
 
             var player = CreatePlayer(r);
 
+            playerWeakReferences.Add(player);
+
             LoadComponentAsync(player, p =>
             {
                 Player = p;