mirror of
https://github.com/ppy/osu.git
synced 2025-03-05 11:43:01 +08:00
Use new method in more places that can benefit from it
This commit is contained in:
parent
654b47c7ec
commit
309290a3c9
@ -94,7 +94,7 @@ namespace osu.Game.Tests.Online
|
|||||||
[Test]
|
[Test]
|
||||||
public void TestDeserialiseSubmittableScoreWithEmptyMods()
|
public void TestDeserialiseSubmittableScoreWithEmptyMods()
|
||||||
{
|
{
|
||||||
var score = new SubmittableScore(new ScoreInfo { Ruleset = new OsuRuleset().RulesetInfo });
|
var score = new SubmittableScore(new ScoreInfo());
|
||||||
|
|
||||||
var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score));
|
var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score));
|
||||||
|
|
||||||
@ -106,7 +106,6 @@ namespace osu.Game.Tests.Online
|
|||||||
{
|
{
|
||||||
var score = new SubmittableScore(new ScoreInfo
|
var score = new SubmittableScore(new ScoreInfo
|
||||||
{
|
{
|
||||||
Ruleset = new OsuRuleset().RulesetInfo,
|
|
||||||
Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } }
|
Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } }
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -18,7 +18,6 @@ using osu.Game.Configuration;
|
|||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Graphics.Containers;
|
using osu.Game.Graphics.Containers;
|
||||||
using osu.Game.Graphics.Sprites;
|
using osu.Game.Graphics.Sprites;
|
||||||
using osu.Game.Online.API.Requests.Responses;
|
|
||||||
using osu.Game.Rulesets;
|
using osu.Game.Rulesets;
|
||||||
using osu.Game.Rulesets.Osu.Mods;
|
using osu.Game.Rulesets.Osu.Mods;
|
||||||
using osu.Game.Scoring;
|
using osu.Game.Scoring;
|
||||||
@ -28,7 +27,6 @@ using osu.Game.Screens.Play;
|
|||||||
using osu.Game.Screens.Play.PlayerSettings;
|
using osu.Game.Screens.Play.PlayerSettings;
|
||||||
using osu.Game.Screens.Ranking;
|
using osu.Game.Screens.Ranking;
|
||||||
using osu.Game.Screens.Select;
|
using osu.Game.Screens.Select;
|
||||||
using osu.Game.Tests.Beatmaps;
|
|
||||||
using osu.Game.Tests.Resources;
|
using osu.Game.Tests.Resources;
|
||||||
using osuTK;
|
using osuTK;
|
||||||
using osuTK.Graphics;
|
using osuTK.Graphics;
|
||||||
@ -229,12 +227,7 @@ namespace osu.Game.Tests.Visual.Background
|
|||||||
|
|
||||||
FadeAccessibleResults results = null;
|
FadeAccessibleResults results = null;
|
||||||
|
|
||||||
AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(new ScoreInfo
|
AddStep("Transition to Results", () => player.Push(results = new FadeAccessibleResults(TestResources.CreateTestScoreInfo())));
|
||||||
{
|
|
||||||
User = new APIUser { Username = "osu!" },
|
|
||||||
BeatmapInfo = new TestBeatmap(Ruleset.Value).BeatmapInfo,
|
|
||||||
Ruleset = Ruleset.Value,
|
|
||||||
})));
|
|
||||||
|
|
||||||
AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
|
AddUntilStep("Wait for results is current", () => results.IsCurrentScreen());
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ namespace osu.Game.Tests.Visual.Gameplay
|
|||||||
AddAssert("total number of results == 1", () =>
|
AddAssert("total number of results == 1", () =>
|
||||||
{
|
{
|
||||||
var score = new ScoreInfo();
|
var score = new ScoreInfo();
|
||||||
|
|
||||||
((FailPlayer)Player).ScoreProcessor.PopulateScore(score);
|
((FailPlayer)Player).ScoreProcessor.PopulateScore(score);
|
||||||
|
|
||||||
return score.Statistics.Values.Sum() == 1;
|
return score.Statistics.Values.Sum() == 1;
|
||||||
|
@ -1,13 +1,11 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// 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.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System;
|
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using osu.Game.Online.API.Requests.Responses;
|
|
||||||
using osu.Game.Online.Rooms;
|
using osu.Game.Online.Rooms;
|
||||||
using osu.Game.Rulesets.Osu;
|
using osu.Game.Rulesets.Osu;
|
||||||
using osu.Game.Scoring;
|
|
||||||
using osu.Game.Screens.OnlinePlay.Multiplayer;
|
using osu.Game.Screens.OnlinePlay.Multiplayer;
|
||||||
|
using osu.Game.Tests.Resources;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual.Multiplayer
|
namespace osu.Game.Tests.Visual.Multiplayer
|
||||||
{
|
{
|
||||||
@ -22,20 +20,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
{
|
{
|
||||||
var rulesetInfo = new OsuRuleset().RulesetInfo;
|
var rulesetInfo = new OsuRuleset().RulesetInfo;
|
||||||
var beatmapInfo = CreateBeatmap(rulesetInfo).BeatmapInfo;
|
var beatmapInfo = CreateBeatmap(rulesetInfo).BeatmapInfo;
|
||||||
|
var score = TestResources.CreateTestScoreInfo(beatmapInfo);
|
||||||
var score = new ScoreInfo
|
|
||||||
{
|
|
||||||
Rank = ScoreRank.B,
|
|
||||||
TotalScore = 987654,
|
|
||||||
Accuracy = 0.8,
|
|
||||||
MaxCombo = 500,
|
|
||||||
Combo = 250,
|
|
||||||
BeatmapInfo = beatmapInfo,
|
|
||||||
User = new APIUser { Username = "Test user" },
|
|
||||||
Date = DateTimeOffset.Now,
|
|
||||||
OnlineID = 12345,
|
|
||||||
Ruleset = rulesetInfo,
|
|
||||||
};
|
|
||||||
|
|
||||||
PlaylistItem playlistItem = new PlaylistItem
|
PlaylistItem playlistItem = new PlaylistItem
|
||||||
{
|
{
|
||||||
|
@ -1,15 +1,13 @@
|
|||||||
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
// 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.
|
// See the LICENCE file in the repository root for full licence text.
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using osu.Framework.Bindables;
|
using osu.Framework.Bindables;
|
||||||
using osu.Game.Online.API.Requests.Responses;
|
|
||||||
using osu.Game.Online.Rooms;
|
using osu.Game.Online.Rooms;
|
||||||
using osu.Game.Rulesets.Osu;
|
using osu.Game.Rulesets.Osu;
|
||||||
using osu.Game.Scoring;
|
|
||||||
using osu.Game.Screens.OnlinePlay.Multiplayer;
|
using osu.Game.Screens.OnlinePlay.Multiplayer;
|
||||||
|
using osu.Game.Tests.Resources;
|
||||||
|
|
||||||
namespace osu.Game.Tests.Visual.Multiplayer
|
namespace osu.Game.Tests.Visual.Multiplayer
|
||||||
{
|
{
|
||||||
@ -26,20 +24,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
|
|||||||
{
|
{
|
||||||
var rulesetInfo = new OsuRuleset().RulesetInfo;
|
var rulesetInfo = new OsuRuleset().RulesetInfo;
|
||||||
var beatmapInfo = CreateBeatmap(rulesetInfo).BeatmapInfo;
|
var beatmapInfo = CreateBeatmap(rulesetInfo).BeatmapInfo;
|
||||||
|
var score = TestResources.CreateTestScoreInfo(beatmapInfo);
|
||||||
var score = new ScoreInfo
|
|
||||||
{
|
|
||||||
Rank = ScoreRank.B,
|
|
||||||
TotalScore = 987654,
|
|
||||||
Accuracy = 0.8,
|
|
||||||
MaxCombo = 500,
|
|
||||||
Combo = 250,
|
|
||||||
BeatmapInfo = beatmapInfo,
|
|
||||||
User = new APIUser { Username = "Test user" },
|
|
||||||
Date = DateTimeOffset.Now,
|
|
||||||
OnlineID = 12345,
|
|
||||||
Ruleset = rulesetInfo,
|
|
||||||
};
|
|
||||||
|
|
||||||
PlaylistItem playlistItem = new PlaylistItem
|
PlaylistItem playlistItem = new PlaylistItem
|
||||||
{
|
{
|
||||||
|
@ -835,12 +835,7 @@ namespace osu.Game.Tests.Visual.SongSelect
|
|||||||
// this beatmap change should be overridden by the present.
|
// this beatmap change should be overridden by the present.
|
||||||
Beatmap.Value = manager.GetWorkingBeatmap(getSwitchBeatmap());
|
Beatmap.Value = manager.GetWorkingBeatmap(getSwitchBeatmap());
|
||||||
|
|
||||||
songSelect.PresentScore(new ScoreInfo
|
songSelect.PresentScore(TestResources.CreateTestScoreInfo(getPresentBeatmap()));
|
||||||
{
|
|
||||||
User = new APIUser { Username = "woo" },
|
|
||||||
BeatmapInfo = getPresentBeatmap(),
|
|
||||||
Ruleset = getPresentBeatmap().Ruleset
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|
||||||
AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
|
AddUntilStep("wait for results screen presented", () => !songSelect.IsCurrentScreen());
|
||||||
|
Loading…
Reference in New Issue
Block a user