From 0e0c730095e11e4320c50d4934d0ad60df6f5af8 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 28 Jan 2020 19:44:32 +0900
Subject: [PATCH] Add a method to recycle test storage between runs

---
 .../Visual/Menus/TestSceneScreenNavigation.cs |  2 ++
 osu.Game/Tests/Visual/OsuTestScene.cs         | 33 +++++++++++--------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
index 471f67b7b6..f3c5d2a7ef 100644
--- a/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
+++ b/osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
@@ -65,6 +65,8 @@ namespace osu.Game.Tests.Visual.Menus
                     game.Dispose();
                 }
 
+                RecycleLocalStorage();
+
                 game = new TestOsuGame(LocalStorage, API);
                 game.SetHost(host);
 
diff --git a/osu.Game/Tests/Visual/OsuTestScene.cs b/osu.Game/Tests/Visual/OsuTestScene.cs
index 8926c76018..41ab7fce99 100644
--- a/osu.Game/Tests/Visual/OsuTestScene.cs
+++ b/osu.Game/Tests/Visual/OsuTestScene.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual
 
         protected new OsuScreenDependencies Dependencies { get; private set; }
 
-        private readonly Lazy<Storage> localStorage;
+        private Lazy<Storage> localStorage;
         protected Storage LocalStorage => localStorage.Value;
 
         private readonly Lazy<DatabaseContextFactory> contextFactory;
@@ -91,7 +91,7 @@ namespace osu.Game.Tests.Visual
 
         protected OsuTestScene()
         {
-            localStorage = new Lazy<Storage>(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
+            RecycleLocalStorage();
             contextFactory = new Lazy<DatabaseContextFactory>(() =>
             {
                 var factory = new DatabaseContextFactory(LocalStorage);
@@ -104,6 +104,23 @@ namespace osu.Game.Tests.Visual
             base.Content.Add(content = new DrawSizePreservingFillContainer());
         }
 
+        public void RecycleLocalStorage()
+        {
+            if (localStorage?.IsValueCreated == true)
+            {
+                try
+                {
+                    localStorage.Value.DeleteDirectory(".");
+                }
+                catch
+                {
+                    // we don't really care if this fails; it will just leave folders lying around from test runs.
+                }
+            }
+
+            localStorage = new Lazy<Storage>(() => new NativeStorage($"{GetType().Name}-{Guid.NewGuid()}"));
+        }
+
         [Resolved]
         protected AudioManager Audio { get; private set; }
 
@@ -131,17 +148,7 @@ namespace osu.Game.Tests.Visual
             if (contextFactory.IsValueCreated)
                 contextFactory.Value.ResetDatabase();
 
-            if (localStorage.IsValueCreated)
-            {
-                try
-                {
-                    localStorage.Value.DeleteDirectory(".");
-                }
-                catch
-                {
-                    // we don't really care if this fails; it will just leave folders lying around from test runs.
-                }
-            }
+            RecycleLocalStorage();
         }
 
         protected override ITestSceneTestRunner CreateRunner() => new OsuTestSceneTestRunner();