h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:02:57 +08:00
Code Issues Releases Wiki Activity

Enable NRT on TopLocalRank

Browse Source
This commit is contained in:
Salman Ahmed 2022-07-23 09:25:06 +03:00
parent 1d0306810a
commit 3aecd288e2
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game.Tests/Visual/SongSelect/TestSceneTopLocalRank.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
@ -10,6 +8,7 @@ using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Extensions;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics;
using osu.Framework.Platform;
using osu.Framework.Testing;
@ -25,10 +24,10 @@ namespace osu.Game.Tests.Visual.SongSelect
{
public class TestSceneTopLocalRank : OsuTestScene
{
private RulesetStore rulesets;
private BeatmapManager beatmapManager;
private ScoreManager scoreManager;
private TopLocalRank topLocalRank;
private RulesetStore rulesets = null!;
private BeatmapManager beatmapManager = null!;
private ScoreManager scoreManager = null!;
private TopLocalRank topLocalRank = null!;
[BackgroundDependencyLoader]
private void load(GameHost host, AudioManager audio)
@ -64,7 +63,7 @@ namespace osu.Game.Tests.Visual.SongSelect
[Test]
public void TestBasicImportDelete()
{
ScoreInfo testScoreInfo = null;
ScoreInfo? testScoreInfo = null;
AddStep("Add score for current user", () =>
{
@ -80,7 +79,7 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("Delete score", () =>
{
scoreManager.Delete(testScoreInfo);
scoreManager.Delete(testScoreInfo.AsNonNull());
});
AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
@ -113,7 +112,7 @@ namespace osu.Game.Tests.Visual.SongSelect
[Test]
public void TestHigherScoreSet()
{
ScoreInfo testScoreInfo = null;
ScoreInfo? testScoreInfo = null;
AddStep("Add score for current user", () =>
{
@ -133,7 +132,7 @@ namespace osu.Game.Tests.Visual.SongSelect
testScoreInfo2.User = API.LocalUser.Value;
testScoreInfo2.Rank = ScoreRank.S;
testScoreInfo2.TotalScore = testScoreInfo.TotalScore + 1;
testScoreInfo2.TotalScore = testScoreInfo.AsNonNull().TotalScore + 1;
testScoreInfo2.Statistics = new Dictionary<HitResult, int>
{
[HitResult.Miss] = 0,
@ -153,7 +152,7 @@ namespace osu.Game.Tests.Visual.SongSelect
[Test]
public void TestLegacyScore()
{
ScoreInfo testScoreInfo = null;
ScoreInfo? testScoreInfo = null;
AddStep("Add legacy score for current user", () =>
{
@ -184,10 +183,10 @@ namespace osu.Game.Tests.Visual.SongSelect
[HitResult.SmallBonus] = 50
};
testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo).GetResultSafely();
testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo.AsNonNull()).GetResultSafely();
// ensure standardised total score is less than classic, otherwise this test is pointless.
Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.TotalScore);
Debug.Assert(testScoreInfo2.TotalScore < testScoreInfo.AsNonNull().TotalScore);
scoreManager.Import(testScoreInfo2);
});

16
osu.Game/Screens/Select/Carousel/TopLocalRank.cs
View File

@ -1,8 +1,6 @@
// 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.
#nullable disable
using System;
using System.Linq;
using System.Threading;
@ -29,19 +27,19 @@ namespace osu.Game.Screens.Select.Carousel
private readonly BeatmapInfo beatmapInfo;
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; }
private IBindable<RulesetInfo> ruleset { get; set; } = null!;
[Resolved]
private RealmAccess realm { get; set; }
private RealmAccess realm { get; set; } = null!;
[Resolved]
private ScoreManager scoreManager { get; set; }
private ScoreManager scoreManager { get; set; } = null!;
[Resolved]
private IAPIProvider api { get; set; }
private IAPIProvider api { get; set; } = null!;
private IDisposable scoreSubscription;
private CancellationTokenSource scoreOrderCancellationSource;
private IDisposable? scoreSubscription;
private CancellationTokenSource? scoreOrderCancellationSource;
private readonly UpdateableRank updateable;
@ -78,7 +76,7 @@ namespace osu.Game.Screens.Select.Carousel
localScoresChanged);
}, true);
void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet changes, Exception error)
void localScoresChanged(IRealmCollection<ScoreInfo> sender, ChangeSet? changes, Exception _)
{
// This subscription may fire from changes to linked beatmaps, which we don't care about.
// It's currently not possible for a score to be modified after insertion, so we can safely ignore callbacks with only modifications.