Update existing usages

ppy · Dec 13, 2023 · 26dcd48 · 26dcd48
1 parent 8e77426
commit 26dcd48
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneClosableMenu.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneClosableMenu.cs
@@ -118,7 +118,7 @@ public void TestMenuBlocksInputUnderneathIt()
             bool itemClicked = false;
             bool actionReceived = false;
 
-            AddStep("set item action", () => Menus.GetSubMenu(0).Items[0].Items[0].Action.Value = () => itemClicked = true);
+            AddStep("set item action", () => Menus.GetSubMenu(0).Items.ElementAt(0).Items[0].Action.Value = () => itemClicked = true);
             AddStep("add mouse handler", () => Add(new MouseHandlingLayer
             {
                 Action = () => actionReceived = true,

diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneContextMenu.cs
@@ -320,7 +320,7 @@ private void assertMenuOnScreen(bool expected) => AddAssert($"menu {(expected ?
             return result == expected;
         });
 
-        private void assertMenuItems(int expectedCount) => AddAssert($"menu contains {expectedCount} item(s)", () => contextMenuContainer.CurrentMenu.Items.Count == expectedCount);
+        private void assertMenuItems(int expectedCount) => AddAssert($"menu contains {expectedCount} item(s)", () => contextMenuContainer.CurrentMenu.Items.Count() == expectedCount);
 
         private partial class BoxWithContextMenu : Box, IHasContextMenu
         {

diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneDropdown.cs
@@ -47,7 +47,7 @@ public void TestSelectByUserInteraction()
 
             AddStep("click item 2", () =>
             {
-                InputManager.MoveMouseTo(testDropdown.Menu.Children[2]);
+                InputManager.MoveMouseTo(testDropdown.Menu.Children.ElementAt(2));
                 InputManager.Click(MouseButton.Left);
             });
 
@@ -176,7 +176,7 @@ public void TestReplaceItems()
 
             AddStep("click item 4", () =>
             {
-                InputManager.MoveMouseTo(testDropdown.Menu.Children[4]);
+                InputManager.MoveMouseTo(testDropdown.Menu.Children.ElementAt(4));
                 InputManager.Click(MouseButton.Left);
             });
 

diff --git a/osu.Framework.Tests/Visual/UserInterface/TestSceneNestedMenus.cs b/osu.Framework.Tests/Visual/UserInterface/TestSceneNestedMenus.cs
@@ -181,7 +181,7 @@ public void TestHoverChange()
             IReadOnlyList<MenuItem> currentItems = null;
             AddStep("Click item", () => { ClickItem(0, 0); });
 
-            AddStep("Get items", () => { currentItems = Menus.GetSubMenu(1).Items; });
+            AddStep("Get items", () => { currentItems = Menus.GetSubMenu(1).Items.ToList(); });
 
             AddAssert("Check open", () => Menus.GetSubMenu(1).State == MenuState.Open);
             AddStep("Hover item", () => InputManager.MoveMouseTo(Menus.GetSubStructure(0).GetMenuItems()[1]));