Skip to content

Commit 019f0a5

Browse files
peppypeppy
committed
Another pass of code quality things
aaaaaaaaaaaaaaa
1 parent 0665605 commit 019f0a5

6 files changed

+32
-355
lines changed

‎osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapInfoWedge.cs

+7-7
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected override void LoadComplete()
6969
foreach (var rulesetInfo in rulesets.AvailableRulesets)
7070
{
7171
var instance = rulesetInfo.CreateInstance();
72-
var testBeatmap = createTestBeatmap(rulesetInfo);
72+
var testBeatmap = CreateTestBeatmap(rulesetInfo);
7373

7474
beatmaps.Add(testBeatmap);
7575

@@ -127,7 +127,7 @@ public void SetUpSteps()
127127
[Test]
128128
public void TestTruncation()
129129
{
130-
selectBeatmap(createLongMetadata());
130+
selectBeatmap(CreateLongMetadata());
131131
}
132132

133133
[Test]
@@ -145,7 +145,7 @@ public void TestNullBeatmap()
145145
public void TestBPMUpdates()
146146
{
147147
const double bpm = 120;
148-
IBeatmap beatmap = createTestBeatmap(new OsuRuleset().RulesetInfo);
148+
IBeatmap beatmap = CreateTestBeatmap(new OsuRuleset().RulesetInfo);
149149
beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 60 * 1000 / bpm });
150150

151151
OsuModDoubleTime doubleTime = null!;
@@ -167,7 +167,7 @@ public void TestBPMUpdates()
167167
[TestCase(120, 120.4, "DT", "180")]
168168
public void TestVaryingBPM(double commonBpm, double otherBpm, string? mod, string expectedDisplay)
169169
{
170-
IBeatmap beatmap = createTestBeatmap(new OsuRuleset().RulesetInfo);
170+
IBeatmap beatmap = CreateTestBeatmap(new OsuRuleset().RulesetInfo);
171171
beatmap.ControlPointInfo.Add(0, new TimingControlPoint { BeatLength = 60 * 1000 / commonBpm });
172172
beatmap.ControlPointInfo.Add(100, new TimingControlPoint { BeatLength = 60 * 1000 / otherBpm });
173173
beatmap.ControlPointInfo.Add(200, new TimingControlPoint { BeatLength = 60 * 1000 / commonBpm });
@@ -191,7 +191,7 @@ private void checkDisplayedBPM(string target)
191191
[TestCase]
192192
public void TestLengthUpdates()
193193
{
194-
IBeatmap beatmap = createTestBeatmap(new OsuRuleset().RulesetInfo);
194+
IBeatmap beatmap = CreateTestBeatmap(new OsuRuleset().RulesetInfo);
195195
double drain = beatmap.CalculateDrainLength();
196196
beatmap.BeatmapInfo.Length = drain;
197197

@@ -248,7 +248,7 @@ private void selectBeatmap(IBeatmap? b)
248248
AddUntilStep("wait for async load", () => infoWedge.DisplayedContent != containerBefore);
249249
}
250250

251-
private IBeatmap createTestBeatmap(RulesetInfo ruleset)
251+
public static IBeatmap CreateTestBeatmap(RulesetInfo ruleset)
252252
{
253253
List<HitObject> objects = new List<HitObject>();
254254
for (double i = 0; i < 50000; i += 1000)
@@ -274,7 +274,7 @@ private IBeatmap createTestBeatmap(RulesetInfo ruleset)
274274
};
275275
}
276276

277-
private IBeatmap createLongMetadata()
277+
public static IBeatmap CreateLongMetadata()
278278
{
279279
return new Beatmap
280280
{

‎osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapLeaderboard.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public partial class TestSceneBeatmapLeaderboard : OsuManualInputManagerTestScen
4242
private RulesetStore rulesetStore = null!;
4343
private BeatmapManager beatmapManager = null!;
4444
private PlaySongSelect songSelect = null!;
45+
4546
private LeaderboardManager leaderboardManager = null!;
4647

4748
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
@@ -52,9 +53,10 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
5253
dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Realm, null, dependencies.Get<AudioManager>(), Resources, dependencies.Get<GameHost>(), Beatmap.Default));
5354
dependencies.Cache(scoreManager = new ScoreManager(rulesetStore, () => beatmapManager, LocalStorage, Realm, API));
5455
dependencies.CacheAs<Screens.Select.SongSelect>(songSelect = new PlaySongSelect());
55-
Dependencies.Cache(Realm);
5656
dependencies.Cache(leaderboardManager = new LeaderboardManager());
5757

58+
Dependencies.Cache(Realm);
59+
5860
return dependencies;
5961
}
6062

@@ -204,8 +206,8 @@ public void TestLocalScoresDisplayOnBeatmapEdit()
204206
public void TestGlobalScoresDisplay()
205207
{
206208
AddStep(@"Set scope", () => leaderboard.Scope = BeatmapLeaderboardScope.Global);
207-
AddStep(@"New Scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo())));
208-
AddStep(@"New Scores with teams", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()).Select(s =>
209+
AddStep(@"New Scores", () => leaderboard.SetScores(GenerateSampleScores(new BeatmapInfo())));
210+
AddStep(@"New Scores with teams", () => leaderboard.SetScores(GenerateSampleScores(new BeatmapInfo()).Select(s =>
209211
{
210212
s.User.Team = new APITeam();
211213
return s;
@@ -310,7 +312,7 @@ private void importMoreScores(Func<BeatmapInfo> beatmapInfo)
310312
{
311313
AddStep(@"Import new scores", () =>
312314
{
313-
foreach (var score in generateSampleScores(beatmapInfo()))
315+
foreach (var score in GenerateSampleScores(beatmapInfo()))
314316
scoreManager.Import(score);
315317
});
316318
}
@@ -326,7 +328,7 @@ private void checkDisplayedCount(int expected) =>
326328
private void checkStoredCount(int expected) =>
327329
AddUntilStep($"Total scores stored is {expected}", () => Realm.Run(r => r.All<ScoreInfo>().Count(s => !s.DeletePending)), () => Is.EqualTo(expected));
328330

329-
private static ScoreInfo[] generateSampleScores(BeatmapInfo beatmapInfo)
331+
public static ScoreInfo[] GenerateSampleScores(BeatmapInfo beatmapInfo)
330332
{
331333
return new[]
332334
{

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapRankingsWedge.cs

+7-230
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
using osu.Game.Screens.Select.Leaderboards;
2828
using osu.Game.Screens.SelectV2;
2929
using osu.Game.Tests.Resources;
30+
using osu.Game.Tests.Visual.SongSelect;
3031
using osu.Game.Users;
3132
using osuTK.Input;
3233

@@ -97,8 +98,8 @@ public void TestGlobalScoresDisplay()
9798
{
9899
setScope(BeatmapLeaderboardScope.Global);
99100

100-
AddStep(@"New Scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo())));
101-
AddStep(@"New Scores with teams", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()).Select(s =>
101+
AddStep(@"New Scores", () => leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo())));
102+
AddStep(@"New Scores with teams", () => leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()).Select(s =>
102103
{
103104
s.User.Team = new APITeam();
104105
return s;
@@ -134,7 +135,7 @@ public void TestPlaceholderStates()
134135
[Test]
135136
public void TestUseTheseModsDoesNotCopySystemMods()
136137
{
137-
AddStep(@"set scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
138+
AddStep(@"set scores", () => leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()), new ScoreInfo
138139
{
139140
Position = 999,
140141
Rank = ScoreRank.XH,
@@ -261,7 +262,7 @@ public void TestLocalScoresDisplayOnBeatmapEdit()
261262

262263
private void showPersonalBestWithNullPosition()
263264
{
264-
leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
265+
leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()), new ScoreInfo
265266
{
266267
Rank = ScoreRank.XH,
267268
Accuracy = 1,
@@ -280,7 +281,7 @@ private void showPersonalBestWithNullPosition()
280281

281282
private void showPersonalBest()
282283
{
283-
leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
284+
leaderboard.SetScores(TestSceneBeatmapLeaderboard.GenerateSampleScores(new BeatmapInfo()), new ScoreInfo
284285
{
285286
Position = 999,
286287
Rank = ScoreRank.XH,
@@ -307,7 +308,7 @@ private void importMoreScores(Func<BeatmapInfo> beatmapInfo)
307308
{
308309
AddStep(@"Import new scores", () =>
309310
{
310-
foreach (var score in generateSampleScores(beatmapInfo()))
311+
foreach (var score in TestSceneBeatmapLeaderboard.GenerateSampleScores(beatmapInfo()))
311312
scoreManager.Import(score);
312313
});
313314
}
@@ -323,230 +324,6 @@ private void checkDisplayedCount(int expected) =>
323324
private void checkStoredCount(int expected) =>
324325
AddUntilStep($"Total scores stored is {expected}", () => Realm.Run(r => r.All<ScoreInfo>().Count(s => !s.DeletePending)), () => Is.EqualTo(expected));
325326

326-
private static int scoreID = 1001;
327-
328-
private static ScoreInfo[] generateSampleScores(BeatmapInfo beatmapInfo)
329-
{
330-
return new[]
331-
{
332-
new ScoreInfo
333-
{
334-
Rank = ScoreRank.XH,
335-
OnlineID = scoreID++,
336-
Accuracy = 1,
337-
MaxCombo = 244,
338-
TotalScore = 1707827,
339-
Date = DateTime.Now,
340-
Mods = new Mod[]
341-
{
342-
new OsuModHidden(),
343-
new OsuModHardRock(),
344-
new OsuModFlashlight
345-
{
346-
FollowDelay = { Value = 200 },
347-
SizeMultiplier = { Value = 5 },
348-
},
349-
new OsuModDifficultyAdjust
350-
{
351-
CircleSize = { Value = 11 },
352-
ApproachRate = { Value = 10 },
353-
OverallDifficulty = { Value = 10 },
354-
DrainRate = { Value = 10 },
355-
ExtendedLimits = { Value = true }
356-
}
357-
},
358-
Ruleset = new OsuRuleset().RulesetInfo,
359-
BeatmapInfo = beatmapInfo,
360-
BeatmapHash = beatmapInfo.Hash,
361-
User = new APIUser
362-
{
363-
Id = 6602580,
364-
Username = @"waaiiru",
365-
CountryCode = CountryCode.ES,
366-
},
367-
},
368-
new ScoreInfo
369-
{
370-
Rank = ScoreRank.X,
371-
OnlineID = scoreID++,
372-
Accuracy = 1,
373-
MaxCombo = 244,
374-
TotalScore = 1707827,
375-
Date = DateTime.Now.AddSeconds(-30),
376-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
377-
BeatmapInfo = beatmapInfo,
378-
BeatmapHash = beatmapInfo.Hash,
379-
Ruleset = new OsuRuleset().RulesetInfo,
380-
User = new APIUser
381-
{
382-
Id = 4608074,
383-
Username = @"Skycries",
384-
CountryCode = CountryCode.BR,
385-
},
386-
},
387-
new ScoreInfo
388-
{
389-
Rank = ScoreRank.SH,
390-
OnlineID = scoreID++,
391-
Accuracy = 1,
392-
MaxCombo = 244,
393-
TotalScore = 1707827,
394-
Date = DateTime.Now.AddSeconds(-70),
395-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
396-
BeatmapInfo = beatmapInfo,
397-
BeatmapHash = beatmapInfo.Hash,
398-
Ruleset = new OsuRuleset().RulesetInfo,
399-
400-
User = new APIUser
401-
{
402-
Id = 1014222,
403-
Username = @"eLy",
404-
CountryCode = CountryCode.JP,
405-
},
406-
},
407-
new ScoreInfo
408-
{
409-
Rank = ScoreRank.S,
410-
OnlineID = scoreID++,
411-
Accuracy = 1,
412-
MaxCombo = 244,
413-
TotalScore = 1707827,
414-
Date = DateTime.Now.AddMinutes(-40),
415-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
416-
BeatmapInfo = beatmapInfo,
417-
BeatmapHash = beatmapInfo.Hash,
418-
Ruleset = new OsuRuleset().RulesetInfo,
419-
420-
User = new APIUser
421-
{
422-
Id = 1541390,
423-
Username = @"Toukai",
424-
CountryCode = CountryCode.CA,
425-
},
426-
},
427-
new ScoreInfo
428-
{
429-
Rank = ScoreRank.A,
430-
OnlineID = scoreID++,
431-
Accuracy = 1,
432-
MaxCombo = 244,
433-
TotalScore = 1707827,
434-
Date = DateTime.Now.AddHours(-2),
435-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
436-
BeatmapInfo = beatmapInfo,
437-
BeatmapHash = beatmapInfo.Hash,
438-
Ruleset = new OsuRuleset().RulesetInfo,
439-
440-
User = new APIUser
441-
{
442-
Id = 2243452,
443-
Username = @"Satoruu",
444-
CountryCode = CountryCode.VE,
445-
},
446-
},
447-
new ScoreInfo
448-
{
449-
Rank = ScoreRank.B,
450-
OnlineID = scoreID++,
451-
Accuracy = 0.9826,
452-
MaxCombo = 244,
453-
TotalScore = 1707827,
454-
Date = DateTime.Now.AddHours(-25),
455-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
456-
BeatmapInfo = beatmapInfo,
457-
BeatmapHash = beatmapInfo.Hash,
458-
Ruleset = new OsuRuleset().RulesetInfo,
459-
460-
User = new APIUser
461-
{
462-
Id = 2705430,
463-
Username = @"Mooha",
464-
CountryCode = CountryCode.FR,
465-
},
466-
},
467-
new ScoreInfo
468-
{
469-
Rank = ScoreRank.C,
470-
OnlineID = scoreID++,
471-
Accuracy = 0.9654,
472-
MaxCombo = 244,
473-
TotalScore = 1707827,
474-
Date = DateTime.Now.AddHours(-50),
475-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
476-
BeatmapInfo = beatmapInfo,
477-
BeatmapHash = beatmapInfo.Hash,
478-
Ruleset = new OsuRuleset().RulesetInfo,
479-
480-
User = new APIUser
481-
{
482-
Id = 7151382,
483-
Username = @"Mayuri Hana",
484-
CountryCode = CountryCode.TH,
485-
},
486-
},
487-
new ScoreInfo
488-
{
489-
Rank = ScoreRank.D,
490-
OnlineID = scoreID++,
491-
Accuracy = 0.6025,
492-
MaxCombo = 244,
493-
TotalScore = 1707827,
494-
Date = DateTime.Now.AddHours(-72),
495-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
496-
BeatmapInfo = beatmapInfo,
497-
BeatmapHash = beatmapInfo.Hash,
498-
Ruleset = new OsuRuleset().RulesetInfo,
499-
500-
User = new APIUser
501-
{
502-
Id = 2051389,
503-
Username = @"FunOrange",
504-
CountryCode = CountryCode.CA,
505-
},
506-
},
507-
new ScoreInfo
508-
{
509-
Rank = ScoreRank.D,
510-
OnlineID = scoreID++,
511-
Accuracy = 0.5140,
512-
MaxCombo = 244,
513-
TotalScore = 1707827,
514-
Date = DateTime.Now.AddMonths(-10),
515-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
516-
BeatmapInfo = beatmapInfo,
517-
BeatmapHash = beatmapInfo.Hash,
518-
Ruleset = new OsuRuleset().RulesetInfo,
519-
520-
User = new APIUser
521-
{
522-
Id = 6169483,
523-
Username = @"-Hebel-",
524-
CountryCode = CountryCode.MX,
525-
},
526-
},
527-
new ScoreInfo
528-
{
529-
Rank = ScoreRank.D,
530-
OnlineID = scoreID++,
531-
Accuracy = 0.4222,
532-
MaxCombo = 244,
533-
TotalScore = 1707827,
534-
Date = DateTime.Now.AddYears(-2),
535-
Mods = new Mod[] { new OsuModHidden(), new OsuModHardRock(), },
536-
BeatmapInfo = beatmapInfo,
537-
BeatmapHash = beatmapInfo.Hash,
538-
Ruleset = new OsuRuleset().RulesetInfo,
539-
540-
User = new APIUser
541-
{
542-
Id = 6702666,
543-
Username = @"prhtnsm",
544-
CountryCode = CountryCode.DE,
545-
},
546-
},
547-
};
548-
}
549-
550327
private partial class TestBeatmapLeaderboardWedge : BeatmapLeaderboardWedge
551328
{
552329
public new void SetState(LeaderboardState state) => base.SetState(state);

0 commit comments

Comments
 (0)