Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace Country class with enumeration #19137

Merged
merged 14 commits into from
Jul 18, 2022
Merged

Replace Country class with enumeration #19137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4ea8fd7
Replace `Country` class with enumeration
frenzibyte Jul 16, 2022
00f4c80
Update `APIUser` to provide enum from serialised country code
frenzibyte Jul 16, 2022
1b2b42b
Update `CountryStatistics` to use `code` for country enum
frenzibyte Jul 16, 2022
b2b2a4a
Update tournament migration logic to check for null `Country`
frenzibyte Jul 16, 2022
e62049f
Update various usages of `Country` inline with new enum
frenzibyte Jul 16, 2022
08f1280
Add `UsedImplicitly` specification to silence unused member inspection
frenzibyte Jul 16, 2022
9c81241
Fix potential nullref on `APIUser.Country`
frenzibyte Jul 16, 2022
4968859
Rename placeholder display flag property to make sense
frenzibyte Jul 16, 2022
9e94519
Use "Unknown" instead of "Alient" for unknown countries
peppy Jul 16, 2022
100c53f
`Country` -> `CountryCode`
frenzibyte Jul 18, 2022
ef6e16b
`UserCountry` -> `Country`
frenzibyte Jul 18, 2022
05d692b
Move `Country` to end of class
frenzibyte Jul 18, 2022
cf99849
`CountryCode.XX` -> `CountryCode.Unknown`
frenzibyte Jul 18, 2022
018da74
Replace `default` with `CountryCode.Unknown`
frenzibyte Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions osu.Game.Tests/Visual/Online/TestSceneFriendDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void TestOnline()
Id = 3103765,
IsOnline = true,
Statistics = new UserStatistics { GlobalRank = 1111 },
Country = new Country { FlagName = "JP" },
CountryCode = CountryCode.JP,
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
},
new APIUser
Expand All @@ -64,7 +64,7 @@ public void TestOnline()
Id = 2,
IsOnline = false,
Statistics = new UserStatistics { GlobalRank = 2222 },
Country = new Country { FlagName = "AU" },
CountryCode = CountryCode.AU,
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
IsSupporter = true,
SupportLevel = 3,
Expand All @@ -73,7 +73,7 @@ public void TestOnline()
{
Username = "Evast",
Id = 8195163,
Country = new Country { FlagName = "BY" },
CountryCode = CountryCode.BY,
CoverUrl = "https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
IsOnline = false,
LastVisit = DateTimeOffset.Now
Expand Down
18 changes: 5 additions & 13 deletions osu.Game.Tests/Visual/Online/TestSceneRankingsCountryFilter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class TestSceneRankingsCountryFilter : OsuTestScene

public TestSceneRankingsCountryFilter()
{
var countryBindable = new Bindable<Country>();
var countryBindable = new Bindable<CountryCode>();

AddRange(new Drawable[]
{
Expand Down Expand Up @@ -56,20 +56,12 @@ public TestSceneRankingsCountryFilter()
}
});

var country = new Country
{
FlagName = "BY",
FullName = "Belarus"
};
var unknownCountry = new Country
{
FlagName = "CK",
FullName = "Cook Islands"
};
const CountryCode country = CountryCode.BY;
const CountryCode unknown_country = CountryCode.CK;

AddStep("Set country", () => countryBindable.Value = country);
AddStep("Set null country", () => countryBindable.Value = null);
AddStep("Set country with no flag", () => countryBindable.Value = unknownCountry);
AddStep("Set default country", () => countryBindable.Value = default);
AddStep("Set country with no flag", () => countryBindable.Value = unknown_country);
}
}
}
17 changes: 4 additions & 13 deletions osu.Game.Tests/Visual/Online/TestSceneRankingsHeader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class TestSceneRankingsHeader : OsuTestScene

public TestSceneRankingsHeader()
{
var countryBindable = new Bindable<Country>();
var countryBindable = new Bindable<CountryCode>();
var ruleset = new Bindable<RulesetInfo>();
var scope = new Bindable<RankingsScope>();

Expand All @@ -30,21 +30,12 @@ public TestSceneRankingsHeader()
Ruleset = { BindTarget = ruleset }
});

var country = new Country
{
FlagName = "BY",
FullName = "Belarus"
};

var unknownCountry = new Country
{
FlagName = "CK",
FullName = "Cook Islands"
};
const CountryCode country = CountryCode.BY;
const CountryCode unknown_country = CountryCode.CK;

AddStep("Set country", () => countryBindable.Value = country);
AddStep("Set scope to Score", () => scope.Value = RankingsScope.Score);
AddStep("Set country with no flag", () => countryBindable.Value = unknownCountry);
AddStep("Set country with no flag", () => countryBindable.Value = unknown_country);
}
}
}
16 changes: 5 additions & 11 deletions osu.Game.Tests/Visual/Online/TestSceneRankingsOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class TestSceneRankingsOverlay : OsuTestScene

private TestRankingsOverlay rankingsOverlay;

private readonly Bindable<Country> countryBindable = new Bindable<Country>();
private readonly Bindable<CountryCode> countryBindable = new Bindable<CountryCode>();
private readonly Bindable<RankingsScope> scope = new Bindable<RankingsScope>();

[SetUp]
Expand All @@ -48,15 +48,15 @@ public void TestParentRulesetDecoupledAfterInitialShow()
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 country is default", () => countryBindable.IsDefault);
AddStep("Set country", () => countryBindable.Value = CountryCode.US);
AddAssert("Check scope is Performance", () => scope.Value == RankingsScope.Performance);
}

[Test]
public void TestShowCountry()
{
AddStep("Show US", () => rankingsOverlay.ShowCountry(us_country));
AddStep("Show US", () => rankingsOverlay.ShowCountry(CountryCode.US));
}

private void loadRankingsOverlay()
Expand All @@ -69,15 +69,9 @@ private void loadRankingsOverlay()
};
}

private static readonly Country us_country = new Country
{
FlagName = "US",
FullName = "United States"
};

private class TestRankingsOverlay : RankingsOverlay
{
public new Bindable<Country> Country => base.Country;
public new Bindable<CountryCode> Country => base.Country;
}
}
}
12 changes: 5 additions & 7 deletions osu.Game.Tests/Visual/Online/TestSceneRankingsTables.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,15 @@ private void createCountryTable()
{
new CountryStatistics
{
Country = new Country { FlagName = "US", FullName = "United States" },
FlagName = "US",
Code = CountryCode.US,
ActiveUsers = 2_972_623,
PlayCount = 3_086_515_743,
RankedScore = 449_407_643_332_546,
Performance = 371_974_024
},
new CountryStatistics
{
Country = new Country { FlagName = "RU", FullName = "Russian Federation" },
FlagName = "RU",
Code = CountryCode.RU,
ActiveUsers = 1_609_989,
PlayCount = 1_637_052_841,
RankedScore = 221_660_827_473_004,
Expand All @@ -86,7 +84,7 @@ private void createCountryTable()
User = new APIUser
{
Username = "first active user",
Country = new Country { FlagName = "JP" },
CountryCode = CountryCode.JP,
Active = true,
},
Accuracy = 0.9972,
Expand All @@ -106,7 +104,7 @@ private void createCountryTable()
User = new APIUser
{
Username = "inactive user",
Country = new Country { FlagName = "AU" },
CountryCode = CountryCode.AU,
Active = false,
},
Accuracy = 0.9831,
Expand All @@ -126,7 +124,7 @@ private void createCountryTable()
User = new APIUser
{
Username = "second active user",
Country = new Country { FlagName = "PL" },
CountryCode = CountryCode.PL,
Active = true,
},
Accuracy = 0.9584,
Expand Down
36 changes: 6 additions & 30 deletions osu.Game.Tests/Visual/Online/TestSceneScoresContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,7 @@ private APIScoresCollection createScores()
{
Id = 6602580,
Username = @"waaiiru",
Country = new Country
{
FullName = @"Spain",
FlagName = @"ES",
},
CountryCode = CountryCode.ES,
},
Mods = new[]
{
Expand All @@ -184,11 +180,7 @@ private APIScoresCollection createScores()
{
Id = 4608074,
Username = @"Skycries",
Country = new Country
{
FullName = @"Brazil",
FlagName = @"BR",
},
CountryCode = CountryCode.BR,
},
Mods = new[]
{
Expand All @@ -210,11 +202,7 @@ private APIScoresCollection createScores()
{
Id = 1014222,
Username = @"eLy",
Country = new Country
{
FullName = @"Japan",
FlagName = @"JP",
},
CountryCode = CountryCode.JP,
},
Mods = new[]
{
Expand All @@ -235,11 +223,7 @@ private APIScoresCollection createScores()
{
Id = 1541390,
Username = @"Toukai",
Country = new Country
{
FullName = @"Canada",
FlagName = @"CA",
},
CountryCode = CountryCode.CA,
},
Mods = new[]
{
Expand All @@ -259,11 +243,7 @@ private APIScoresCollection createScores()
{
Id = 7151382,
Username = @"Mayuri Hana",
Country = new Country
{
FullName = @"Thailand",
FlagName = @"TH",
},
CountryCode = CountryCode.TH,
},
Rank = ScoreRank.D,
PP = 160,
Expand Down Expand Up @@ -302,11 +282,7 @@ private APIScoresCollection createScores()
{
Id = 7151382,
Username = @"Mayuri Hana",
Country = new Country
{
FullName = @"Thailand",
FlagName = @"TH",
},
CountryCode = CountryCode.TH,
},
Rank = ScoreRank.D,
PP = 160,
Expand Down
6 changes: 3 additions & 3 deletions osu.Game.Tests/Visual/Online/TestSceneUserPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@ public void SetUp() => Schedule(() =>
{
Username = @"flyte",
Id = 3103765,
Country = new Country { FlagName = @"JP" },
CountryCode = CountryCode.JP,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg",
Status = { Value = new UserStatusOnline() }
}) { Width = 300 },
boundPanel1 = new UserGridPanel(new APIUser
{
Username = @"peppy",
Id = 2,
Country = new Country { FlagName = @"AU" },
CountryCode = CountryCode.AU,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg",
IsSupporter = true,
SupportLevel = 3,
Expand All @@ -77,7 +77,7 @@ public void SetUp() => Schedule(() =>
{
Username = @"Evast",
Id = 8195163,
Country = new Country { FlagName = @"BY" },
CountryCode = CountryCode.BY,
CoverUrl = @"https://assets.ppy.sh/user-profile-covers/8195163/4a8e2ad5a02a2642b631438cfa6c6bd7e2f9db289be881cb27df18331f64144c.jpeg",
IsOnline = false,
LastVisit = DateTimeOffset.Now
Expand Down
8 changes: 4 additions & 4 deletions osu.Game.Tests/Visual/Online/TestSceneUserProfileOverlay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class TestSceneUserProfileOverlay : OsuTestScene
{
Username = @"Somebody",
Id = 1,
Country = new Country { FullName = @"Alien" },
CountryCode = CountryCode.Unknown,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c1.jpg",
JoinDate = DateTimeOffset.Now.AddDays(-1),
LastVisit = DateTimeOffset.Now,
Expand Down Expand Up @@ -82,15 +82,15 @@ protected override void LoadComplete()
Username = @"peppy",
Id = 2,
IsSupporter = true,
Country = new Country { FullName = @"Australia", FlagName = @"AU" },
CountryCode = CountryCode.AU,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c3.jpg"
}));

AddStep("Show flyte", () => profile.ShowUser(new APIUser
{
Username = @"flyte",
Id = 3103765,
Country = new Country { FullName = @"Japan", FlagName = @"JP" },
CountryCode = CountryCode.JP,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
}));

Expand All @@ -99,7 +99,7 @@ protected override void LoadComplete()
Username = @"BanchoBot",
Id = 3,
IsBot = true,
Country = new Country { FullName = @"Saint Helena", FlagName = @"SH" },
CountryCode = CountryCode.SH,
CoverUrl = @"https://osu.ppy.sh/images/headers/profile-covers/c4.jpg"
}));

Expand Down
Loading