From 7211c88e83bc1fa1d24c13041be7ea01357db149 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 10 Oct 2023 08:32:35 +0900 Subject: [PATCH] Make combo assertion actually work as expected --- osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs index 5bc477535d..93128c512f 100644 --- a/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs +++ b/osu.Game.Rulesets.Mania.Tests/TestSceneHoldNoteInput.cs @@ -200,9 +200,10 @@ public void TestPressAtStartThenReleaseAndImmediatelyRepress() }); assertHeadJudgement(HitResult.Perfect); - assertCombo(1); + assertComboAtJudgement(0, 1); assertTailJudgement(HitResult.Meh); - assertCombo(1); + assertComboAtJudgement(1, 0); + assertComboAtJudgement(2, 1); } /// @@ -521,8 +522,8 @@ private void assertTailJudgement(HitResult result) private void assertNoteJudgement(HitResult result) => AddAssert($"hold note judged as {result}", () => judgementResults.Single(j => j.HitObject is HoldNote).Type, () => Is.EqualTo(result)); - private void assertCombo(int combo) - => AddAssert($"combo is {combo}", () => currentPlayer.ScoreProcessor.Combo.Value, () => Is.EqualTo(combo)); + private void assertComboAtJudgement(int judgementIndex, int combo) + => AddAssert($"combo at judgement {judgementIndex} is {combo}", () => judgementResults.ElementAt(judgementIndex).ComboAfterJudgement, () => Is.EqualTo(combo)); private ScoreAccessibleReplayPlayer currentPlayer = null!;