diff --git a/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestDependencies.cs b/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestDependencies.cs
index c5f9e85003..46ad5a5a1c 100644
--- a/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestDependencies.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/IMultiplayerTestDependencies.cs
@@ -9,6 +9,9 @@ using osu.Game.Tests.Visual.Spectator;
namespace osu.Game.Tests.Visual.Multiplayer
{
+ ///
+ /// Interface that defines the dependencies required for multiplayer test scenes.
+ ///
public interface IMultiplayerTestDependencies : IOnlinePlayTestDependencies
{
///
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerRoomTestDependencies.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerRoomTestDependencies.cs
index a3f7156848..4c5afb9b58 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerRoomTestDependencies.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerRoomTestDependencies.cs
@@ -10,12 +10,14 @@ using osu.Game.Tests.Visual.Spectator;
namespace osu.Game.Tests.Visual.Multiplayer
{
+ ///
+ /// Contains the basic dependencies of multiplayer test scenes.
+ ///
public class MultiplayerRoomTestDependencies : RoomTestDependencies, IMultiplayerTestDependencies
{
public TestMultiplayerClient Client { get; }
public TestUserLookupCache LookupCache { get; }
public TestSpectatorClient SpectatorClient { get; }
-
public new TestMultiplayerRoomManager RoomManager => (TestMultiplayerRoomManager)base.RoomManager;
public MultiplayerRoomTestDependencies()
diff --git a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
index 19e7536286..6a9ae4c772 100644
--- a/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
@@ -9,6 +9,9 @@ using osu.Game.Tests.Visual.Spectator;
namespace osu.Game.Tests.Visual.Multiplayer
{
+ ///
+ /// The base test scene for all multiplayer components and screens.
+ ///
public abstract class MultiplayerTestScene : OnlinePlayTestScene, IMultiplayerTestDependencies
{
public const int PLAYER_1_ID = 55;
@@ -21,8 +24,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
protected new MultiplayerRoomTestDependencies RoomDependencies => (MultiplayerRoomTestDependencies)base.RoomDependencies;
- protected override RoomTestDependencies CreateRoomDependencies() => new MultiplayerRoomTestDependencies();
-
private readonly bool joinRoom;
protected MultiplayerTestScene(bool joinRoom = true)
@@ -58,9 +59,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
base.SetUpSteps();
if (joinRoom)
- {
AddUntilStep("wait for room join", () => Client.Room != null);
- }
}
+
+ protected override RoomTestDependencies CreateRoomDependencies() => new MultiplayerRoomTestDependencies();
}
}
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
index b12bd8091d..b0c8d6d19b 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs
@@ -20,6 +20,9 @@ using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
{
+ ///
+ /// A for use in multiplayer test scenes. Should generally not be used by itself outside of a .
+ ///
public class TestMultiplayerClient : MultiplayerClient
{
public override IBindable IsConnected => isConnected;
diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
index 6f4a464d57..5d66cdba02 100644
--- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
+++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerRoomManager.cs
@@ -11,11 +11,15 @@ using osu.Game.Online.API.Requests;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring;
+using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Screens.OnlinePlay.Lounge.Components;
using osu.Game.Screens.OnlinePlay.Multiplayer;
namespace osu.Game.Tests.Visual.Multiplayer
{
+ ///
+ /// A for use in multiplayer test scenes. Should generally not be used by itself outside of a .
+ ///
public class TestMultiplayerRoomManager : MultiplayerRoomManager
{
[Resolved]
diff --git a/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs b/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
index 67beea9117..81b93fe5b5 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/BasicTestRoomManager.cs
@@ -8,10 +8,14 @@ using osu.Game.Beatmaps;
using osu.Game.Online.Rooms;
using osu.Game.Rulesets;
using osu.Game.Screens.OnlinePlay;
+using osu.Game.Screens.OnlinePlay.Components;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.OnlinePlay
{
+ ///
+ /// A very simple for use in online-play test scenes.
+ ///
public class BasicTestRoomManager : IRoomManager
{
public event Action RoomsUpdated
diff --git a/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestDependencies.cs b/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestDependencies.cs
index a4e0368adc..bc5d524bc4 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestDependencies.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/IOnlinePlayTestDependencies.cs
@@ -8,6 +8,9 @@ using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Tests.Visual.OnlinePlay
{
+ ///
+ /// Interface that defines the dependencies required for online-play test scenes.
+ ///
public interface IOnlinePlayTestDependencies
{
///
diff --git a/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestScene.cs b/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestScene.cs
index 39ce219092..6c1339fd85 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestScene.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestScene.cs
@@ -14,7 +14,7 @@ using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Tests.Visual.OnlinePlay
{
///
- /// A providing all the dependencies cached by for testing s.
+ /// A base test scene for all online-play components and screens.
///
public abstract class OnlinePlayTestScene : ScreenTestScene, IOnlinePlayTestDependencies
{
diff --git a/osu.Game/Tests/Visual/OnlinePlay/RoomTestDependencies.cs b/osu.Game/Tests/Visual/OnlinePlay/RoomTestDependencies.cs
index b833a9400f..7b198c128b 100644
--- a/osu.Game/Tests/Visual/OnlinePlay/RoomTestDependencies.cs
+++ b/osu.Game/Tests/Visual/OnlinePlay/RoomTestDependencies.cs
@@ -13,7 +13,7 @@ using osu.Game.Screens.OnlinePlay.Lounge.Components;
namespace osu.Game.Tests.Visual.OnlinePlay
{
///
- /// Contains dependencies for testing online-play rooms.
+ /// Contains the basic dependencies of online-play test scenes.
///
public class RoomTestDependencies : IReadOnlyDependencyContainer, IOnlinePlayTestDependencies
{