h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 18:52:55 +08:00
Code Issues Releases Wiki Activity

Fix up dependencies class names

Browse Source
This commit is contained in:
smoogipoo 2021-06-25 20:11:38 +09:00
parent 57f2b4f812
commit 1ed61b9b98
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerGameplayLeaderboard.cs
View File

@ -98,9 +98,9 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised)); AddStep("change to standardised", () => config.SetValue(OsuSetting.ScoreDisplayMode, ScoringMode.Standardised));
} }
protected override OnlinePlayTestDependencies CreateOnlinePlayDependencies() => new TestDependencies(); protected override OnlinePlayTestSceneDependencies CreateOnlinePlayDependencies() => new TestDependencies();
protected class TestDependencies : MultiplayerRoomTestDependencies protected class TestDependencies : MultiplayerTestSceneDependencies
{ {
protected override TestSpectatorClient CreateSpectatorClient() => new TestMultiplayerSpectatorClient(); protected override TestSpectatorClient CreateSpectatorClient() => new TestMultiplayerSpectatorClient();
} }

4
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerRoomManager.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
[HeadlessTest] [HeadlessTest]
public class TestSceneMultiplayerRoomManager : MultiplayerTestScene public class TestSceneMultiplayerRoomManager : MultiplayerTestScene
{ {
protected override OnlinePlayTestDependencies CreateOnlinePlayDependencies() => new TestDependencies(); protected override OnlinePlayTestSceneDependencies CreateOnlinePlayDependencies() => new TestDependencies();
public TestSceneMultiplayerRoomManager() public TestSceneMultiplayerRoomManager()
: base(false) : base(false)
@ -144,7 +144,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
return room; return room;
} }
private class TestDependencies : MultiplayerRoomTestDependencies private class TestDependencies : MultiplayerTestSceneDependencies
{ {
public TestDependencies() public TestDependencies()
{ {

4
osu.Game.Tests/Visual/Playlists/TestScenePlaylistsMatchSettingsOverlay.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Tests.Visual.Playlists
private TestRoomSettings settings; private TestRoomSettings settings;
protected override OnlinePlayTestDependencies CreateOnlinePlayDependencies() => new TestDependencies(); protected override OnlinePlayTestSceneDependencies CreateOnlinePlayDependencies() => new TestDependencies();
[SetUp] [SetUp]
public new void Setup() => Schedule(() => public new void Setup() => Schedule(() =>
@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Playlists
public OsuSpriteText ErrorText => ((MatchSettings)Settings).ErrorText; public OsuSpriteText ErrorText => ((MatchSettings)Settings).ErrorText;
} }
private class TestDependencies : OnlinePlayTestDependencies private class TestDependencies : OnlinePlayTestSceneDependencies
{ {
protected override IRoomManager CreateRoomManager() => new TestRoomManager(); protected override IRoomManager CreateRoomManager() => new TestRoomManager();
} }

4
osu.Game/Tests/Visual/Multiplayer/MultiplayerTestScene.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
public TestUserLookupCache LookupCache => OnlinePlayDependencies?.LookupCache; public TestUserLookupCache LookupCache => OnlinePlayDependencies?.LookupCache;
public TestSpectatorClient SpectatorClient => OnlinePlayDependencies?.SpectatorClient; public TestSpectatorClient SpectatorClient => OnlinePlayDependencies?.SpectatorClient;
protected new MultiplayerRoomTestDependencies OnlinePlayDependencies => (MultiplayerRoomTestDependencies)base.OnlinePlayDependencies; protected new MultiplayerTestSceneDependencies OnlinePlayDependencies => (MultiplayerTestSceneDependencies)base.OnlinePlayDependencies;
private readonly bool joinRoom; private readonly bool joinRoom;
@ -62,6 +62,6 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddUntilStep("wait for room join", () => Client.Room != null); AddUntilStep("wait for room join", () => Client.Room != null);
} }
protected override OnlinePlayTestDependencies CreateOnlinePlayDependencies() => new MultiplayerRoomTestDependencies(); protected override OnlinePlayTestSceneDependencies CreateOnlinePlayDependencies() => new MultiplayerTestSceneDependencies();
} }
} }

4
osu.Game/Tests/Visual/Multiplayer/MultiplayerRoomTestDependencies.cs → osu.Game/Tests/Visual/Multiplayer/MultiplayerTestSceneDependencies.cs
View File

@ -13,14 +13,14 @@ namespace osu.Game.Tests.Visual.Multiplayer
/// <summary> /// <summary>
/// Contains the basic dependencies of multiplayer test scenes. /// Contains the basic dependencies of multiplayer test scenes.
/// </summary> /// </summary>
public class MultiplayerRoomTestDependencies : OnlinePlayTestDependencies, IMultiplayerTestDependencies public class MultiplayerTestSceneDependencies : OnlinePlayTestSceneDependencies, IMultiplayerTestDependencies
{ {
public TestMultiplayerClient Client { get; } public TestMultiplayerClient Client { get; }
public TestUserLookupCache LookupCache { get; } public TestUserLookupCache LookupCache { get; }
public TestSpectatorClient SpectatorClient { get; } public TestSpectatorClient SpectatorClient { get; }
public new TestMultiplayerRoomManager RoomManager => (TestMultiplayerRoomManager)base.RoomManager; public new TestMultiplayerRoomManager RoomManager => (TestMultiplayerRoomManager)base.RoomManager;
public MultiplayerRoomTestDependencies() public MultiplayerTestSceneDependencies()
{ {
Client = new TestMultiplayerClient(RoomManager); Client = new TestMultiplayerClient(RoomManager);
LookupCache = new TestUserLookupCache(); LookupCache = new TestUserLookupCache();

6
osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestScene.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
/// <summary> /// <summary>
/// All dependencies required for online play components and screens. /// All dependencies required for online play components and screens.
/// </summary> /// </summary>
protected OnlinePlayTestDependencies OnlinePlayDependencies => dependencies?.OnlinePlayDependencies; protected OnlinePlayTestSceneDependencies OnlinePlayDependencies => dependencies?.OnlinePlayDependencies;
private DelegatedDependencyContainer dependencies; private DelegatedDependencyContainer dependencies;
@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
/// <remarks> /// <remarks>
/// Any custom dependencies required for online play sub-classes should be added here. /// Any custom dependencies required for online play sub-classes should be added here.
/// </remarks> /// </remarks>
protected virtual OnlinePlayTestDependencies CreateOnlinePlayDependencies() => new OnlinePlayTestDependencies(); protected virtual OnlinePlayTestSceneDependencies CreateOnlinePlayDependencies() => new OnlinePlayTestSceneDependencies();
/// <summary> /// <summary>
/// A <see cref="IReadOnlyDependencyContainer"/> providing a mutable lookup source for online play dependencies. /// A <see cref="IReadOnlyDependencyContainer"/> providing a mutable lookup source for online play dependencies.
@ -75,7 +75,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
/// <summary> /// <summary>
/// The online play dependencies. /// The online play dependencies.
/// </summary> /// </summary>
public OnlinePlayTestDependencies OnlinePlayDependencies { get; set; } public OnlinePlayTestSceneDependencies OnlinePlayDependencies { get; set; }
private readonly IReadOnlyDependencyContainer parent; private readonly IReadOnlyDependencyContainer parent;
private readonly DependencyContainer injectableDependencies; private readonly DependencyContainer injectableDependencies;

4
osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestDependencies.cs → osu.Game/Tests/Visual/OnlinePlay/OnlinePlayTestSceneDependencies.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
/// <summary> /// <summary>
/// Contains the basic dependencies of online play test scenes. /// Contains the basic dependencies of online play test scenes.
/// </summary> /// </summary>
public class OnlinePlayTestDependencies : IReadOnlyDependencyContainer, IOnlinePlayTestDependencies public class OnlinePlayTestSceneDependencies : IReadOnlyDependencyContainer, IOnlinePlayTestDependencies
{ {
public Bindable<Room> SelectedRoom { get; } public Bindable<Room> SelectedRoom { get; }
public IRoomManager RoomManager { get; } public IRoomManager RoomManager { get; }
@ -31,7 +31,7 @@ namespace osu.Game.Tests.Visual.OnlinePlay
private readonly List<Drawable> drawableComponents = new List<Drawable>(); private readonly List<Drawable> drawableComponents = new List<Drawable>();
private readonly DependencyContainer dependencies; private readonly DependencyContainer dependencies;
public OnlinePlayTestDependencies() public OnlinePlayTestSceneDependencies()
{ {
SelectedRoom = new Bindable<Room>(); SelectedRoom = new Bindable<Room>();
RoomManager = CreateRoomManager(); RoomManager = CreateRoomManager();