h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 17:13:06 +08:00
Code Issues Releases Wiki Activity

Send initial spectator state more correctly in test component

Browse Source
This commit is contained in:
Dean Herbert 2020-10-27 17:10:48 +09:00
parent 4dba96e189
commit 63131d46aa
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestBasicSpectatingFlow()
{
beginSpectating();
loadSpectatingScreen();
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames();
AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
@ -73,13 +73,13 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames();
// should seek immediately to available frames
beginSpectating();
loadSpectatingScreen();
}
[Test]
public void TestHostStartsPlayingWhileAlreadyWatching()
{
beginSpectating();
loadSpectatingScreen();
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames();
@ -90,7 +90,7 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestHostFails()
{
beginSpectating();
loadSpectatingScreen();
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames();
@ -101,7 +101,7 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestStopWatchingDuringPlay()
{
beginSpectating();
loadSpectatingScreen();
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames();
@ -116,14 +116,14 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestWatchingBeatmapThatDoesntExistLocally()
{
beginSpectating();
loadSpectatingScreen();
AddStep("start play", () => testSpectatorStreamingClient.StartPlay());
sendFrames();
// player should never arrive.
}
private void beginSpectating() =>
private void loadSpectatingScreen() =>
AddStep("load screen", () => LoadScreen(spectatorScreen = new Spectator(testSpectatorStreamingClient.StreamingUser)));
internal class TestSpectatorStreamingClient : SpectatorStreamingClient
@ -144,6 +144,8 @@ namespace osu.Game.Tests.Visual.Gameplay
});
}
private bool sentState;
public void SendFrames(int count)
{
var frames = new List<LegacyReplayFrame>();
@ -157,18 +159,25 @@ namespace osu.Game.Tests.Visual.Gameplay
var bundle = new FrameDataBundle(frames);
((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);
if (!sentState)
sendState();
}
public override void WatchUser(int userId)
{
// usually the server would do this.
sendState();
if (sentState)
{
// usually the server would do this.
sendState();
}
base.WatchUser(userId);
}
private void sendState()
{
sentState = true;
((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
{
BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,