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

Simplify test scene

Browse Source
This commit is contained in:
Andrei Zavatski 2019-11-27 23:40:52 +03:00
parent 800bda7e81
commit 44cfe98278
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
View File

@ -68,11 +68,7 @@ namespace osu.Game.Tests.Visual.Online
private void createCountryTable(RulesetInfo ruleset, int page = 1) private void createCountryTable(RulesetInfo ruleset, int page = 1)
{ {
loading.Show(); onLoadStarted();
request?.Cancel();
cancellationToken?.Cancel();
cancellationToken = new CancellationTokenSource();
request = new GetCountryRankingsRequest(ruleset, page); request = new GetCountryRankingsRequest(ruleset, page);
((GetCountryRankingsRequest)request).Success += rankings => Schedule(() => ((GetCountryRankingsRequest)request).Success += rankings => Schedule(() =>
@ -82,12 +78,7 @@ namespace osu.Game.Tests.Visual.Online
Rankings = rankings.Countries, Rankings = rankings.Countries,
}; };
LoadComponentAsync(table, t => loadTable(table);
{
scrollFlow.Clear();
scrollFlow.Add(t);
loading.Hide();
}, cancellationToken.Token);
}); });
api.Queue(request); api.Queue(request);
@ -95,11 +86,7 @@ namespace osu.Game.Tests.Visual.Online
private void createPerformanceTable(RulesetInfo ruleset, string country, int page = 1) private void createPerformanceTable(RulesetInfo ruleset, string country, int page = 1)
{ {
loading.Show(); onLoadStarted();
request?.Cancel();
cancellationToken?.Cancel();
cancellationToken = new CancellationTokenSource();
request = new GetUserRankingsRequest(ruleset, country: country, page: page); request = new GetUserRankingsRequest(ruleset, country: country, page: page);
((GetUserRankingsRequest)request).Success += rankings => Schedule(() => ((GetUserRankingsRequest)request).Success += rankings => Schedule(() =>
@ -109,12 +96,7 @@ namespace osu.Game.Tests.Visual.Online
Rankings = rankings.Users, Rankings = rankings.Users,
}; };
LoadComponentAsync(table, t => loadTable(table);
{
scrollFlow.Clear();
scrollFlow.Add(t);
loading.Hide();
}, cancellationToken.Token);
}); });
api.Queue(request); api.Queue(request);
@ -122,11 +104,7 @@ namespace osu.Game.Tests.Visual.Online
private void createScoreTable(RulesetInfo ruleset, int page = 1) private void createScoreTable(RulesetInfo ruleset, int page = 1)
{ {
loading.Show(); onLoadStarted();
request?.Cancel();
cancellationToken?.Cancel();
cancellationToken = new CancellationTokenSource();
request = new GetUserRankingsRequest(ruleset, UserRankingsType.Score, page); request = new GetUserRankingsRequest(ruleset, UserRankingsType.Score, page);
((GetUserRankingsRequest)request).Success += rankings => Schedule(() => ((GetUserRankingsRequest)request).Success += rankings => Schedule(() =>
@ -136,15 +114,28 @@ namespace osu.Game.Tests.Visual.Online
Rankings = rankings.Users, Rankings = rankings.Users,
}; };
LoadComponentAsync(table, t => loadTable(table);
{
scrollFlow.Clear();
scrollFlow.Add(t);
loading.Hide();
}, cancellationToken.Token);
}); });
api.Queue(request); api.Queue(request);
} }
private void onLoadStarted()
{
loading.Show();
request?.Cancel();
cancellationToken?.Cancel();
cancellationToken = new CancellationTokenSource();
}
private void loadTable(Drawable table)
{
LoadComponentAsync(table, t =>
{
scrollFlow.Clear();
scrollFlow.Add(t);
loading.Hide();
}, cancellationToken.Token);
}
} }
} }