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

Simplify usages where the ruleset being used is osu! ruleset

Browse Source
This commit is contained in:
Dean Herbert 2021-12-13 16:37:20 +09:00
parent b0d14526ea
commit 99ac71c1fe
5 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsResultsScreen.cs
View File

@ -53,7 +53,7 @@ namespace osu.Game.Tests.Visual.Playlists
AddStep("bind user score info handler", () => AddStep("bind user score info handler", () =>
{ {
userScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); userScore = TestResources.CreateTestScoreInfo();
userScore.OnlineID = currentScoreId++; userScore.OnlineID = currentScoreId++;
bindHandler(userScore: userScore); bindHandler(userScore: userScore);
@ -81,7 +81,7 @@ namespace osu.Game.Tests.Visual.Playlists
AddStep("bind user score info handler", () => AddStep("bind user score info handler", () =>
{ {
userScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); userScore = TestResources.CreateTestScoreInfo();
userScore.OnlineID = currentScoreId++; userScore.OnlineID = currentScoreId++;
bindHandler(true, userScore); bindHandler(true, userScore);
@ -132,7 +132,7 @@ namespace osu.Game.Tests.Visual.Playlists
AddStep("bind user score info handler", () => AddStep("bind user score info handler", () =>
{ {
userScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); userScore = TestResources.CreateTestScoreInfo();
userScore.OnlineID = currentScoreId++; userScore.OnlineID = currentScoreId++;
bindHandler(userScore: userScore); bindHandler(userScore: userScore);

4
osu.Game.Tests/Visual/Ranking/TestSceneContractedPanelMiddleContent.cs
View File

@ -23,13 +23,13 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestShowPanel() public void TestShowPanel()
{ {
AddStep("show example score", () => showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo))); AddStep("show example score", () => showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), TestResources.CreateTestScoreInfo()));
} }
[Test] [Test]
public void TestExcessMods() public void TestExcessMods()
{ {
AddStep("show excess mods score", () => showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo, true))); AddStep("show excess mods score", () => showPanel(CreateWorkingBeatmap(CreateBeatmap(new OsuRuleset().RulesetInfo)), TestResources.CreateTestScoreInfo(excessMods: true)));
} }
private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score) private void showPanel(WorkingBeatmap workingBeatmap, ScoreInfo score)

9
osu.Game.Tests/Visual/Ranking/TestSceneResultsScreen.cs
View File

@ -15,7 +15,6 @@ using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Rulesets.Osu;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens; using osu.Game.Screens;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
@ -204,7 +203,7 @@ namespace osu.Game.Tests.Visual.Ranking
{ {
DelayedFetchResultsScreen screen = null; DelayedFetchResultsScreen screen = null;
AddStep("load results", () => Child = new TestResultsContainer(screen = new DelayedFetchResultsScreen(TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo), 3000))); AddStep("load results", () => Child = new TestResultsContainer(screen = new DelayedFetchResultsScreen(TestResources.CreateTestScoreInfo(), 3000)));
AddUntilStep("wait for loaded", () => screen.IsLoaded); AddUntilStep("wait for loaded", () => screen.IsLoaded);
AddStep("click expanded panel", () => AddStep("click expanded panel", () =>
{ {
@ -237,9 +236,9 @@ namespace osu.Game.Tests.Visual.Ranking
AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value); AddAssert("download button is enabled", () => screen.ChildrenOfType<DownloadButton>().Last().Enabled.Value);
} }
private TestResultsScreen createResultsScreen(ScoreInfo score = null) => new TestResultsScreen(score ?? TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo)); private TestResultsScreen createResultsScreen(ScoreInfo score = null) => new TestResultsScreen(score ?? TestResources.CreateTestScoreInfo());
private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo)); private UnrankedSoloResultsScreen createUnrankedSoloResultsScreen() => new UnrankedSoloResultsScreen(TestResources.CreateTestScoreInfo());
private class TestResultsContainer : Container private class TestResultsContainer : Container
{ {
@ -282,7 +281,7 @@ namespace osu.Game.Tests.Visual.Ranking
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
{ {
var score = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var score = TestResources.CreateTestScoreInfo();
score.TotalScore += 10 - i; score.TotalScore += 10 - i;
score.Hash = $"test{i}"; score.Hash = $"test{i}";
scores.Add(score); scores.Add(score);

21
osu.Game.Tests/Visual/Ranking/TestSceneScorePanelList.cs
View File

@ -7,7 +7,6 @@ using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Testing; using osu.Framework.Testing;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Rulesets.Osu;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens.Ranking; using osu.Game.Screens.Ranking;
using osu.Game.Tests.Resources; using osu.Game.Tests.Resources;
@ -30,14 +29,14 @@ namespace osu.Game.Tests.Visual.Ranking
{ {
createListStep(() => new ScorePanelList createListStep(() => new ScorePanelList
{ {
SelectedScore = { Value = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo) } SelectedScore = { Value = TestResources.CreateTestScoreInfo() }
}); });
} }
[Test] [Test]
public void TestAddPanelAfterSelectingScore() public void TestAddPanelAfterSelectingScore()
{ {
var score = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var score = TestResources.CreateTestScoreInfo();
createListStep(() => new ScorePanelList createListStep(() => new ScorePanelList
{ {
@ -53,7 +52,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestAddPanelBeforeSelectingScore() public void TestAddPanelBeforeSelectingScore()
{ {
var score = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var score = TestResources.CreateTestScoreInfo();
createListStep(() => new ScorePanelList()); createListStep(() => new ScorePanelList());
@ -76,7 +75,7 @@ namespace osu.Game.Tests.Visual.Ranking
AddStep("add many scores", () => AddStep("add many scores", () =>
{ {
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
list.AddScore(TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo)); list.AddScore(TestResources.CreateTestScoreInfo());
}); });
assertFirstPanelCentred(); assertFirstPanelCentred();
@ -85,7 +84,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestAddManyScoresAfterExpandedPanel() public void TestAddManyScoresAfterExpandedPanel()
{ {
var initialScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var initialScore = TestResources.CreateTestScoreInfo();
createListStep(() => new ScorePanelList()); createListStep(() => new ScorePanelList());
@ -108,7 +107,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestAddManyScoresBeforeExpandedPanel() public void TestAddManyScoresBeforeExpandedPanel()
{ {
var initialScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var initialScore = TestResources.CreateTestScoreInfo();
createListStep(() => new ScorePanelList()); createListStep(() => new ScorePanelList());
@ -131,7 +130,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestAddManyPanelsOnBothSidesOfExpandedPanel() public void TestAddManyPanelsOnBothSidesOfExpandedPanel()
{ {
var initialScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var initialScore = TestResources.CreateTestScoreInfo();
createListStep(() => new ScorePanelList()); createListStep(() => new ScorePanelList());
@ -157,8 +156,8 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestSelectMultipleScores() public void TestSelectMultipleScores()
{ {
var firstScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var firstScore = TestResources.CreateTestScoreInfo();
var secondScore = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var secondScore = TestResources.CreateTestScoreInfo();
firstScore.UserString = "A"; firstScore.UserString = "A";
secondScore.UserString = "B"; secondScore.UserString = "B";
@ -191,7 +190,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestAddScoreImmediately() public void TestAddScoreImmediately()
{ {
var score = TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo); var score = TestResources.CreateTestScoreInfo();
createListStep(() => createListStep(() =>
{ {

3
osu.Game.Tests/Visual/Ranking/TestSceneStatisticsPanel.cs
View File

@ -6,7 +6,6 @@ using System.Collections.Generic;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Osu;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Screens.Ranking.Statistics; using osu.Game.Screens.Ranking.Statistics;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
@ -39,7 +38,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestScoreWithoutStatistics() public void TestScoreWithoutStatistics()
{ {
loadPanel(TestResources.CreateTestScoreInfo(new OsuRuleset().RulesetInfo)); loadPanel(TestResources.CreateTestScoreInfo());
} }
[Test] [Test]