From f0d132b16e04e85bb84c8b13d42d15559d2ce4e5 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Thu, 24 Mar 2022 15:21:46 +0900 Subject: [PATCH] Rename FinishCountdown() -> SkipToEndOfCountdown() --- .../Visual/Multiplayer/TestSceneMatchStartControl.cs | 6 +++--- .../Visual/Multiplayer/TestMultiplayerClient.cs | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs index 4fd6fd5d70..a374488306 100644 --- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs +++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMatchStartControl.cs @@ -86,7 +86,7 @@ namespace osu.Game.Tests.Visual.Multiplayer }); AddAssert("countdown button not visible", () => !this.ChildrenOfType().Single().IsPresent); - AddStep("finish countdown", () => MultiplayerClient.FinishCountdown()); + AddStep("finish countdown", () => MultiplayerClient.SkipToEndOfCountdown()); AddUntilStep("match started", () => MultiplayerClient.LocalUser?.State == MultiplayerUserState.WaitingForLoad); } @@ -105,7 +105,7 @@ namespace osu.Game.Tests.Visual.Multiplayer ClickButtonWhenEnabled(); - AddStep("finish countdown", () => MultiplayerClient.FinishCountdown()); + AddStep("finish countdown", () => MultiplayerClient.SkipToEndOfCountdown()); AddUntilStep("match not started", () => MultiplayerClient.LocalUser?.State == MultiplayerUserState.Ready); } @@ -159,7 +159,7 @@ namespace osu.Game.Tests.Visual.Multiplayer AddStep("set spectating", () => MultiplayerClient.ChangeUserState(API.LocalUser.Value.OnlineID, MultiplayerUserState.Spectating)); AddUntilStep("local user is spectating", () => MultiplayerClient.LocalUser?.State == MultiplayerUserState.Spectating); - AddStep("finish countdown", () => MultiplayerClient.FinishCountdown()); + AddStep("finish countdown", () => MultiplayerClient.SkipToEndOfCountdown()); AddUntilStep("match not started", () => MultiplayerClient.Room?.State == MultiplayerRoomState.Open); } diff --git a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs index 7562b1d0e2..ea991af914 100644 --- a/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs +++ b/osu.Game/Tests/Visual/Multiplayer/TestMultiplayerClient.cs @@ -296,11 +296,15 @@ namespace osu.Game.Tests.Visual.Multiplayer return Task.CompletedTask; } - private CancellationTokenSource? countdownFinishSource; + private CancellationTokenSource? countdownSkipSource; private CancellationTokenSource? countdownStopSource; private Task countdownTask = Task.CompletedTask; - public void FinishCountdown() => countdownFinishSource?.Cancel(); + /// + /// Skips to the end of the currently-running countdown, if one is running, + /// and runs the callback (e.g. to start the match) as soon as possible unless the countdown has been cancelled. + /// + public void SkipToEndOfCountdown() => countdownSkipSource?.Cancel(); public override async Task SendMatchRequest(MatchUserRequest request) { @@ -313,8 +317,8 @@ namespace osu.Game.Tests.Visual.Multiplayer countdownStopSource?.Cancel(); var stopSource = countdownStopSource = new CancellationTokenSource(); - var finishSource = countdownFinishSource = new CancellationTokenSource(); - var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(stopSource.Token, finishSource.Token); + var skipSource = countdownSkipSource = new CancellationTokenSource(); + var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(stopSource.Token, skipSource.Token); var countdown = new MatchStartCountdown { TimeRemaining = matchCountdownRequest.Duration }; Task lastCountdownTask = countdownTask;