h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00
Code Issues Releases Wiki Activity

Fix some remaining test failures

Browse Source
This commit is contained in:
Dean Herbert 2022-01-04 15:59:41 +09:00
parent 3811bd8520
commit de076678fe
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Tests/Online/TestAPIModJsonSerialization.cs
View File

@ -9,10 +9,12 @@ using osu.Framework.Bindables;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Online.Solo; using osu.Game.Online.Solo;
using osu.Game.Rulesets; using osu.Game.Rulesets;
using osu.Game.Rulesets.Difficulty; using osu.Game.Rulesets.Difficulty;
using osu.Game.Rulesets.Mods; using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Osu;
using osu.Game.Rulesets.Osu.Mods; using osu.Game.Rulesets.Osu.Mods;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using osu.Game.Scoring; using osu.Game.Scoring;
@ -93,7 +95,11 @@ namespace osu.Game.Tests.Online
[Test] [Test]
public void TestDeserialiseSubmittableScoreWithEmptyMods() public void TestDeserialiseSubmittableScoreWithEmptyMods()
{ {
var score = new SubmittableScore(new ScoreInfo()); var score = new SubmittableScore(new ScoreInfo
{
User = new APIUser(),
Ruleset = new OsuRuleset().RulesetInfo,
});
var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score)); var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score));
@ -105,7 +111,9 @@ namespace osu.Game.Tests.Online
{ {
var score = new SubmittableScore(new ScoreInfo var score = new SubmittableScore(new ScoreInfo
{ {
Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } } Mods = new Mod[] { new OsuModDoubleTime { SpeedChange = { Value = 2 } } },
User = new APIUser(),
Ruleset = new OsuRuleset().RulesetInfo,
}); });
var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score)); var deserialised = JsonConvert.DeserializeObject<SubmittableScore>(JsonConvert.SerializeObject(score));

1
osu.Game.Tests/Visual/Ranking/TestSceneAccuracyCircle.cs
View File

@ -72,6 +72,7 @@ namespace osu.Game.Tests.Visual.Ranking
Username = "peppy", Username = "peppy",
}, },
BeatmapInfo = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo, BeatmapInfo = new TestBeatmap(new OsuRuleset().RulesetInfo).BeatmapInfo,
Ruleset = new OsuRuleset().RulesetInfo,
Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() }, Mods = new Mod[] { new OsuModHardRock(), new OsuModDoubleTime() },
TotalScore = 2845370, TotalScore = 2845370,
Accuracy = accuracy, Accuracy = accuracy,

3
osu.Game/Online/Solo/SubmittableScore.cs
View File

@ -10,7 +10,6 @@ using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Online.API.Requests.Responses;
using osu.Game.Rulesets.Scoring; using osu.Game.Rulesets.Scoring;
using osu.Game.Scoring; using osu.Game.Scoring;
using osu.Game.Users;
namespace osu.Game.Online.Solo namespace osu.Game.Online.Solo
{ {
@ -48,7 +47,7 @@ namespace osu.Game.Online.Solo
public APIMod[] Mods { get; set; } public APIMod[] Mods { get; set; }
[JsonProperty("user")] [JsonProperty("user")]
public IUser User { get; set; } public APIUser User { get; set; }
[JsonProperty("statistics")] [JsonProperty("statistics")]
public Dictionary<HitResult, int> Statistics { get; set; } public Dictionary<HitResult, int> Statistics { get; set; }

4
osu.Game/Screens/Ranking/ScorePanelList.cs
View File

@ -158,7 +158,7 @@ namespace osu.Game.Screens.Ranking
trackingContainer.Show(); trackingContainer.Show();
if (SelectedScore.Value.Equals(score)) if (SelectedScore.Value?.Equals(score) == true)
{ {
SelectedScore.TriggerChange(); SelectedScore.TriggerChange();
} }
@ -185,7 +185,7 @@ namespace osu.Game.Screens.Ranking
private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score) private void selectedScoreChanged(ValueChangedEvent<ScoreInfo> score)
{ {
// avoid contracting panels unnecessarily when TriggerChange is fired manually. // avoid contracting panels unnecessarily when TriggerChange is fired manually.
if (!score.OldValue.Equals(score.NewValue)) if (score.OldValue != null && !score.OldValue.Equals(score.NewValue))
{ {
// Contract the old panel. // Contract the old panel.
foreach (var t in flow.Where(t => t.Panel.Score.Equals(score.OldValue))) foreach (var t in flow.Where(t => t.Panel.Score.Equals(score.OldValue)))