From 947460c3c54d46900385f3321ecfae0d8c55a855 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 12 Jul 2021 15:49:09 +0900
Subject: [PATCH] Add test flow for joining passworded rooms via UI

---
 .../TestSceneMultiplayerLoungeSubScreen.cs    | 35 ++++++++++++++++++-
 .../Visual/OnlinePlay/BasicTestRoomManager.cs |  8 ++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerLoungeSubScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerLoungeSubScreen.cs
index 0d90b75be7..3ba0f4969a 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerLoungeSubScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerLoungeSubScreen.cs
@@ -3,12 +3,16 @@
 
 using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Screens;
 using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Online.Rooms;
 using osu.Game.Screens.OnlinePlay.Lounge;
 using osu.Game.Screens.OnlinePlay.Lounge.Components;
 using osu.Game.Screens.OnlinePlay.Multiplayer;
 using osu.Game.Tests.Visual.OnlinePlay;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Multiplayer
 {
@@ -18,6 +22,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
 
         private LoungeSubScreen loungeScreen;
 
+        private Room lastJoinedRoom;
+        private string lastJoinedPassword;
+
         public override void SetUpSteps()
         {
             base.SetUpSteps();
@@ -25,20 +32,46 @@ namespace osu.Game.Tests.Visual.Multiplayer
             AddStep("push screen", () => LoadScreen(loungeScreen = new MultiplayerLoungeSubScreen()));
 
             AddUntilStep("wait for present", () => loungeScreen.IsCurrentScreen());
+
+            AddStep("bind to event", () =>
+            {
+                lastJoinedRoom = null;
+                lastJoinedPassword = null;
+                RoomManager.JoinRoomRequested = onRoomJoined;
+            });
         }
 
         [Test]
         public void TestJoinRoomWithoutPassword()
         {
             AddStep("add room", () => RoomManager.AddRooms(1, withPassword: false));
+            AddStep("select room", () => InputManager.Key(Key.Down));
+            AddStep("join room", () => InputManager.Key(Key.Enter));
+
+            AddAssert("room join requested", () => lastJoinedRoom == RoomManager.Rooms.First());
+            AddAssert("room join password correct", () => lastJoinedPassword == null);
         }
 
         [Test]
         public void TestJoinRoomWithPassword()
         {
+            DrawableRoom.PasswordEntryPopover passwordEntryPopover = null;
+
             AddStep("add room", () => RoomManager.AddRooms(1, withPassword: true));
+            AddStep("select room", () => InputManager.Key(Key.Down));
+            AddStep("attempt join room", () => InputManager.Key(Key.Enter));
+            AddUntilStep("password prompt appeared", () => (passwordEntryPopover = loungeScreen.ChildrenOfType<DrawableRoom.PasswordEntryPopover>().FirstOrDefault()) != null);
+            AddStep("enter password in text box", () => passwordEntryPopover.ChildrenOfType<TextBox>().First().Text = "password");
+            AddStep("press join room button", () => passwordEntryPopover.ChildrenOfType<OsuButton>().First().Click());
+
+            AddAssert("room join requested", () => lastJoinedRoom == RoomManager.Rooms.First());
+            AddAssert("room join password correct", () => lastJoinedPassword == "password");
         }
 
-        private RoomsContainer roomsContainer => loungeScreen.ChildrenOfType<RoomsContainer>().First();
+        private void onRoomJoined(Room room, string password)
+        {
+            lastJoinedRoom = room;
+            lastJoinedPassword = password;
+        }
     }
 }
diff --git a/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs b/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
index 5d3fa34ec5..82c7266598 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
@@ -26,6 +26,8 @@ namespace osu.Game.Tests.Visual.OnlinePlay
 
         public readonly BindableList<Room> Rooms = new BindableList<Room>();
 
+        public Action<Room, string> JoinRoomRequested;
+
         public IBindable<bool> InitialRoomsReceived { get; } = new Bindable<bool>(true);
 
         IBindableList<Room> IRoomManager.Rooms => Rooms;
@@ -37,7 +39,11 @@ namespace osu.Game.Tests.Visual.OnlinePlay
             onSuccess?.Invoke(room);
         }
 
-        public void JoinRoom(Room room, string password, Action<Room> onSuccess = null, Action<string> onError = null) => onSuccess?.Invoke(room);
+        public void JoinRoom(Room room, string password, Action<Room> onSuccess = null, Action<string> onError = null)
+        {
+            JoinRoomRequested?.Invoke(room, password);
+            onSuccess?.Invoke(room);
+        }
 
         public void PartRoom()
         {