mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 09:07:52 +08:00
Update drum roll judgement tests to work correctly with more correct tick rate applied
This commit is contained in:
parent
c276b728ec
commit
2fca814926
@ -20,13 +20,22 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(0),
|
new TaikoReplayFrame(0),
|
||||||
new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
|
new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
|
||||||
new TaikoReplayFrame(1001),
|
new TaikoReplayFrame(1001),
|
||||||
|
new TaikoReplayFrame(1250, TaikoAction.LeftCentre),
|
||||||
|
new TaikoReplayFrame(1251),
|
||||||
|
new TaikoReplayFrame(1500, TaikoAction.LeftCentre),
|
||||||
|
new TaikoReplayFrame(1501),
|
||||||
|
new TaikoReplayFrame(1750, TaikoAction.LeftCentre),
|
||||||
|
new TaikoReplayFrame(1751),
|
||||||
new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
|
new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
|
||||||
new TaikoReplayFrame(2001),
|
new TaikoReplayFrame(2001),
|
||||||
}, CreateBeatmap(createDrumRoll(false)));
|
}, CreateBeatmap(createDrumRoll(false)));
|
||||||
|
|
||||||
AssertJudgementCount(3);
|
AssertJudgementCount(6);
|
||||||
AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
|
AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
|
||||||
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
||||||
|
AssertResult<DrumRollTick>(2, HitResult.SmallBonus);
|
||||||
|
AssertResult<DrumRollTick>(3, HitResult.SmallBonus);
|
||||||
|
AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,9 +49,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(2001),
|
new TaikoReplayFrame(2001),
|
||||||
}, CreateBeatmap(createDrumRoll(false)));
|
}, CreateBeatmap(createDrumRoll(false)));
|
||||||
|
|
||||||
AssertJudgementCount(3);
|
AssertJudgementCount(6);
|
||||||
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
||||||
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
AssertResult<DrumRollTick>(1, HitResult.IgnoreMiss);
|
||||||
|
AssertResult<DrumRollTick>(2, HitResult.IgnoreMiss);
|
||||||
|
AssertResult<DrumRollTick>(3, HitResult.IgnoreMiss);
|
||||||
|
AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,9 +66,12 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(0),
|
new TaikoReplayFrame(0),
|
||||||
}, CreateBeatmap(createDrumRoll(false)));
|
}, CreateBeatmap(createDrumRoll(false)));
|
||||||
|
|
||||||
AssertJudgementCount(3);
|
AssertJudgementCount(6);
|
||||||
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
||||||
AssertResult<DrumRollTick>(1, HitResult.IgnoreMiss);
|
AssertResult<DrumRollTick>(1, HitResult.IgnoreMiss);
|
||||||
|
AssertResult<DrumRollTick>(2, HitResult.IgnoreMiss);
|
||||||
|
AssertResult<DrumRollTick>(3, HitResult.IgnoreMiss);
|
||||||
|
AssertResult<DrumRollTick>(4, HitResult.IgnoreMiss);
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,20 +83,26 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(0),
|
new TaikoReplayFrame(0),
|
||||||
new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
|
new TaikoReplayFrame(1000, TaikoAction.LeftCentre),
|
||||||
new TaikoReplayFrame(1001),
|
new TaikoReplayFrame(1001),
|
||||||
|
new TaikoReplayFrame(1250, TaikoAction.LeftCentre),
|
||||||
|
new TaikoReplayFrame(1251),
|
||||||
|
new TaikoReplayFrame(1500, TaikoAction.LeftCentre),
|
||||||
|
new TaikoReplayFrame(1501),
|
||||||
|
new TaikoReplayFrame(1750, TaikoAction.LeftCentre),
|
||||||
|
new TaikoReplayFrame(1751),
|
||||||
new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
|
new TaikoReplayFrame(2000, TaikoAction.LeftCentre),
|
||||||
new TaikoReplayFrame(2001),
|
new TaikoReplayFrame(2001),
|
||||||
}, CreateBeatmap(createDrumRoll(true)));
|
}, CreateBeatmap(createDrumRoll(true)));
|
||||||
|
|
||||||
AssertJudgementCount(6);
|
AssertJudgementCount(12);
|
||||||
|
|
||||||
AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
|
for (int i = 0; i < 5; i++)
|
||||||
AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
|
{
|
||||||
|
AssertResult<DrumRollTick>(i, HitResult.SmallBonus);
|
||||||
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
AssertResult<StrongNestedHitObject>(i, HitResult.LargeBonus);
|
||||||
AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
|
}
|
||||||
|
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
|
AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -94,16 +115,16 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(2001),
|
new TaikoReplayFrame(2001),
|
||||||
}, CreateBeatmap(createDrumRoll(true)));
|
}, CreateBeatmap(createDrumRoll(true)));
|
||||||
|
|
||||||
AssertJudgementCount(6);
|
AssertJudgementCount(12);
|
||||||
|
|
||||||
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
||||||
AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
|
AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
|
||||||
|
|
||||||
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
|
||||||
AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
|
AssertResult<StrongNestedHitObject>(4, HitResult.LargeBonus);
|
||||||
|
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
|
AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -114,20 +135,26 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(0),
|
new TaikoReplayFrame(0),
|
||||||
new TaikoReplayFrame(1000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
new TaikoReplayFrame(1000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
||||||
new TaikoReplayFrame(1001),
|
new TaikoReplayFrame(1001),
|
||||||
|
new TaikoReplayFrame(1250, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
||||||
|
new TaikoReplayFrame(1251),
|
||||||
|
new TaikoReplayFrame(1500, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
||||||
|
new TaikoReplayFrame(1501),
|
||||||
|
new TaikoReplayFrame(1750, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
||||||
|
new TaikoReplayFrame(1751),
|
||||||
new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
new TaikoReplayFrame(2000, TaikoAction.LeftCentre, TaikoAction.RightCentre),
|
||||||
new TaikoReplayFrame(2001),
|
new TaikoReplayFrame(2001),
|
||||||
}, CreateBeatmap(createDrumRoll(true)));
|
}, CreateBeatmap(createDrumRoll(true)));
|
||||||
|
|
||||||
AssertJudgementCount(6);
|
AssertJudgementCount(12);
|
||||||
|
|
||||||
AssertResult<DrumRollTick>(0, HitResult.SmallBonus);
|
for (int i = 0; i < 5; i++)
|
||||||
AssertResult<StrongNestedHitObject>(0, HitResult.LargeBonus);
|
{
|
||||||
|
AssertResult<DrumRollTick>(i, HitResult.SmallBonus);
|
||||||
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
AssertResult<StrongNestedHitObject>(i, HitResult.LargeBonus);
|
||||||
AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
|
}
|
||||||
|
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
|
AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -140,16 +167,16 @@ namespace osu.Game.Rulesets.Taiko.Tests.Judgements
|
|||||||
new TaikoReplayFrame(2001),
|
new TaikoReplayFrame(2001),
|
||||||
}, CreateBeatmap(createDrumRoll(true)));
|
}, CreateBeatmap(createDrumRoll(true)));
|
||||||
|
|
||||||
AssertJudgementCount(6);
|
AssertJudgementCount(12);
|
||||||
|
|
||||||
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
AssertResult<DrumRollTick>(0, HitResult.IgnoreMiss);
|
||||||
AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
|
AssertResult<StrongNestedHitObject>(0, HitResult.IgnoreMiss);
|
||||||
|
|
||||||
AssertResult<DrumRollTick>(1, HitResult.SmallBonus);
|
AssertResult<DrumRollTick>(4, HitResult.SmallBonus);
|
||||||
AssertResult<StrongNestedHitObject>(1, HitResult.LargeBonus);
|
AssertResult<StrongNestedHitObject>(4, HitResult.LargeBonus);
|
||||||
|
|
||||||
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
AssertResult<DrumRoll>(0, HitResult.IgnoreHit);
|
||||||
AssertResult<StrongNestedHitObject>(2, HitResult.IgnoreHit);
|
AssertResult<StrongNestedHitObject>(5, HitResult.IgnoreHit);
|
||||||
}
|
}
|
||||||
|
|
||||||
private DrumRoll createDrumRoll(bool strong) => new DrumRoll
|
private DrumRoll createDrumRoll(bool strong) => new DrumRoll
|
||||||
|
Loading…
Reference in New Issue
Block a user