RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-03-23 19:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjust test coverage to read better

Browse Source
This commit is contained in:
Salman Ahmed 2022-09-09 19:39:01 +03:00
parent dd10a06e3d
commit ae53e27e6c
1 changed files with 19 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,12 @@
// 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.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Extensions; using osu.Framework.Extensions;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Platform; using osu.Framework.Platform;
using osu.Framework.Testing; using osu.Framework.Testing;
@ -49,12 +47,12 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("Create local rank", () => AddStep("Create local rank", () =>
{ {
Add(topLocalRank = new TopLocalRank(importedBeatmap) Child = topLocalRank = new TopLocalRank(importedBeatmap)
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Scale = new Vector2(10), Scale = new Vector2(10),
}); };
}); });
AddAssert("No rank displayed initially", () => topLocalRank.DisplayedRank == null); AddAssert("No rank displayed initially", () => topLocalRank.DisplayedRank == null);
@ -63,7 +61,7 @@ namespace osu.Game.Tests.Visual.SongSelect
[Test] [Test]
public void TestBasicImportDelete() public void TestBasicImportDelete()
{ {
ScoreInfo? testScoreInfo = null; ScoreInfo testScoreInfo = null!;
AddStep("Add score for current user", () => AddStep("Add score for current user", () =>
{ {
@ -77,10 +75,7 @@ namespace osu.Game.Tests.Visual.SongSelect
AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B); AddUntilStep("B rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.B);
AddStep("Delete score", () => AddStep("Delete score", () => scoreManager.Delete(testScoreInfo));
{
scoreManager.Delete(testScoreInfo.AsNonNull());
});
AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null); AddUntilStep("No rank displayed", () => topLocalRank.DisplayedRank == null);
} }
@ -88,11 +83,9 @@ namespace osu.Game.Tests.Visual.SongSelect
[Test] [Test]
public void TestRulesetChange() public void TestRulesetChange()
{ {
ScoreInfo testScoreInfo;
AddStep("Add score for current user", () => AddStep("Add score for current user", () =>
{ {
testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap); var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
testScoreInfo.User = API.LocalUser.Value; testScoreInfo.User = API.LocalUser.Value;
testScoreInfo.Rank = ScoreRank.B; testScoreInfo.Rank = ScoreRank.B;
@ -112,11 +105,9 @@ namespace osu.Game.Tests.Visual.SongSelect
[Test] [Test]
public void TestHigherScoreSet() public void TestHigherScoreSet()
{ {
ScoreInfo? testScoreInfo = null;
AddStep("Add score for current user", () => AddStep("Add score for current user", () =>
{ {
testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap); var testScoreInfo = TestResources.CreateTestScoreInfo(importedBeatmap);
testScoreInfo.User = API.LocalUser.Value; testScoreInfo.User = API.LocalUser.Value;
testScoreInfo.Rank = ScoreRank.B; testScoreInfo.Rank = ScoreRank.B;
@ -131,28 +122,20 @@ namespace osu.Game.Tests.Visual.SongSelect
var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap); var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
testScoreInfo2.User = API.LocalUser.Value; testScoreInfo2.User = API.LocalUser.Value;
testScoreInfo2.Rank = ScoreRank.S; testScoreInfo2.Rank = ScoreRank.X;
testScoreInfo2.TotalScore = testScoreInfo.AsNonNull().TotalScore + 1; testScoreInfo2.TotalScore = 1000000;
testScoreInfo2.Statistics = new Dictionary<HitResult, int> testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
{
[HitResult.Miss] = 0,
[HitResult.Perfect] = 970,
[HitResult.SmallTickHit] = 75,
[HitResult.LargeTickHit] = 150,
[HitResult.LargeBonus] = 10,
[HitResult.SmallBonus] = 50
};
scoreManager.Import(testScoreInfo2); scoreManager.Import(testScoreInfo2);
}); });
AddUntilStep("S rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.S); AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
} }
[Test] [Test]
public void TestLegacyScore() public void TestLegacyScore()
{ {
ScoreInfo? testScoreInfo = null; ScoreInfo testScoreInfo = null!;
AddStep("Add legacy score for current user", () => AddStep("Add legacy score for current user", () =>
{ {
@ -160,7 +143,7 @@ namespace osu.Game.Tests.Visual.SongSelect
testScoreInfo.User = API.LocalUser.Value; testScoreInfo.User = API.LocalUser.Value;
testScoreInfo.Rank = ScoreRank.B; testScoreInfo.Rank = ScoreRank.B;
testScoreInfo.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo, ScoringMode.Classic).GetResultSafely(); testScoreInfo.TotalScore = scoreManager.GetTotalScore(testScoreInfo, ScoringMode.Classic);
scoreManager.Import(testScoreInfo); scoreManager.Import(testScoreInfo);
}); });
@ -172,26 +155,18 @@ namespace osu.Game.Tests.Visual.SongSelect
var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap); var testScoreInfo2 = TestResources.CreateTestScoreInfo(importedBeatmap);
testScoreInfo2.User = API.LocalUser.Value; testScoreInfo2.User = API.LocalUser.Value;
testScoreInfo2.Rank = ScoreRank.S; testScoreInfo2.Rank = ScoreRank.X;
testScoreInfo2.Statistics = new Dictionary<HitResult, int> testScoreInfo2.Statistics = testScoreInfo2.MaximumStatistics;
{ testScoreInfo2.TotalScore = scoreManager.GetTotalScore(testScoreInfo2);
[HitResult.Miss] = 0,
[HitResult.Perfect] = 970,
[HitResult.SmallTickHit] = 75,
[HitResult.LargeTickHit] = 150,
[HitResult.LargeBonus] = 10,
[HitResult.SmallBonus] = 50
};
testScoreInfo2.TotalScore = scoreManager.GetTotalScoreAsync(testScoreInfo.AsNonNull()).GetResultSafely(); // ensure second score has a total score (standardised) less than first one (classic)
// despite having better statistics, otherwise this test is pointless.
// 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); scoreManager.Import(testScoreInfo2);
}); });
AddUntilStep("S rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.S); AddUntilStep("SS rank displayed", () => topLocalRank.DisplayedRank == ScoreRank.X);
} }
} }
} }