mirror of
https://github.com/ppy/osu
synced 2024-12-14 10:57:41 +00:00
422260797b
It turns out this polling was necessary to get extra data that isn't included in the main listing request. It was removed deemed useless, and in order to fix the order of rooms changing when selecting a room. Weirdly, I can't reproduce this happening any more, and on close inspection of the code can't see how it could happen in the first place. For now, let's revert this change and iterate from there, if/when the same issue arises again. I've discussed avoiding this second poll by potentially including more data (just `user_id`s?) in the main listing request, but not 100% sure on this - even if the returned data is minimal it's an extra join server-side, which could cause performance issues for large numbers of rooms.
154 lines
5.2 KiB
C#
154 lines
5.2 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using NUnit.Framework;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Testing;
|
|
using osu.Game.Online.Rooms;
|
|
|
|
namespace osu.Game.Tests.Visual.Multiplayer
|
|
{
|
|
[HeadlessTest]
|
|
public class TestSceneMultiplayerRoomManager : RoomTestScene
|
|
{
|
|
private TestMultiplayerRoomContainer roomContainer;
|
|
private TestMultiplayerRoomManager roomManager => roomContainer.RoomManager;
|
|
|
|
[Test]
|
|
public void TestPollsInitially()
|
|
{
|
|
AddStep("create room manager with a few rooms", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
roomManager.CreateRoom(new Room { Name = { Value = "1" } });
|
|
roomManager.PartRoom();
|
|
roomManager.CreateRoom(new Room { Name = { Value = "2" } });
|
|
roomManager.PartRoom();
|
|
roomManager.ClearRooms();
|
|
});
|
|
});
|
|
|
|
AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
|
|
AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
|
|
}
|
|
|
|
[Test]
|
|
public void TestRoomsClearedOnDisconnection()
|
|
{
|
|
AddStep("create room manager with a few rooms", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
roomManager.CreateRoom(new Room());
|
|
roomManager.PartRoom();
|
|
roomManager.CreateRoom(new Room());
|
|
roomManager.PartRoom();
|
|
});
|
|
});
|
|
|
|
AddStep("disconnect", () => roomContainer.Client.Disconnect());
|
|
|
|
AddAssert("rooms cleared", () => roomManager.Rooms.Count == 0);
|
|
AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
|
|
}
|
|
|
|
[Test]
|
|
public void TestRoomsPolledOnReconnect()
|
|
{
|
|
AddStep("create room manager with a few rooms", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
roomManager.CreateRoom(new Room());
|
|
roomManager.PartRoom();
|
|
roomManager.CreateRoom(new Room());
|
|
roomManager.PartRoom();
|
|
});
|
|
});
|
|
|
|
AddStep("disconnect", () => roomContainer.Client.Disconnect());
|
|
AddStep("connect", () => roomContainer.Client.Connect());
|
|
|
|
AddAssert("manager polled for rooms", () => roomManager.Rooms.Count == 2);
|
|
AddAssert("initial rooms received", () => roomManager.InitialRoomsReceived.Value);
|
|
}
|
|
|
|
[Test]
|
|
public void TestRoomsNotPolledWhenJoined()
|
|
{
|
|
AddStep("create room manager with a room", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
roomManager.CreateRoom(new Room());
|
|
roomManager.ClearRooms();
|
|
});
|
|
});
|
|
|
|
AddAssert("manager not polled for rooms", () => roomManager.Rooms.Count == 0);
|
|
AddAssert("initial rooms not received", () => !roomManager.InitialRoomsReceived.Value);
|
|
}
|
|
|
|
[Test]
|
|
public void TestMultiplayerRoomJoinedWhenCreated()
|
|
{
|
|
AddStep("create room manager with a room", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
roomManager.CreateRoom(new Room());
|
|
});
|
|
});
|
|
|
|
AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
|
|
}
|
|
|
|
[Test]
|
|
public void TestMultiplayerRoomPartedWhenAPIRoomParted()
|
|
{
|
|
AddStep("create room manager with a room", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
roomManager.CreateRoom(new Room());
|
|
roomManager.PartRoom();
|
|
});
|
|
});
|
|
|
|
AddAssert("multiplayer room parted", () => roomContainer.Client.Room == null);
|
|
}
|
|
|
|
[Test]
|
|
public void TestMultiplayerRoomJoinedWhenAPIRoomJoined()
|
|
{
|
|
AddStep("create room manager with a room", () =>
|
|
{
|
|
createRoomManager().With(d => d.OnLoadComplete += _ =>
|
|
{
|
|
var r = new Room();
|
|
roomManager.CreateRoom(r);
|
|
roomManager.PartRoom();
|
|
roomManager.JoinRoom(r);
|
|
});
|
|
});
|
|
|
|
AddAssert("multiplayer room joined", () => roomContainer.Client.Room != null);
|
|
}
|
|
|
|
private TestMultiplayerRoomManager createRoomManager()
|
|
{
|
|
Child = roomContainer = new TestMultiplayerRoomContainer
|
|
{
|
|
RoomManager =
|
|
{
|
|
TimeBetweenListingPolls = { Value = 1 },
|
|
TimeBetweenSelectionPolls = { Value = 1 }
|
|
}
|
|
};
|
|
|
|
return roomManager;
|
|
}
|
|
}
|
|
}
|