RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-13 10:28:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename method to match new behaviour

Browse Source
This commit is contained in:
Dean Herbert 2019-09-29 12:23:18 +08:00
parent 2487d4f0f2
commit 539f3329ce
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs
View File

@ -82,7 +82,7 @@ namespace osu.Game.Tests.Visual.SongSelect
private void ensureRandomFetchSuccess() => private void ensureRandomFetchSuccess() =>
AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet); AddAssert("ensure prev random fetch worked", () => selectedSets.Peek() == carousel.SelectedBeatmapSet);
private void checkSelected(int set, int? diff = null) => private void waitForSelection(int set, int? diff = null) =>
AddUntilStep($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () => AddUntilStep($"selected is set{set}{(diff.HasValue ? $" diff{diff.Value}" : "")}", () =>
{ {
if (diff != null) if (diff != null)
@ -168,24 +168,24 @@ namespace osu.Game.Tests.Visual.SongSelect
loadBeatmaps(); loadBeatmaps();
advanceSelection(direction: 1, diff: false); advanceSelection(direction: 1, diff: false);
checkSelected(1, 1); waitForSelection(1, 1);
advanceSelection(direction: 1, diff: true); advanceSelection(direction: 1, diff: true);
checkSelected(1, 2); waitForSelection(1, 2);
advanceSelection(direction: -1, diff: false); advanceSelection(direction: -1, diff: false);
checkSelected(set_count, 1); waitForSelection(set_count, 1);
advanceSelection(direction: -1, diff: true); advanceSelection(direction: -1, diff: true);
checkSelected(set_count - 1, 3); waitForSelection(set_count - 1, 3);
advanceSelection(diff: false); advanceSelection(diff: false);
advanceSelection(diff: false); advanceSelection(diff: false);
checkSelected(1, 2); waitForSelection(1, 2);
advanceSelection(direction: -1, diff: true); advanceSelection(direction: -1, diff: true);
advanceSelection(direction: -1, diff: true); advanceSelection(direction: -1, diff: true);
checkSelected(set_count, 3); waitForSelection(set_count, 3);
} }
/// <summary> /// <summary>
@ -203,10 +203,10 @@ namespace osu.Game.Tests.Visual.SongSelect
AddStep("Filter", () => carousel.Filter(new FilterCriteria { SearchText = "set #3!" }, false)); AddStep("Filter", () => carousel.Filter(new FilterCriteria { SearchText = "set #3!" }, false));
checkVisibleItemCount(diff: false, count: 1); checkVisibleItemCount(diff: false, count: 1);
checkVisibleItemCount(diff: true, count: 3); checkVisibleItemCount(diff: true, count: 3);
checkSelected(3, 1); waitForSelection(3, 1);
advanceSelection(diff: true, count: 4); advanceSelection(diff: true, count: 4);
checkSelected(3, 2); waitForSelection(3, 2);
AddStep("Un-filter (debounce)", () => carousel.Filter(new FilterCriteria())); AddStep("Un-filter (debounce)", () => carousel.Filter(new FilterCriteria()));
AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask); AddUntilStep("Wait for debounce", () => !carousel.PendingFilterTask);
@ -217,10 +217,10 @@ namespace osu.Game.Tests.Visual.SongSelect
setSelected(1, 2); setSelected(1, 2);
AddStep("Filter some difficulties", () => carousel.Filter(new FilterCriteria { SearchText = "Normal" }, false)); AddStep("Filter some difficulties", () => carousel.Filter(new FilterCriteria { SearchText = "Normal" }, false));
checkSelected(1, 1); waitForSelection(1, 1);
AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false)); AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
checkSelected(1, 1); waitForSelection(1, 1);
AddStep("Filter all", () => carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false)); AddStep("Filter all", () => carousel.Filter(new FilterCriteria { SearchText = "Dingo" }, false));
@ -249,7 +249,7 @@ namespace osu.Game.Tests.Visual.SongSelect
IsLowerInclusive = true IsLowerInclusive = true
} }
}, false)); }, false));
checkSelected(3, 2); waitForSelection(3, 2);
AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false)); AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
} }
@ -317,7 +317,7 @@ namespace osu.Game.Tests.Visual.SongSelect
checkVisibleItemCount(false, set_count); checkVisibleItemCount(false, set_count);
checkSelected(set_count); waitForSelection(set_count);
} }
/// <summary> /// <summary>
@ -343,11 +343,11 @@ namespace osu.Game.Tests.Visual.SongSelect
AddAssert("Selection is non-null", () => currentSelection != null); AddAssert("Selection is non-null", () => currentSelection != null);
AddStep("Remove selected", () => carousel.RemoveBeatmapSet(carousel.SelectedBeatmapSet)); AddStep("Remove selected", () => carousel.RemoveBeatmapSet(carousel.SelectedBeatmapSet));
checkSelected(2); waitForSelection(2);
AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First())); AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First())); AddStep("Remove first", () => carousel.RemoveBeatmapSet(carousel.BeatmapSets.First()));
checkSelected(1); waitForSelection(1);
AddUntilStep("Remove all", () => AddUntilStep("Remove all", () =>
{ {
@ -390,17 +390,17 @@ namespace osu.Game.Tests.Visual.SongSelect
checkVisibleItemCount(true, 2); checkVisibleItemCount(true, 2);
advanceSelection(true); advanceSelection(true);
checkSelected(1, 3); waitForSelection(1, 3);
setHidden(3); setHidden(3);
checkSelected(1, 1); waitForSelection(1, 1);
setHidden(2, false); setHidden(2, false);
advanceSelection(true); advanceSelection(true);
checkSelected(1, 2); waitForSelection(1, 2);
setHidden(1); setHidden(1);
checkSelected(1, 2); waitForSelection(1, 2);
setHidden(2); setHidden(2);
checkNoSelection(); checkNoSelection();