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

Fixed CI issues

Browse Source
This commit is contained in:
Willy Tu
2019-12-19 21:57:14 -08:00
parent e42894cfcf
commit 6abbd33b51
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs
View File

@ -30,11 +30,11 @@ namespace osu.Game.Tests.Visual.SongSelect
private readonly FailableLeaderboard leaderboard; private readonly FailableLeaderboard leaderboard;
private DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
public TestSceneBeatmapLeaderboard() public TestSceneBeatmapLeaderboard()
{ {
Add(dialogOverlay = new DialogOverlay() Add(dialogOverlay = new DialogOverlay
{ {
Depth = -1 Depth = -1
}); });

6
osu.Game.Tests/Visual/SongSelect/TestSceneUserTopScoreContainer.cs
View File

@ -17,14 +17,14 @@ namespace osu.Game.Tests.Visual.SongSelect
{ {
public class TestSceneUserTopScoreContainer : OsuTestScene public class TestSceneUserTopScoreContainer : OsuTestScene
{ {
private DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
private Container container; private readonly Container container;
public TestSceneUserTopScoreContainer() public TestSceneUserTopScoreContainer()
{ {
UserTopScoreContainer topScoreContainer; UserTopScoreContainer topScoreContainer;
Add(dialogOverlay = new DialogOverlay() Add(dialogOverlay = new DialogOverlay
{ {
Depth = -1 Depth = -1
}); });

25
osu.Game.Tests/Visual/UserInterface/TestSceneDeleteLocalScore.cs
View File

@ -36,11 +36,11 @@ namespace osu.Game.Tests.Visual.UserInterface
private readonly FailableLeaderboard leaderboard; private readonly FailableLeaderboard leaderboard;
private DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
public TestSceneDeleteLocalScore() public TestSceneDeleteLocalScore()
{ {
Add(dialogOverlay = new DialogOverlay() Add(dialogOverlay = new DialogOverlay
{ {
Depth = -1 Depth = -1
}); });
@ -70,11 +70,11 @@ namespace osu.Game.Tests.Visual.UserInterface
AddStep("Insert Locacl Scores", null); AddStep("Insert Locacl Scores", null);
TestConfirmDeleteLocalScore(); testConfirmDeleteLocalScore();
TestCancelDeleteLocalScore(); testCancelDeleteLocalScore();
} }
private void TestConfirmDeleteLocalScore() private void testConfirmDeleteLocalScore()
{ {
AddStep("Move to leaderboard", () => InputManager.MoveMouseTo(leaderboard)); AddStep("Move to leaderboard", () => InputManager.MoveMouseTo(leaderboard));
AddStep("Show ContextMenu", () => InputManager.Click(MouseButton.Right)); AddStep("Show ContextMenu", () => InputManager.Click(MouseButton.Right));
@ -87,7 +87,7 @@ namespace osu.Game.Tests.Visual.UserInterface
AddAssert("Check Score Count", () => leaderboard.ScoreCount() == 49); AddAssert("Check Score Count", () => leaderboard.ScoreCount() == 49);
} }
private void TestCancelDeleteLocalScore() private void testCancelDeleteLocalScore()
{ {
AddStep("Move to leaderboard", () => InputManager.MoveMouseTo(leaderboard)); AddStep("Move to leaderboard", () => InputManager.MoveMouseTo(leaderboard));
AddStep("Show ContextMenu", () => InputManager.Click(MouseButton.Right)); AddStep("Show ContextMenu", () => InputManager.Click(MouseButton.Right));
@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual.UserInterface
private class FailableLeaderboard : BeatmapLeaderboard private class FailableLeaderboard : BeatmapLeaderboard
{ {
private DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
private List<ScoreInfo> scoreList; private List<ScoreInfo> scoreList;
@ -129,7 +129,6 @@ namespace osu.Game.Tests.Visual.UserInterface
} }
public FailableLeaderboard(DialogOverlay dialogOverlay) public FailableLeaderboard(DialogOverlay dialogOverlay)
: base()
{ {
this.dialogOverlay = dialogOverlay; this.dialogOverlay = dialogOverlay;
initialLoad = true; initialLoad = true;
@ -179,9 +178,9 @@ namespace osu.Game.Tests.Visual.UserInterface
private class TestLeaderboardScore : LeaderboardScore private class TestLeaderboardScore : LeaderboardScore
{ {
private DialogOverlay dialogOverlay; private readonly DialogOverlay dialogOverlay;
private FailableLeaderboard leaderboard; private readonly FailableLeaderboard leaderboard;
public TestLeaderboardScore(ScoreInfo score, int rank, DialogOverlay dialogOverlay, FailableLeaderboard leaderboard, bool allowHighlight = true) public TestLeaderboardScore(ScoreInfo score, int rank, DialogOverlay dialogOverlay, FailableLeaderboard leaderboard, bool allowHighlight = true)
: base(score, rank, allowHighlight) : base(score, rank, allowHighlight)
@ -190,7 +189,7 @@ namespace osu.Game.Tests.Visual.UserInterface
this.leaderboard = leaderboard; this.leaderboard = leaderboard;
} }
protected override void deleteLocalScore(ScoreInfo score) protected override void DeleteLocalScore(ScoreInfo score)
{ {
dialogOverlay?.Push(new TestLocalScoreDeleteDialog(score, leaderboard)); dialogOverlay?.Push(new TestLocalScoreDeleteDialog(score, leaderboard));
} }
@ -198,9 +197,9 @@ namespace osu.Game.Tests.Visual.UserInterface
private class TestLocalScoreDeleteDialog : PopupDialog private class TestLocalScoreDeleteDialog : PopupDialog
{ {
public PopupDialogOkButton confirmButton; public readonly PopupDialogOkButton confirmButton;
public PopupDialogCancelButton cancelButton; public readonly PopupDialogCancelButton cancelButton;
public TestLocalScoreDeleteDialog(ScoreInfo score, FailableLeaderboard leaderboard) public TestLocalScoreDeleteDialog(ScoreInfo score, FailableLeaderboard leaderboard)
{ {

4
osu.Game/Online/Leaderboards/LeaderboardScore.cs
View File

@ -367,7 +367,7 @@ namespace osu.Game.Online.Leaderboards
} }
} }
protected virtual void deleteLocalScore(ScoreInfo score) protected virtual void DeleteLocalScore(ScoreInfo score)
{ {
dialogOverlay?.Push(new LocalScoreDeleteDialog(score)); dialogOverlay?.Push(new LocalScoreDeleteDialog(score));
} }
@ -379,7 +379,7 @@ namespace osu.Game.Online.Leaderboards
List<MenuItem> items = new List<MenuItem>(); List<MenuItem> items = new List<MenuItem>();
if (score.ID != 0) if (score.ID != 0)
items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => deleteLocalScore(score))); items.Add(new OsuMenuItem("Delete", MenuItemType.Destructive, () => DeleteLocalScore(score)));
return items.ToArray(); return items.ToArray();
} }