sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Rework MultiplayerTestScene to make use of OnlinePlayTestScene

Browse Source
This commit is contained in:
smoogipoo
2021-06-25 15:00:10 +09:00
parent aa5d22d04a
commit 81a812e216
15 changed files with 159 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorLeaderboard.cs
View File

@ -1,51 +1,48 @@
// 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 System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using JetBrains.Annotations;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Testing;
using osu.Framework.Threading;
using osu.Framework.Timing;
using osu.Game.Database;
using osu.Game.Online.Spectator;
using osu.Game.Rulesets.Osu.Scoring;
using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
using osu.Game.Screens.Play.HUD;
using osu.Game.Tests.Visual.OnlinePlay;
using osu.Game.Tests.Visual.Spectator;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.Multiplayer
{
public class TestSceneMultiSpectatorLeaderboard : OsuTestScene
public class TestSceneMultiSpectatorLeaderboard : MultiplayerTestScene
{
private Dictionary<int, ManualClock> clocks;
public TestSpectatorClient SpectatorClient => RoomDependencies?.SpectatorClient;
protected new TestDependencies RoomDependencies => (TestDependencies)base.RoomDependencies;
private Dictionary<int, ManualClock> clocks;
private MultiSpectatorLeaderboard leaderboard;
private TestContainer container;
[SetUpSteps]
public void SetUpSteps()
public new void SetUpSteps()
{
AddStep("reset", () =>
{
Clear();
clocks = new Dictionary<int, ManualClock>
{
{ MultiplayerTestScene.PLAYER_1_ID, new ManualClock() },
{ MultiplayerTestScene.PLAYER_2_ID, new ManualClock() }
{ PLAYER_1_ID, new ManualClock() },
{ PLAYER_2_ID, new ManualClock() }
};
Child = container = new TestContainer();
foreach (var (userId, _) in clocks)
container.SpectatorClient.StartPlay(userId, 0);
SpectatorClient.StartPlay(userId, 0);
});
AddStep("create leaderboard", () =>
@ -55,7 +52,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
var scoreProcessor = new OsuScoreProcessor();
scoreProcessor.ApplyBeatmap(playable);
container.LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, container.Add);
LoadComponentAsync(leaderboard = new MultiSpectatorLeaderboard(scoreProcessor, clocks.Keys.ToArray()) { Expanded = { Value = true } }, Add);
});
AddUntilStep("wait for load", () => leaderboard.IsLoaded);
@ -76,42 +73,42 @@ namespace osu.Game.Tests.Visual.Multiplayer
// For player 2, send frames in sets of 10.
for (int i = 0; i < 100; i++)
{
container.SpectatorClient.SendFrames(MultiplayerTestScene.PLAYER_1_ID, i, 1);
SpectatorClient.SendFrames(PLAYER_1_ID, i, 1);
if (i % 10 == 0)
container.SpectatorClient.SendFrames(MultiplayerTestScene.PLAYER_2_ID, i, 10);
SpectatorClient.SendFrames(PLAYER_2_ID, i, 10);
}
});
assertCombo(MultiplayerTestScene.PLAYER_1_ID, 1);
assertCombo(MultiplayerTestScene.PLAYER_2_ID, 10);
assertCombo(PLAYER_1_ID, 1);
assertCombo(PLAYER_2_ID, 10);
// Advance to a point where only user player 1's frame changes.
setTime(500);
assertCombo(MultiplayerTestScene.PLAYER_1_ID, 5);
assertCombo(MultiplayerTestScene.PLAYER_2_ID, 10);
assertCombo(PLAYER_1_ID, 5);
assertCombo(PLAYER_2_ID, 10);
// Advance to a point where both user's frame changes.
setTime(1100);
assertCombo(MultiplayerTestScene.PLAYER_1_ID, 11);
assertCombo(MultiplayerTestScene.PLAYER_2_ID, 20);
assertCombo(PLAYER_1_ID, 11);
assertCombo(PLAYER_2_ID, 20);
// Advance user player 2 only to a point where its frame changes.
setTime(MultiplayerTestScene.PLAYER_2_ID, 2100);
assertCombo(MultiplayerTestScene.PLAYER_1_ID, 11);
assertCombo(MultiplayerTestScene.PLAYER_2_ID, 30);
setTime(PLAYER_2_ID, 2100);
assertCombo(PLAYER_1_ID, 11);
assertCombo(PLAYER_2_ID, 30);
// Advance both users beyond their last frame
setTime(101 * 100);
assertCombo(MultiplayerTestScene.PLAYER_1_ID, 100);
assertCombo(MultiplayerTestScene.PLAYER_2_ID, 100);
assertCombo(PLAYER_1_ID, 100);
assertCombo(PLAYER_2_ID, 100);
}
[Test]
public void TestNoFrames()
{
assertCombo(MultiplayerTestScene.PLAYER_1_ID, 0);
assertCombo(MultiplayerTestScene.PLAYER_2_ID, 0);
assertCombo(PLAYER_1_ID, 0);
assertCombo(PLAYER_2_ID, 0);
}
private void setTime(double time) => AddStep($"set time {time}", () =>
@ -126,30 +123,18 @@ namespace osu.Game.Tests.Visual.Multiplayer
private void assertCombo(int userId, int expectedCombo)
=> AddUntilStep($"player {userId} has {expectedCombo} combo", () => this.ChildrenOfType<GameplayLeaderboardScore>().Single(s => s.User?.Id == userId).Combo.Value == expectedCombo);
private class TestContainer : TestMultiplayerRoomContainer
{
[Cached(typeof(SpectatorClient))]
public readonly TestSpectatorClient SpectatorClient = new TestSpectatorClient();
protected override RoomTestDependencies CreateRoomDependencies() => new TestDependencies();
[Cached(typeof(UserLookupCache))]
protected class TestDependencies : MultiplayerRoomTestDependencies
{
public readonly TestSpectatorClient SpectatorClient = new TestSpectatorClient();
public readonly UserLookupCache LookupCache = new TestUserLookupCache();
protected override Container<Drawable> Content => content;
private readonly Container content;
public TestContainer()
public TestDependencies()
{
AddRangeInternal(new Drawable[]
{
SpectatorClient,
LookupCache,
content = new Container { RelativeSizeAxes = Axes.Both }
});
CacheAs<SpectatorClient>(SpectatorClient);
CacheAs(LookupCache);
}
public new Task LoadComponentAsync<TLoadable>([NotNull] TLoadable component, Action<TLoadable> onLoaded = null, CancellationToken cancellation = default, Scheduler scheduler = null)
where TLoadable : Drawable
=> base.LoadComponentAsync(component, onLoaded, cancellation, scheduler);
}
private class TestUserLookupCache : UserLookupCache