h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

Fix failing test cases

Browse Source
This commit is contained in:
smoogipoo 2019-02-08 16:02:14 +09:00
parent ee5ff283d1
commit 7aca0f4a1d
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
View File

@ -16,7 +16,7 @@ using osuTK.Graphics;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class TestCaseLoungeRoomsContainer : OsuTestCase public class TestCaseLoungeRoomsContainer : MultiplayerTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] public override IReadOnlyList<Type> RequiredTypes => new[]
{ {
@ -61,7 +61,7 @@ namespace osu.Game.Tests.Visual
AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0)); AddAssert("first room removed", () => container.Rooms.All(r => r.Room.RoomID.Value != 0));
AddStep("select first room", () => container.Rooms.First().Action?.Invoke()); AddStep("select first room", () => container.Rooms.First().Action?.Invoke());
AddAssert("first room selected", () => roomManager.CurrentRoom.Value == roomManager.Rooms.First()); AddAssert("first room selected", () => Room == roomManager.Rooms.First());
AddStep("join first room", () => container.Rooms.First().Action?.Invoke()); AddStep("join first room", () => container.Rooms.First().Action?.Invoke());
AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus); AddAssert("first room joined", () => roomManager.Rooms.First().Status.Value is JoinedRoomStatus);
@ -73,15 +73,13 @@ namespace osu.Game.Tests.Visual
{ {
public event Action RoomsUpdated public event Action RoomsUpdated
{ {
add => throw new NotImplementedException(); add { }
remove => throw new NotImplementedException(); remove { }
} }
public readonly BindableList<Room> Rooms = new BindableList<Room>(); public readonly BindableList<Room> Rooms = new BindableList<Room>();
IBindableList<Room> IRoomManager.Rooms => Rooms; IBindableList<Room> IRoomManager.Rooms => Rooms;
public Bindable<Room> CurrentRoom { get; } = new Bindable<Room>();
public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room); public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => Rooms.Add(room);
public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
@ -91,10 +89,6 @@ namespace osu.Game.Tests.Visual
public void PartRoom() public void PartRoom()
{ {
} }
public void Filter(FilterCriteria criteria)
{
}
} }
private class JoinedRoomStatus : RoomStatus private class JoinedRoomStatus : RoomStatus

9
osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
View File

@ -13,7 +13,6 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
using osu.Game.Screens.Multi; using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Screens.Multi.Match.Components; using osu.Game.Screens.Multi.Match.Components;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
@ -133,14 +132,12 @@ namespace osu.Game.Tests.Visual
public event Action RoomsUpdated public event Action RoomsUpdated
{ {
add => throw new NotImplementedException(); add { }
remove => throw new NotImplementedException(); remove { }
} }
public IBindableList<Room> Rooms { get; } = null; public IBindableList<Room> Rooms { get; } = null;
public Bindable<Room> CurrentRoom { get; } = new Bindable<Room>();
public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) public void CreateRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null)
{ {
if (CreateRequested == null) if (CreateRequested == null)
@ -155,8 +152,6 @@ namespace osu.Game.Tests.Visual
public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException(); public void JoinRoom(Room room, Action<Room> onSuccess = null, Action<string> onError = null) => throw new NotImplementedException();
public void PartRoom() => throw new NotImplementedException(); public void PartRoom() => throw new NotImplementedException();
public void Filter(FilterCriteria criteria) => throw new NotImplementedException();
} }
} }
} }

18
osu.Game/Tests/Visual/MultiplayerTestCase.cs
View File

@ -2,26 +2,20 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Game.Online.Multiplayer; using osu.Game.Online.Multiplayer;
namespace osu.Game.Tests.Visual namespace osu.Game.Tests.Visual
{ {
public class MultiplayerTestCase : OsuTestCase public class MultiplayerTestCase : OsuTestCase
{ {
private Room room; [Cached]
private readonly Bindable<Room> currentRoom = new Bindable<Room>(new Room());
protected Room Room protected Room Room
{ {
get => room; get => currentRoom;
set set => currentRoom.Value = value;
{
if (room == value)
return;
room = value;
if (dependencies != null)
dependencies.Model.Value = value;
}
} }
private CachedModelDependencyContainer<Room> dependencies; private CachedModelDependencyContainer<Room> dependencies;
@ -29,7 +23,7 @@ namespace osu.Game.Tests.Visual
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{ {
dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent)); dependencies = new CachedModelDependencyContainer<Room>(base.CreateChildDependencies(parent));
dependencies.Model.Value = room; dependencies.Model.BindTo(currentRoom);
return dependencies; return dependencies;
} }
} }