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

Update tests and logic

Browse Source
This commit is contained in:
Dean Herbert 2020-03-13 14:25:25 +09:00
parent fbb7e9f12a
commit 00d7dc19cc
2 changed files with 47 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
osu.Game.Tournament.Tests/Screens/TestSceneMapPoolScreen.cs
View File

@ -41,6 +41,26 @@ namespace osu.Game.Tournament.Tests.Screens
AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0); AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
} }
[Test]
public void TestJustEnoughMaps()
{
AddStep("load just enough maps", () =>
{
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
for (int i = 0; i < 18; i++)
addBeatmap();
});
AddStep("reset match", () =>
{
Ladder.CurrentMatch.Value = new TournamentMatch();
Ladder.CurrentMatch.Value = Ladder.Matches.First();
});
AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
}
[Test] [Test]
public void TestManyMaps() public void TestManyMaps()
{ {
@ -48,7 +68,7 @@ namespace osu.Game.Tournament.Tests.Screens
{ {
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear(); Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
for (int i = 0; i < 17; i++) for (int i = 0; i < 19; i++)
addBeatmap(); addBeatmap();
}); });
@ -61,6 +81,26 @@ namespace osu.Game.Tournament.Tests.Screens
AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0); AddAssert("ensure layout width is 3", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y == 0);
} }
[Test]
public void TestJustEnoughMods()
{
AddStep("load many maps", () =>
{
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
for (int i = 0; i < 11; i++)
addBeatmap(i > 4 ? $"M{i}" : "NM");
});
AddStep("reset match", () =>
{
Ladder.CurrentMatch.Value = new TournamentMatch();
Ladder.CurrentMatch.Value = Ladder.Matches.First();
});
AddAssert("ensure layout width is 2", () => screen.ChildrenOfType<TournamentBeatmapPanel>().ElementAt(2).Y > 0);
}
[Test] [Test]
public void TestManyMods() public void TestManyMods()
{ {
@ -68,8 +108,8 @@ namespace osu.Game.Tournament.Tests.Screens
{ {
Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear(); Ladder.CurrentMatch.Value.Round.Value.Beatmaps.Clear();
for (int i = 0; i < 13; i++) for (int i = 0; i < 12; i++)
addBeatmap(i < 4 ? $"M{i}" : "NM"); addBeatmap(i > 4 ? $"M{i}" : "NM");
}); });
AddStep("reset match", () => AddStep("reset match", () =>

7
osu.Game.Tournament/Screens/MapPool/MapPoolScreen.cs
View File

@ -211,7 +211,6 @@ namespace osu.Game.Tournament.Screens.MapPool
private void matchChanged(ValueChangedEvent<TournamentMatch> match) private void matchChanged(ValueChangedEvent<TournamentMatch> match)
{ {
mapFlows.Clear(); mapFlows.Clear();
mapFlows.Padding = new MarginPadding(5) { Horizontal = 100 };
int totalRows = 0; int totalRows = 0;
@ -254,9 +253,11 @@ namespace osu.Game.Tournament.Screens.MapPool
} }
} }
if (totalRows > 9) mapFlows.Padding = new MarginPadding(5)
{
// remove horizontal padding to increase flow width to 3 panels // remove horizontal padding to increase flow width to 3 panels
mapFlows.Padding = new MarginPadding(5); Horizontal = totalRows > 9 ? 0 : 100
};
} }
} }
} }