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

Make TestPlayer skin assigning logic not flaky

Browse Source
This commit is contained in:
Salman Ahmed
2021-06-21 04:27:09 +03:00
parent 5cfd0e3223
commit 11b78ad849
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Tests/Beatmaps/LegacyBeatmapSkinColourTest.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Tests.Beatmaps
ExposedPlayer player = CreateTestPlayer();
player.Skin = new TestSkin(userHasCustomColours);
player.SetSkin(new TestSkin(userHasCustomColours));
LoadScreen(player);

2
osu.Game/Tests/Visual/PlayerTestScene.cs
View File

@ -79,7 +79,7 @@ namespace osu.Game.Tests.Visual
}
Player = CreatePlayer(ruleset);
Player.Skin = GetPlayerSkin();
Player.SetSkin(GetPlayerSkin());
LoadScreen(Player);
}

20
osu.Game/Tests/Visual/TestPlayer.cs
View File

@ -1,7 +1,9 @@
// 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.Diagnostics;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
@ -22,8 +24,6 @@ namespace osu.Game.Tests.Visual
/// </summary>
public class TestPlayer : Player
{
public ISkin Skin { get; set; }
protected override bool PauseOnFocusLost { get; }
public new DrawableRuleset DrawableRuleset => base.DrawableRuleset;
@ -81,8 +81,22 @@ namespace osu.Game.Tests.Visual
ScoreProcessor.NewJudgement += r => Results.Add(r);
}
public ISkin Skin { get; private set; }
private TestSkinProvidingContainer rulesetSkinProvider;
internal void SetSkin(ISkin skin)
{
Debug.Assert(rulesetSkinProvider == null);
if (Skin != null)
throw new InvalidOperationException("A skin has already been set.");
Skin = skin;
}
protected override RulesetSkinProvidingContainer CreateRulesetSkinProvider(Ruleset ruleset, IBeatmap beatmap, ISkin beatmapSkin)
=> new TestSkinProvidingContainer(Skin, ruleset, beatmap, beatmapSkin);
=> rulesetSkinProvider = new TestSkinProvidingContainer(Skin, ruleset, beatmap, beatmapSkin);
private class TestSkinProvidingContainer : RulesetSkinProvidingContainer
{