sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Implement RoomManager and RoomsContainer

Browse Source 
Reduces logic from LoungeScreen
This commit is contained in:
smoogipoo
2018-12-11 19:07:40 +09:00
parent 1ac615b490
commit 497f431366
10 changed files with 229 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,6 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Game.Beatmaps;
@ -10,6 +8,7 @@ using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osu.Game.Screens;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Multi;
using osu.Game.Screens.Multi.Lounge;
using osu.Game.Screens.Multi.Lounge.Components;
using osu.Game.Users;
@ -160,11 +159,8 @@ namespace osu.Game.Tests.Visual
};
AddStep(@"show", () => Add(loungeScreen));
AddStep(@"set rooms", () => loungeScreen.Rooms = rooms);
selectAssert(0);
AddStep(@"clear rooms", () => loungeScreen.Rooms = new Room[] {});
AddAssert(@"no room selected", () => loungeScreen.SelectedRoom == null);
AddStep(@"set rooms", () => loungeScreen.Rooms = rooms);
selectAssert(1);
AddStep(@"open room 1", () => clickRoom(1));
AddUntilStep(() => loungeScreen.ChildScreen?.IsCurrentScreen == true, "wait until room current");
@ -174,37 +170,33 @@ namespace osu.Game.Tests.Visual
filterAssert(string.Empty, LoungeTab.Private, 1);
filterAssert(string.Empty, LoungeTab.Public, 2);
filterAssert(@"no matches", LoungeTab.Public, 0);
AddStep(@"clear rooms", () => loungeScreen.Rooms = new Room[] {});
AddStep(@"set rooms", () => loungeScreen.Rooms = rooms);
AddAssert(@"no matches after clear", () => !loungeScreen.ChildRooms.Any());
filterAssert(string.Empty, LoungeTab.Public, 2);
AddStep(@"exit", loungeScreen.Exit);
}
private void clickRoom(int n)
{
InputManager.MoveMouseTo(loungeScreen.ChildRooms.ElementAt(n));
InputManager.Click(MouseButton.Left);
}
private void selectAssert(int n)
{
AddStep($@"select room {n}", () => clickRoom(n));
AddAssert($@"room {n} selected", () => loungeScreen.SelectedRoom == loungeScreen.ChildRooms.ElementAt(n).Room);
}
private void filterAssert(string filter, LoungeTab tab, int endCount)
{
AddStep($@"filter '{filter}', {tab}", () => loungeScreen.SetFilter(filter, tab));
AddAssert(@"filtered correctly", () => loungeScreen.ChildRooms.Count() == endCount);
}
private class TestLoungeScreen : LoungeScreen
{
protected override BackgroundScreen CreateBackground() => new BackgroundScreenDefault();
public IEnumerable<DrawableRoom> ChildRooms => RoomsContainer.Children.Where(r => r.MatchingFilter);
public Room SelectedRoom => Inspector.Room;
[Resolved]
private RoomManager manager { get; set; }
public Room SelectedRoom => manager.Current.Value;
public void SetFilter(string filter, LoungeTab tab)
{

8
osu.Game.Tests/Visual/TestCaseRoomInspector.cs
View File

@ -66,8 +66,7 @@ namespace osu.Game.Tests.Visual
}
};
RoomInspector inspector;
Add(inspector = new RoomInspector
Add(new RoomInspector
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
@ -75,9 +74,6 @@ namespace osu.Game.Tests.Visual
Width = 0.5f,
});
AddStep(@"set room", () => inspector.Room = room);
AddStep(@"null room", () => inspector.Room = null);
AddStep(@"set room", () => inspector.Room = room);
AddStep(@"change title", () => room.Name.Value = @"A Better Room Than The Above");
AddStep(@"change host", () => room.Host.Value = new User { Username = @"DrabWeb", Id = 6946022, Country = new Country { FlagName = @"CA" } });
AddStep(@"change status", () => room.Status.Value = new RoomStatusPlaying());
@ -133,8 +129,6 @@ namespace osu.Game.Tests.Visual
}
}
};
inspector.Room = newRoom;
});
}