From e2f8c7108117cdffb28b70427e744fa5ae1eef52 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 21 Dec 2021 18:38:31 +0900 Subject: [PATCH] Fix test --- .../Multiplayer/TestSceneMultiplayerQueueList.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs index ef71dfe772..33741e3aa2 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerQueueList.cs @@ -6,7 +6,6 @@ using System.Linq; using NUnit.Framework; using osu.Framework.Allocation; using osu.Framework.Audio; -using osu.Framework.Bindables; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Platform; @@ -26,8 +25,6 @@ namespace osu.Game.Tests.Visual.Multiplayer { public class TestSceneMultiplayerQueueList : MultiplayerTestScene { - private readonly Bindable selectedItem = new Bindable(); - [Cached(typeof(UserLookupCache))] private readonly TestUserLookupCache userLookupCache = new TestUserLookupCache(); @@ -50,14 +47,11 @@ namespace osu.Game.Tests.Visual.Multiplayer AddStep("create playlist", () => { - selectedItem.Value = null; - Child = playlist = new MultiplayerQueueList { Anchor = Anchor.Centre, Origin = Anchor.Centre, Size = new Vector2(500, 300), - SelectedItem = { BindTarget = selectedItem }, Items = { BindTarget = Client.APIRoom!.Playlist } }; }); @@ -111,12 +105,13 @@ namespace osu.Game.Tests.Visual.Multiplayer addPlaylistItem(() => API.LocalUser.Value.OnlineID); - AddStep("select item 0", () => selectedItem.Value = playlist.ChildrenOfType>().ElementAt(0).Model); assertDeleteButtonVisibility(0, false); assertDeleteButtonVisibility(1, true); - AddStep("select item 1", () => selectedItem.Value = playlist.ChildrenOfType>().ElementAt(1).Model); - assertDeleteButtonVisibility(0, true); + AddStep("finish current item", () => Client.FinishCurrentItem()); + AddUntilStep("wait for next item to be selected", () => Client.Room?.Settings.PlaylistItemId == 2); + + assertDeleteButtonVisibility(0, false); assertDeleteButtonVisibility(1, false); }