h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-01 21:03:22 +08:00
Code Issues Releases Wiki Activity

Refactor tests for readability

Browse Source
This commit is contained in:
Dean Herbert 2020-03-30 00:05:07 +09:00
parent 07c7233b3d
commit a72f0f57f6
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,67 +85,48 @@ namespace osu.Game.Tests.Visual.SongSelect
[TestCase(true)] [TestCase(true)]
[TestCase(false)] [TestCase(false)]
public void TestTraversalHold(bool forwards) public void TestTraversalBeyondVisible(bool forwards)
{ {
var sets = new List<BeatmapSetInfo>(); var sets = new List<BeatmapSetInfo>();
const int create_this_many_sets = 200;
for (int i = 0; i < create_this_many_sets; i++) const int total_set_count = 200;
{
var set = createTestBeatmapSet(i + 1); for (int i = 0; i < total_set_count; i++)
sets.Add(set); sets.Add(createTestBeatmapSet(i + 1));
}
loadBeatmaps(sets); loadBeatmaps(sets);
for (int i = 1; i < total_set_count; i += i)
selectNextAndAssert(i);
void selectNextAndAssert(int amount) void selectNextAndAssert(int amount)
{ {
setSelected(forwards ? 1 : create_this_many_sets, 1); setSelected(forwards ? 1 : total_set_count, 1);
string text = forwards ? "Next" : "Previous";
AddStep($"{text} beatmap {amount} times", () => AddStep($"{(forwards ? "Next" : "Previous")} beatmap {amount} times", () =>
{ {
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
{ {
carousel.SelectNext(forwards ? 1 : -1); carousel.SelectNext(forwards ? 1 : -1);
} }
}); });
waitForSelection(forwards ? amount + 1 : create_this_many_sets - amount);
}
for (int i = 1; i < create_this_many_sets; i += i) waitForSelection(forwards ? amount + 1 : total_set_count - amount);
{
selectNextAndAssert(i);
} }
} }
[Test] [Test]
public void TestTraversalHoldDifficulties() public void TestTraversalBeyondVisibleDifficulties()
{ {
var sets = new List<BeatmapSetInfo>(); var sets = new List<BeatmapSetInfo>();
for (int i = 0; i < 20; i++) const int total_set_count = 200;
{
var set = createTestBeatmapSet(i + 1); for (int i = 0; i < total_set_count; i++)
sets.Add(set); sets.Add(createTestBeatmapSet(i + 1));
}
loadBeatmaps(sets); loadBeatmaps(sets);
void selectNextAndAssert(int amount, bool forwards, int expectedSet, int expectedDiff)
{
// Select very first or very last difficulty
setSelected(forwards ? 1 : 20, forwards ? 1 : 3);
string text = forwards ? "Next" : "Previous";
AddStep($"{text} difficulty {amount} times", () =>
{
for (int i = 0; i < amount; i++)
{
carousel.SelectNext(forwards ? 1 : -1, false);
}
});
waitForSelection(expectedSet, expectedDiff);
}
// Selects next set once, difficulty index doesn't change // Selects next set once, difficulty index doesn't change
selectNextAndAssert(3, true, 2, 1); selectNextAndAssert(3, true, 2, 1);
@ -162,6 +143,20 @@ namespace osu.Game.Tests.Visual.SongSelect
selectNextAndAssert(3, false, 19, 3); selectNextAndAssert(3, false, 19, 3);
selectNextAndAssert(50, false, 4, 1); selectNextAndAssert(50, false, 4, 1);
selectNextAndAssert(200, false, 14, 1); selectNextAndAssert(200, false, 14, 1);
void selectNextAndAssert(int amount, bool forwards, int expectedSet, int expectedDiff)
{
// Select very first or very last difficulty
setSelected(forwards ? 1 : 20, forwards ? 1 : 3);
AddStep($"{(forwards ? "Next" : "Previous")} difficulty {amount} times", () =>
{
for (int i = 0; i < amount; i++)
carousel.SelectNext(forwards ? 1 : -1, false);
});
waitForSelection(expectedSet, expectedDiff);
}
} }
/// <summary> /// <summary>