From 81e842f6b4bab33100c8f79eae63c6ab41155730 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 19 Dec 2019 19:48:48 +0900
Subject: [PATCH] Fix waveform test beatmap accessing zip archive across
 multiple threads

---
 .../Editor/TestSceneEditorComposeTimeline.cs  | 14 +++-----
 osu.Game.Tests/WaveformTestBeatmap.cs         | 32 +++++++++++--------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
index e618256c03..ed6bc5fe0c 100644
--- a/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
+++ b/osu.Game.Tests/Visual/Editor/TestSceneEditorComposeTimeline.cs
@@ -68,8 +68,11 @@ namespace osu.Game.Tests.Visual.Editor
         {
             private readonly Drawable marker;
 
-            private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
-            private IAdjustableClock adjustableClock;
+            [Resolved]
+            private IBindable<WorkingBeatmap> beatmap { get; set; }
+
+            [Resolved]
+            private IAdjustableClock adjustableClock { get; set; }
 
             public AudioVisualiser()
             {
@@ -91,13 +94,6 @@ namespace osu.Game.Tests.Visual.Editor
                 };
             }
 
-            [BackgroundDependencyLoader]
-            private void load(IAdjustableClock adjustableClock, IBindable<WorkingBeatmap> beatmap)
-            {
-                this.adjustableClock = adjustableClock;
-                this.beatmap.BindTo(beatmap);
-            }
-
             protected override void Update()
             {
                 base.Update();
diff --git a/osu.Game.Tests/WaveformTestBeatmap.cs b/osu.Game.Tests/WaveformTestBeatmap.cs
index 0d16a78f75..59f322e24c 100644
--- a/osu.Game.Tests/WaveformTestBeatmap.cs
+++ b/osu.Game.Tests/WaveformTestBeatmap.cs
@@ -20,23 +20,21 @@ namespace osu.Game.Tests
     /// </summary>
     public class WaveformTestBeatmap : WorkingBeatmap
     {
-        private readonly ZipArchiveReader reader;
-        private readonly Stream stream;
         private readonly ITrackStore trackStore;
 
+        private Stream getStream() => TestResources.GetTestBeatmapStream();
+
+        private ZipArchiveReader getZipReader() => new ZipArchiveReader(getStream());
+
         public WaveformTestBeatmap(AudioManager audioManager)
             : base(new BeatmapInfo(), audioManager)
         {
-            stream = TestResources.GetTestBeatmapStream();
-            reader = new ZipArchiveReader(stream);
-            trackStore = audioManager.GetTrackStore(reader);
+            trackStore = audioManager.GetTrackStore(getZipReader());
         }
 
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
-            stream?.Dispose();
-            reader?.Dispose();
             trackStore?.Dispose();
         }
 
@@ -50,15 +48,23 @@ namespace osu.Game.Tests
 
         protected override Track GetTrack() => trackStore.Get(firstAudioFile);
 
-        private string firstAudioFile => reader.Filenames.First(f => f.EndsWith(".mp3"));
-
-        private Stream getBeatmapStream() => reader.GetStream(reader.Filenames.First(f => f.EndsWith(".osu")));
+        private string firstAudioFile
+        {
+            get
+            {
+                using (var reader = getZipReader())
+                    return reader.Filenames.First(f => f.EndsWith(".mp3"));
+            }
+        }
 
         private Beatmap createTestBeatmap()
         {
-            using (var beatmapStream = getBeatmapStream())
-            using (var beatmapReader = new LineBufferedReader(beatmapStream))
-                return Decoder.GetDecoder<Beatmap>(beatmapReader).Decode(beatmapReader);
+            using (var reader = getZipReader())
+            {
+                using (var beatmapStream = reader.GetStream(reader.Filenames.First(f => f.EndsWith(".osu"))))
+                using (var beatmapReader = new LineBufferedReader(beatmapStream))
+                    return Decoder.GetDecoder<Beatmap>(beatmapReader).Decode(beatmapReader);
+            }
         }
     }
 }