From 6ddecfd8062d6b1b0d62a6064d7d0b0b2c8d4760 Mon Sep 17 00:00:00 2001 From: ratinfx Date: Sat, 11 Nov 2023 14:13:06 +0100 Subject: [PATCH] Update Test cases --- .../TestSceneOpenEditorTimestampInMania.cs | 9 ++---- .../TestSceneOpenEditorTimestampInOsu.cs | 32 +++++-------------- 2 files changed, 11 insertions(+), 30 deletions(-) diff --git a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs index 6ec5dcee4c..3c6a9f3b42 100644 --- a/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs +++ b/osu.Game.Rulesets.Mania.Tests/Editor/TestSceneOpenEditorTimestampInMania.cs @@ -84,17 +84,14 @@ namespace osu.Game.Rulesets.Mania.Tests.Editor [Test] public void TestUnusualSelection() { - addStepClickLink("00:00:000 (0|1)", "invalid link"); + addStepClickLink("00:00:000 (0|1)", "wrong offset"); AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170)); addReset(); - addStepClickLink("00:00:000 (0)", "std link"); - AddAssert("snap and select 1", () => checkSnapAndSelectColumn(2_170, new List<(int, int)> - { (2_170, 2) }) - ); + addStepClickLink("00:00:000 (2)", "std link"); + AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170)); addReset(); - // TODO: discuss - this selects the first 2 objects on Stable, do we want that or is this fine? addStepClickLink("00:00:000 (1,2)", "std link"); AddAssert("snap to 1, select none", () => checkSnapAndSelectColumn(2_170)); } diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs index d69f482d29..93573b5ad8 100644 --- a/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs +++ b/osu.Game.Rulesets.Osu.Tests/Editor/TestSceneOpenEditorTimestampInOsu.cs @@ -71,40 +71,24 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor { HitObject firstObject = null!; - addStepClickLink("00:00:000 (1,2,3)", "invalid offset"); - AddAssert("snap to next, select 1-2-3", () => + addStepClickLink("00:00:000 (0)", "invalid combo"); + AddAssert("snap to next, select none", () => { firstObject = EditorBeatmap.HitObjects.First(); - return checkSnapAndSelectCombo(firstObject.StartTime, 1, 2, 3); + return checkSnapAndSelectCombo(firstObject.StartTime); }); addReset(); - addStepClickLink("00:00:956 (2,3,4)", "invalid offset"); + addStepClickLink("00:00:000 (1)", "wrong offset"); + AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1)); + + addReset(); + addStepClickLink("00:00:956 (2,3,4)", "wrong offset"); AddAssert("snap to next, select 2-3-4", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3, 4)); - addReset(); - addStepClickLink("00:00:000 (0)", "invalid offset"); - AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1)); - - addReset(); - addStepClickLink("00:00:000 (1)", "invalid offset"); - AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1)); - - addReset(); - addStepClickLink("00:00:000 (2)", "invalid offset"); - AddAssert("snap and select 1", () => checkSnapAndSelectCombo(firstObject.StartTime, 1)); - - addReset(); - addStepClickLink("00:00:000 (2,3)", "invalid offset"); - AddAssert("snap to 1, select 2-3", () => checkSnapAndSelectCombo(firstObject.StartTime, 2, 3)); - addReset(); addStepClickLink("00:00:956 (956|1,956|2)", "mania link"); AddAssert("snap to next, select none", () => checkSnapAndSelectCombo(firstObject.StartTime)); - - addReset(); - addStepClickLink("00:00:000 (0|1)", "mania link"); - AddAssert("snap to 1, select none", () => checkSnapAndSelectCombo(firstObject.StartTime)); } } }