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

Merge branch 'master' into realm-stable-subscriptions

Browse Source
This commit is contained in:
Dan Balasescu 2022-01-24 19:01:49 +09:00 committed by GitHub
commit b396d55758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Tests/Visual/OsuGameTestScene.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Development;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -71,10 +72,13 @@ namespace osu.Game.Tests.Visual
[TearDownSteps] [TearDownSteps]
public void TearDownSteps() public void TearDownSteps()
{
if (DebugUtils.IsNUnitRunning)
{ {
AddStep("exit game", () => Game.Exit()); AddStep("exit game", () => Game.Exit());
AddUntilStep("wait for game exit", () => Game.Parent == null); AddUntilStep("wait for game exit", () => Game.Parent == null);
} }
}
protected void CreateGame() protected void CreateGame()
{ {

7
osu.Game/Tests/Visual/ScreenTestScene.cs
View File

@ -2,6 +2,7 @@
// 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.Development;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Logging; using osu.Framework.Logging;
@ -48,7 +49,11 @@ namespace osu.Game.Tests.Visual
public virtual void SetUpSteps() => addExitAllScreensStep(); public virtual void SetUpSteps() => addExitAllScreensStep();
[TearDownSteps] [TearDownSteps]
public virtual void TearDownSteps() => addExitAllScreensStep(); public virtual void TearDownSteps()
{
if (DebugUtils.IsNUnitRunning)
addExitAllScreensStep();
}
private void addExitAllScreensStep() private void addExitAllScreensStep()
{ {