Skip to content

Commit c362779

Browse files
peppypeppy
committed
Rename everything
1 parent fc28241 commit c362779

File tree

79 files changed

+3088
-3060
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3088
-3060
lines changed

‎osu.Game.Tests/Visual/DailyChallenge/TestSceneDailyChallenge.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using osu.Game.Overlays;
1616
using osu.Game.Overlays.Notifications;
1717
using osu.Game.Rulesets.Osu.Mods;
18-
using osu.Game.Screens.SelectV2.Leaderboards;
18+
using osu.Game.Screens.SelectV2;
1919
using osu.Game.Tests.Resources;
2020
using osu.Game.Tests.Visual.Metadata;
2121
using osu.Game.Tests.Visual.OnlinePlay;
@@ -85,7 +85,7 @@ public void TestUseTheseModsUnavailableIfNoFreeMods()
8585
AddStep("force transforms to finish", () => FinishTransforms(true));
8686
AddStep("right click second score", () =>
8787
{
88-
InputManager.MoveMouseTo(this.ChildrenOfType<LeaderboardScoreV2>().ElementAt(1));
88+
InputManager.MoveMouseTo(this.ChildrenOfType<BeatmapLeaderboardScore>().ElementAt(1));
8989
InputManager.Click(MouseButton.Right);
9090
});
9191
AddAssert("use these mods not present",

‎osu.Game.Tests/Visual/SongSelect/BeatmapCarouselV2TestScene.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
using osu.Game.Beatmaps;
1717
using osu.Game.Database;
1818
using osu.Game.Graphics;
19+
using osu.Game.Graphics.Carousel;
1920
using osu.Game.Graphics.Containers;
2021
using osu.Game.Overlays;
2122
using osu.Game.Screens.Select;
@@ -191,7 +192,7 @@ protected void ClickVisiblePanel<T>(int index)
191192
.Where(p => ((ICarouselPanel)p).Item?.IsVisible == true)
192193
.OrderBy(p => p.Y)
193194
.ElementAt(index)
194-
.ChildrenOfType<PanelBase>().Single()
195+
.ChildrenOfType<Panel>().Single()
195196
.TriggerClick();
196197
});
197198
}

‎osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2DifficultyGrouping.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using NUnit.Framework;
66
using osu.Framework.Testing;
77
using osu.Game.Beatmaps;
8+
using osu.Game.Graphics.Carousel;
89
using osu.Game.Screens.Select;
910
using osu.Game.Screens.Select.Filter;
1011
using osu.Game.Screens.SelectV2;

‎osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2NoGrouping.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using NUnit.Framework;
66
using osu.Framework.Testing;
77
using osu.Game.Beatmaps;
8+
using osu.Game.Graphics.Carousel;
89
using osu.Game.Screens.Select;
910
using osu.Game.Screens.Select.Filter;
1011
using osu.Game.Screens.SelectV2;

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselV2DifficultyPanel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using osu.Framework.Graphics.Containers;
99
using osu.Framework.Utils;
1010
using osu.Game.Beatmaps;
11+
using osu.Game.Graphics.Carousel;
1112
using osu.Game.Overlays;
1213
using osu.Game.Rulesets.Mania;
1314
using osu.Game.Rulesets.Osu;

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselV2GroupPanel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using osu.Framework.Graphics;
55
using osu.Framework.Graphics.Containers;
6+
using osu.Game.Graphics.Carousel;
67
using osu.Game.Screens.SelectV2;
78
using osu.Game.Tests.Visual.UserInterface;
89
using osuTK;

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselV2SetPanel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using osu.Framework.Graphics.Containers;
99
using osu.Framework.Utils;
1010
using osu.Game.Beatmaps;
11+
using osu.Game.Graphics.Carousel;
1112
using osu.Game.Overlays;
1213
using osu.Game.Screens.SelectV2;
1314
using osu.Game.Tests.Resources;

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapCarouselV2StandalonePanel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using osu.Framework.Graphics.Containers;
99
using osu.Framework.Utils;
1010
using osu.Game.Beatmaps;
11+
using osu.Game.Graphics.Carousel;
1112
using osu.Game.Overlays;
1213
using osu.Game.Rulesets.Mania;
1314
using osu.Game.Rulesets.Osu;

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapFilterControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public void SetUp() => Schedule(() =>
1717
{
1818
RelativeSizeAxes = Axes.X,
1919
AutoSizeAxes = Axes.Y,
20-
Child = new BeatmapFilterControl
20+
Child = new FilterControl
2121
{
2222
State = { Value = Visibility.Visible },
2323
RelativeSizeAxes = Axes.X,

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapRankingsWedge.cs

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
using osu.Game.Scoring;
2727
using osu.Game.Screens.Select.Leaderboards;
2828
using osu.Game.Screens.SelectV2;
29-
using osu.Game.Screens.SelectV2.Leaderboards;
3029
using osu.Game.Tests.Resources;
3130
using osu.Game.Users;
3231
using osuTK.Input;
@@ -38,7 +37,7 @@ public partial class TestSceneBeatmapRankingsWedge : SongSelectComponentsTestSce
3837
[Cached]
3938
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Aquamarine);
4039

41-
private TestBeatmapRankingsWedge rankings = null!;
40+
private TestBeatmapLeaderboardWedge leaderboard = null!;
4241
private ScoreManager scoreManager = null!;
4342
private RulesetStore rulesetStore = null!;
4443
private BeatmapManager beatmapManager = null!;
@@ -82,7 +81,7 @@ public void SetUp() => Schedule(() =>
8281
Children = new Drawable[]
8382
{
8483
dialogOverlay,
85-
rankings = new TestBeatmapRankingsWedge
84+
leaderboard = new TestBeatmapLeaderboardWedge
8685
{
8786
RelativeSizeAxes = Axes.Both,
8887
State = { Value = Visibility.Visible },
@@ -96,8 +95,8 @@ public void TestGlobalScoresDisplay()
9695
{
9796
setScope(BeatmapLeaderboardScope.Global);
9897

99-
AddStep(@"New Scores", () => rankings.SetScores(generateSampleScores(new BeatmapInfo())));
100-
AddStep(@"New Scores with teams", () => rankings.SetScores(generateSampleScores(new BeatmapInfo()).Select(s =>
98+
AddStep(@"New Scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo())));
99+
AddStep(@"New Scores with teams", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()).Select(s =>
101100
{
102101
s.User.Team = new APITeam();
103102
return s;
@@ -119,21 +118,21 @@ public void TestPersonalBestWithNullPosition()
119118
[Test]
120119
public void TestPlaceholderStates()
121120
{
122-
AddStep("ensure no scores displayed", () => rankings.SetScores(Array.Empty<ScoreInfo>()));
123-
124-
AddStep(@"Network failure", () => rankings.SetState(LeaderboardState.NetworkFailure));
125-
AddStep(@"No team", () => rankings.SetState(LeaderboardState.NoTeam));
126-
AddStep(@"No supporter", () => rankings.SetState(LeaderboardState.NotSupporter));
127-
AddStep(@"Not logged in", () => rankings.SetState(LeaderboardState.NotLoggedIn));
128-
AddStep(@"Ruleset unavailable", () => rankings.SetState(LeaderboardState.RulesetUnavailable));
129-
AddStep(@"Beatmap unavailable", () => rankings.SetState(LeaderboardState.BeatmapUnavailable));
130-
AddStep(@"None selected", () => rankings.SetState(LeaderboardState.NoneSelected));
121+
AddStep("ensure no scores displayed", () => leaderboard.SetScores(Array.Empty<ScoreInfo>()));
122+
123+
AddStep(@"Network failure", () => leaderboard.SetState(LeaderboardState.NetworkFailure));
124+
AddStep(@"No team", () => leaderboard.SetState(LeaderboardState.NoTeam));
125+
AddStep(@"No supporter", () => leaderboard.SetState(LeaderboardState.NotSupporter));
126+
AddStep(@"Not logged in", () => leaderboard.SetState(LeaderboardState.NotLoggedIn));
127+
AddStep(@"Ruleset unavailable", () => leaderboard.SetState(LeaderboardState.RulesetUnavailable));
128+
AddStep(@"Beatmap unavailable", () => leaderboard.SetState(LeaderboardState.BeatmapUnavailable));
129+
AddStep(@"None selected", () => leaderboard.SetState(LeaderboardState.NoneSelected));
131130
}
132131

133132
[Test]
134133
public void TestUseTheseModsDoesNotCopySystemMods()
135134
{
136-
AddStep(@"set scores", () => rankings.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
135+
AddStep(@"set scores", () => leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
137136
{
138137
Position = 999,
139138
Rank = ScoreRank.XH,
@@ -149,19 +148,19 @@ public void TestUseTheseModsDoesNotCopySystemMods()
149148
CountryCode = CountryCode.ES,
150149
}
151150
}));
152-
AddUntilStep("wait for scores", () => this.ChildrenOfType<LeaderboardScoreV2>().Count(), () => Is.GreaterThan(0));
151+
AddUntilStep("wait for scores", () => this.ChildrenOfType<BeatmapLeaderboardScore>().Count(), () => Is.GreaterThan(0));
153152
AddStep("right click panel", () =>
154153
{
155-
InputManager.MoveMouseTo(this.ChildrenOfType<LeaderboardScoreV2>().Last());
154+
InputManager.MoveMouseTo(this.ChildrenOfType<BeatmapLeaderboardScore>().Last());
156155
InputManager.Click(MouseButton.Right);
157156
});
158157
AddStep("click use these mods", () =>
159158
{
160159
InputManager.MoveMouseTo(this.ChildrenOfType<DrawableOsuMenuItem>().Last());
161160
InputManager.Click(MouseButton.Left);
162161
});
163-
AddAssert("received HD", () => this.ChildrenOfType<LeaderboardScoreV2>().Last().SelectedMods.Value.Any(m => m is OsuModHidden));
164-
AddAssert("did not receive SV2", () => !this.ChildrenOfType<LeaderboardScoreV2>().Last().SelectedMods.Value.Any(m => m is ModScoreV2));
162+
AddAssert("received HD", () => this.ChildrenOfType<BeatmapLeaderboardScore>().Last().SelectedMods.Value.Any(m => m is OsuModHidden));
163+
AddAssert("did not receive SV2", () => !this.ChildrenOfType<BeatmapLeaderboardScore>().Last().SelectedMods.Value.Any(m => m is ModScoreV2));
165164
}
166165

167166
[Test]
@@ -260,7 +259,7 @@ public void TestLocalScoresDisplayOnBeatmapEdit()
260259

261260
private void showPersonalBestWithNullPosition()
262261
{
263-
rankings.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
262+
leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
264263
{
265264
Rank = ScoreRank.XH,
266265
Accuracy = 1,
@@ -279,7 +278,7 @@ private void showPersonalBestWithNullPosition()
279278

280279
private void showPersonalBest()
281280
{
282-
rankings.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
281+
leaderboard.SetScores(generateSampleScores(new BeatmapInfo()), new ScoreInfo
283282
{
284283
Position = 999,
285284
Rank = ScoreRank.XH,
@@ -299,7 +298,7 @@ private void showPersonalBest()
299298

300299
private void setScope(BeatmapLeaderboardScope scope)
301300
{
302-
AddStep(@"Set scope", () => ((Bindable<BeatmapLeaderboardScope>)rankings.Scope).Value = scope);
301+
AddStep(@"Set scope", () => ((Bindable<BeatmapLeaderboardScope>)leaderboard.Scope).Value = scope);
303302
}
304303

305304
private void importMoreScores(Func<BeatmapInfo> beatmapInfo)
@@ -317,7 +316,7 @@ private void clearScores()
317316
}
318317

319318
private void checkDisplayedCount(int expected) =>
320-
AddUntilStep($"{expected} scores displayed", () => rankings.ChildrenOfType<LeaderboardScoreV2>().Count(), () => Is.EqualTo(expected));
319+
AddUntilStep($"{expected} scores displayed", () => leaderboard.ChildrenOfType<BeatmapLeaderboardScore>().Count(), () => Is.EqualTo(expected));
321320

322321
private void checkStoredCount(int expected) =>
323322
AddUntilStep($"Total scores stored is {expected}", () => Realm.Run(r => r.All<ScoreInfo>().Count(s => !s.DeletePending)), () => Is.EqualTo(expected));
@@ -546,7 +545,7 @@ private static ScoreInfo[] generateSampleScores(BeatmapInfo beatmapInfo)
546545
};
547546
}
548547

549-
private partial class TestBeatmapRankingsWedge : BeatmapRankingsWedge
548+
private partial class TestBeatmapLeaderboardWedge : BeatmapLeaderboardWedge
550549
{
551550
public new void SetState(LeaderboardState state) => base.SetState(state);
552551
public new void SetScores(IEnumerable<ScoreInfo> scores, ScoreInfo? userScore = null) => base.SetScores(scores, userScore);

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapInfoWedge.cs renamed to ‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapTitleWedge.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
namespace osu.Game.Tests.Visual.SongSelectV2
2323
{
24-
public partial class TestSceneBeatmapInfoWedge : SongSelectComponentsTestScene
24+
public partial class TestSceneBeatmapTitleWedge : SongSelectComponentsTestScene
2525
{
2626
private RulesetStore rulesets = null!;
27-
private BeatmapInfoWedge infoWedge = null!;
27+
private BeatmapTitleWedge titleWedge = null!;
2828

2929
[BackgroundDependencyLoader]
3030
private void load(RulesetStore rulesets)
@@ -50,7 +50,7 @@ protected override void LoadComplete()
5050
RelativeSizeAxes = Axes.Both,
5151
Children = new Drawable[]
5252
{
53-
infoWedge = new BeatmapInfoWedge
53+
titleWedge = new BeatmapTitleWedge
5454
{
5555
State = { Value = Visibility.Visible },
5656
},
@@ -60,7 +60,7 @@ protected override void LoadComplete()
6060

6161
AddSliderStep("change star difficulty", 0, 11.9, 4.18, v =>
6262
{
63-
((BindableDouble)infoWedge.ChildrenOfType<WedgeDifficultyDisplay>().Single().DisplayedStars).Value = v;
63+
((BindableDouble)titleWedge.ChildrenOfType<BeatmapTitleWedge.DifficultyDisplay>().Single().DisplayedStars).Value = v;
6464
});
6565
}
6666

@@ -75,11 +75,11 @@ public void TestNullBeatmap()
7575
{
7676
selectBeatmap(null);
7777
// TODO: add back assertions? need to make fields public again.
78-
// AddAssert("check empty version", () => string.IsNullOrEmpty(infoWedge.Info.VersionLabel.Current.Value));
79-
// AddAssert("check default title", () => infoWedge.Info.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
80-
// AddAssert("check default artist", () => infoWedge.Info.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
81-
// AddAssert("check empty author", () => !infoWedge.Info.MapperContainer.ChildrenOfType<OsuSpriteText>().Any());
82-
// AddAssert("check no info labels", () => !infoWedge.Info.ChildrenOfType<BeatmapInfoWedge.WedgeInfoText.InfoLabel>().Any());
78+
// AddAssert("check empty version", () => string.IsNullOrEmpty(titleWedge.Info.VersionLabel.Current.Value));
79+
// AddAssert("check default title", () => titleWedge.Info.TitleLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Title);
80+
// AddAssert("check default artist", () => titleWedge.Info.ArtistLabel.Current.Value == Beatmap.Default.BeatmapInfo.Metadata.Artist);
81+
// AddAssert("check empty author", () => !titleWedge.Info.MapperContainer.ChildrenOfType<OsuSpriteText>().Any());
82+
// AddAssert("check no info labels", () => !titleWedge.Info.ChildrenOfType<BeatmapTitleWedge.WedgeInfoText.InfoLabel>().Any());
8383
}
8484

8585
[Test]
@@ -123,12 +123,12 @@ public void TestRulesetChange()
123123
[Test]
124124
public void TestWedgeVisibility()
125125
{
126-
AddStep("hide", () => { infoWedge.Hide(); });
126+
AddStep("hide", () => { titleWedge.Hide(); });
127127
AddWaitStep("wait for hide", 3);
128-
AddAssert("check visibility", () => infoWedge.Alpha == 0);
129-
AddStep("show", () => { infoWedge.Show(); });
128+
AddAssert("check visibility", () => titleWedge.Alpha == 0);
129+
AddStep("show", () => { titleWedge.Show(); });
130130
AddWaitStep("wait for show", 1);
131-
AddAssert("check visibility", () => infoWedge.Alpha > 0);
131+
AddAssert("check visibility", () => titleWedge.Alpha > 0);
132132
}
133133

134134
[TestCase(120, 125, null, "120-125 (mostly 120)")]
@@ -167,7 +167,7 @@ private void checkDisplayedBPM(string target)
167167
{
168168
AddUntilStep($"displayed bpm is {target}", () =>
169169
{
170-
var label = infoWedge.ChildrenOfType<WedgeStatistic>().Single(l => l.TooltipText == BeatmapsetsStrings.ShowStatsBpm);
170+
var label = titleWedge.ChildrenOfType<BeatmapTitleWedge.Statistic>().Single(l => l.TooltipText == BeatmapsetsStrings.ShowStatsBpm);
171171
return label.Value == target;
172172
});
173173
}

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneBeatmapWedgesArea.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace osu.Game.Tests.Visual.SongSelectV2
1717
{
1818
public partial class TestSceneBeatmapWedgesArea : SongSelectComponentsTestScene
1919
{
20-
private BeatmapWedgesArea wedgesArea = null!;
20+
private BeatmapDetailsArea detailsArea = null!;
2121

2222
[Resolved]
2323
private RulesetStore rulesets { get; set; } = null!;
@@ -37,7 +37,7 @@ public void SetUp() => Schedule(() =>
3737
Padding = new MarginPadding { Top = 20 },
3838
Children = new Drawable[]
3939
{
40-
wedgesArea = new BeatmapWedgesArea
40+
detailsArea = new BeatmapDetailsArea
4141
{
4242
RelativeSizeAxes = Axes.Both,
4343
State = { Value = Visibility.Visible },
@@ -67,12 +67,12 @@ public void TestRulesetChange()
6767
[Test]
6868
public void TestWedgeVisibility()
6969
{
70-
AddStep("hide", () => wedgesArea.Hide());
70+
AddStep("hide", () => detailsArea.Hide());
7171
AddWaitStep("wait for hide", 3);
72-
AddAssert("check visibility", () => wedgesArea.Alpha == 0);
73-
AddStep("show", () => wedgesArea.Show());
72+
AddAssert("check visibility", () => detailsArea.Alpha == 0);
73+
AddStep("show", () => detailsArea.Show());
7474
AddWaitStep("wait for show", 1);
75-
AddAssert("check visibility", () => wedgesArea.Alpha > 0);
75+
AddAssert("check visibility", () => detailsArea.Alpha > 0);
7676
}
7777

7878
[Test]

‎osu.Game.Tests/Visual/SongSelectV2/TestSceneShearedDifficultyRangeSlider.cs renamed to ‎osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyRangeSlider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace osu.Game.Tests.Visual.SongSelectV2
1616
{
17-
public partial class TestSceneShearedDifficultyRangeSlider : ThemeComparisonTestScene
17+
public partial class TestSceneDifficultyRangeSlider : ThemeComparisonTestScene
1818
{
1919
private readonly BindableNumber<double> customStart = new BindableNumber<double>
2020
{
@@ -30,7 +30,7 @@ public partial class TestSceneShearedDifficultyRangeSlider : ThemeComparisonTest
3030
Precision = 0.1f
3131
};
3232

33-
public TestSceneShearedDifficultyRangeSlider()
33+
public TestSceneDifficultyRangeSlider()
3434
: base(false)
3535
{
3636
}
@@ -51,7 +51,7 @@ protected override void LoadComplete()
5151
RelativeSizeAxes = Axes.Both,
5252
Colour = Color4.Black.Opacity(0.5f),
5353
},
54-
new ShearedDifficultyRangeSlider
54+
new FilterControl.DifficultyRangeSlider
5555
{
5656
Width = 600,
5757
Anchor = Anchor.Centre,

0 commit comments

Comments
 (0)