sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix regressed test

Browse Source
This commit is contained in:
Dean Herbert
2019-11-06 19:06:24 +09:00
parent 143f316cbe
commit 31f2d6a842
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game.Tests/Visual/Components/TestScenePreviewTrackManager.cs
View File

@ -34,6 +34,7 @@ namespace osu.Game.Tests.Visual.Components
PreviewTrack track = null; PreviewTrack track = null;
AddStep("get track", () => track = getOwnedTrack()); AddStep("get track", () => track = getOwnedTrack());
AddUntilStep("wait loaded", () => track.IsLoaded);
AddStep("start", () => track.Start()); AddStep("start", () => track.Start());
AddAssert("started", () => track.IsRunning); AddAssert("started", () => track.IsRunning);
AddStep("stop", () => track.Stop()); AddStep("stop", () => track.Stop());
@ -52,6 +53,8 @@ namespace osu.Game.Tests.Visual.Components
track2 = getOwnedTrack(); track2 = getOwnedTrack();
}); });
AddUntilStep("wait loaded", () => track1.IsLoaded && track2.IsLoaded);
AddStep("start track 1", () => track1.Start()); AddStep("start track 1", () => track1.Start());
AddStep("start track 2", () => track2.Start()); AddStep("start track 2", () => track2.Start());
AddAssert("track 1 stopped", () => !track1.IsRunning); AddAssert("track 1 stopped", () => !track1.IsRunning);
@ -64,6 +67,7 @@ namespace osu.Game.Tests.Visual.Components
PreviewTrack track = null; PreviewTrack track = null;
AddStep("get track", () => track = getOwnedTrack()); AddStep("get track", () => track = getOwnedTrack());
AddUntilStep("wait loaded", () => track.IsLoaded);
AddStep("start", () => track.Start()); AddStep("start", () => track.Start());
AddStep("stop by owner", () => trackManager.StopAnyPlaying(this)); AddStep("stop by owner", () => trackManager.StopAnyPlaying(this));
AddAssert("stopped", () => !track.IsRunning); AddAssert("stopped", () => !track.IsRunning);
@ -76,6 +80,7 @@ namespace osu.Game.Tests.Visual.Components
PreviewTrack track = null; PreviewTrack track = null;
AddStep("get track", () => Add(owner = new TestTrackOwner(track = getTrack()))); AddStep("get track", () => Add(owner = new TestTrackOwner(track = getTrack())));
AddUntilStep("wait loaded", () => track.IsLoaded);
AddStep("start", () => track.Start()); AddStep("start", () => track.Start());
AddStep("attempt stop", () => trackManager.StopAnyPlaying(this)); AddStep("attempt stop", () => trackManager.StopAnyPlaying(this));
AddAssert("not stopped", () => track.IsRunning); AddAssert("not stopped", () => track.IsRunning);
@ -89,16 +94,24 @@ namespace osu.Game.Tests.Visual.Components
{ {
var track = getTrack(); var track = getTrack();
Add(track); LoadComponentAsync(track, Add);
return track; return track;
} }
private class TestTrackOwner : CompositeDrawable, IPreviewTrackOwner private class TestTrackOwner : CompositeDrawable, IPreviewTrackOwner
{ {
private readonly PreviewTrack track;
public TestTrackOwner(PreviewTrack track) public TestTrackOwner(PreviewTrack track)
{ {
AddInternal(track); this.track = track;
}
[BackgroundDependencyLoader]
private void load()
{
LoadComponentAsync(track, AddInternal);
} }
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)