RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move tests to TestSceneRankingsOverlay due to refactoring

This commit is contained in:
Andrei Zavatski 2019-12-05 09:53:25 +03:00
parent 22863da360
commit 33737d3d89
4 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
View File

@ -68,9 +68,7 @@ public TestSceneRankingsHeader()
};
AddStep("Set country", () => countryBindable.Value = country);
AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
AddAssert("Check country is Null", () => countryBindable.Value == null);
AddStep("Set country with no flag", () => countryBindable.Value = unknownCountry);
}
}

5
osu.Game.Tests/Visual/Online/TestSceneRankingsHeaderTitle.cs
View File

@ -43,11 +43,6 @@ public TestSceneRankingsHeaderTitle()
FullName = "United States"
};
AddStep("Set country", () => countryBindable.Value = countryA);
AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
AddAssert("Check country is Null", () => countryBindable.Value == null);
AddStep("Set country 1", () => countryBindable.Value = countryA);
AddStep("Set country 2", () => countryBindable.Value = countryB);
AddStep("Set null country", () => countryBindable.Value = null);

39
osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
View File

@ -8,6 +8,8 @@
using osu.Game.Overlays;
using NUnit.Framework;
using osu.Game.Users;
using osu.Framework.Bindables;
using osu.Game.Overlays.Rankings;
namespace osu.Game.Tests.Visual.Online
{
@ -29,9 +31,16 @@ public class TestSceneRankingsOverlay : OsuTestScene
[Cached]
private RankingsOverlay rankingsOverlay;
private readonly Bindable<Country> countryBindable = new Bindable<Country>();
private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();
public TestSceneRankingsOverlay()
{
Add(rankingsOverlay = new RankingsOverlay());
Add(rankingsOverlay = new TestRankingsOverlay
{
Country = { BindTarget = countryBindable },
Scope = { BindTarget = scope },
});
}
[Test]
@ -40,14 +49,19 @@ public void TestShow()
AddStep("Show", rankingsOverlay.Show);
}
[Test]
public void TestFlagScopeDependency()
{
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
AddAssert("Check country is Null", () => countryBindable.Value == null);
AddStep("Set country", () => countryBindable.Value = us_country);
AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
}
[Test]
public void TestShowCountry()
{
AddStep("Show US", () => rankingsOverlay.ShowCountry(new Country
{
FlagName = "US",
FullName = "United States"
}));
AddStep("Show US", () => rankingsOverlay.ShowCountry(us_country));
}
[Test]
@ -55,5 +69,18 @@ public void TestHide()
{
AddStep("Hide", rankingsOverlay.Hide);
}
private static Country us_country = new Country
{
FlagName = "US",
FullName = "United States"
};
private class TestRankingsOverlay : RankingsOverlay
{
public new Bindable<Country> Country => base.Country;
public new Bindable<RankingsScope> Scope => base.Scope;
}
}
}

26
osu.Game/Overlays/RankingsOverlay.cs
View File

@ -20,8 +20,8 @@ namespace osu.Game.Overlays
{
public class RankingsOverlay : FullscreenOverlay
{
private readonly Bindable<Country> country = new Bindable<Country>();
private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();
protected readonly Bindable<Country> Country = new Bindable<Country>();
protected readonly Bindable<RankingsScope> Scope = new Bindable<RankingsScope>();
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private readonly BasicScrollContainer scrollFlow;
@ -58,8 +58,8 @@ public RankingsOverlay()
{
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,
Country = { BindTarget = country },
Scope = { BindTarget = scope },
Country = { BindTarget = Country },
Scope = { BindTarget = Scope },
Ruleset = { BindTarget = ruleset }
},
new Container
@ -98,19 +98,19 @@ private void load(OsuColour colour)
protected override void LoadComplete()
{
country.BindValueChanged(_ =>
Country.BindValueChanged(_ =>
{
// if a country is requested, force performance scope.
if (country.Value != null)
scope.Value = RankingsScope.Performance;
if (Country.Value != null)
Scope.Value = RankingsScope.Performance;
Scheduler.AddOnce(loadNewContent);
}, true);
scope.BindValueChanged(_ =>
Scope.BindValueChanged(_ =>
{
// country filtering is only valid for performance scope.
if (scope.Value != RankingsScope.Performance)
country.Value = null;
if (Scope.Value != RankingsScope.Performance)
Country.Value = null;
Scheduler.AddOnce(loadNewContent);
}, true);
@ -127,7 +127,7 @@ public void ShowCountry(Country requested)
Show();
country.Value = requested;
Country.Value = requested;
}
private void loadNewContent()
@ -154,10 +154,10 @@ private void loadNewContent()
private APIRequest createScopedRequest()
{
switch (scope.Value)
switch (Scope.Value)
{
case RankingsScope.Performance:
return new GetUserRankingsRequest(ruleset.Value, country: country.Value?.FlagName);
return new GetUserRankingsRequest(ruleset.Value, country: Country.Value?.FlagName);
case RankingsScope.Country:
return new GetCountryRankingsRequest(ruleset.Value);