Fix test failures and general discrepancies

This commit is contained in:
smoogipoo
2021-01-20 14:05:35 +09:00
parent bdb9d4f7d0
commit 8ffbcc9860
5 changed files with 28 additions and 15 deletions

View File

@ -19,14 +19,14 @@ namespace osu.Game.Tests.Visual.Gameplay
public void TestAllSamplesStopDuringSeek()
{
DrawableSlider slider = null;
SkinnableSound[] samples = null;
PoolableSkinnableSample[] samples = null;
ISamplePlaybackDisabler sampleDisabler = null;
AddUntilStep("get variables", () =>
{
sampleDisabler = Player;
slider = Player.ChildrenOfType<DrawableSlider>().OrderBy(s => s.HitObject.StartTime).FirstOrDefault();
samples = slider?.ChildrenOfType<SkinnableSound>().ToArray();
samples = slider?.ChildrenOfType<PoolableSkinnableSample>().ToArray();
return slider != null;
});
@ -36,7 +36,7 @@ namespace osu.Game.Tests.Visual.Gameplay
if (!slider.Tracking.Value)
return false;
if (!samples.Any(s => s.IsPlaying))
if (!samples.Any(s => s.Playing))
return false;
Player.ChildrenOfType<GameplayClockContainer>().First().Seek(40000);

View File

@ -43,7 +43,11 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestStoppedSoundDoesntResumeAfterPause()
{
AddStep("start sample with looping", () => skinnableSound.Looping = true);
AddStep("start sample with looping", () =>
{
skinnableSound.Looping = true;
skinnableSound.Play();
});
AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);
@ -62,7 +66,11 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestLoopingSoundResumesAfterPause()
{
AddStep("start sample with looping", () => skinnableSound.Looping = true);
AddStep("start sample with looping", () =>
{
skinnableSound.Looping = true;
skinnableSound.Play();
});
AddUntilStep("wait for sample to start playing", () => skinnableSound.IsPlaying);