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

Use dummyAPI and move load check into MusicController

Browse Source
This commit is contained in:
David Zhao 2019-08-01 14:19:45 +09:00
parent 351b6e6259
commit d05b9b1734
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Tests/Visual/Menus/TestSceneScreenNavigation.cs
View File

@ -8,11 +8,11 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Framework.Testing;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API;
using osu.Game.Overlays;
using osu.Game.Overlays.Mods;
using osu.Game.Screens;
@ -111,6 +111,7 @@ namespace osu.Game.Tests.Visual.Menus
[Test]
public void TestOpenOptionsAndExitWithEscape()
{
AddUntilStep("Wait for options to load", () => osuGame.Settings.IsLoaded);
AddStep("Enter menu", () => pressAndRelease(Key.Enter));
AddStep("Move mouse to options overlay", () => InputManager.MoveMouseTo(optionsButtonPosition));
AddStep("Click options overlay", () => InputManager.Click(MouseButton.Left));
@ -122,13 +123,7 @@ namespace osu.Game.Tests.Visual.Menus
private void pushAndConfirm(Func<Screen> newScreen, string screenName)
{
Screen screen = null;
AddStep($"Push new {screenName}", () =>
{
if (screenName == "song select")
Logger.Log("fuck");
osuGame.ScreenStack.Push(screen = newScreen());
});
AddStep($"Push new {screenName}", () => osuGame.ScreenStack.Push(screen = newScreen()));
AddUntilStep($"Wait for new {screenName}", () => osuGame.ScreenStack.CurrentScreen == screen && screen.IsLoaded);
}
@ -160,6 +155,21 @@ namespace osu.Game.Tests.Visual.Menus
public new SettingsPanel Settings => base.Settings;
protected override Loader CreateLoader() => new TestLoader();
private DependencyContainer dependencies;
private DummyAPIAccess dummyAPI;
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent) =>
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
protected override void LoadComplete()
{
base.LoadComplete();
dependencies.CacheAs<IAPIProvider>(dummyAPI = new DummyAPIAccess());
dummyAPI.Login("Rhythm Champion", "osu!");
}
}
private class TestSongSelect : PlaySongSelect

2
osu.Game/OsuGame.cs
View File

@ -318,7 +318,7 @@ namespace osu.Game
private void currentTrackCompleted()
{
if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled && musicController.IsLoaded)
if (!Beatmap.Value.Track.Looping && !Beatmap.Disabled)
musicController.NextTrack();
}

4
osu.Game/Overlays/MusicController.cs
View File

@ -316,6 +316,10 @@ namespace osu.Game.Overlays
private void next(bool instant = false)
{
// beatmapSets doesn't get populated until loading has completed.
if (!IsLoaded)
return;
if (!instant)
queuedDirection = TransformDirection.Next;

2
osu.Game/Screens/Multi/Multiplayer.cs
View File

@ -168,7 +168,7 @@ namespace osu.Game.Screens.Multi
public void APIStateChanged(IAPIProvider api, APIState state)
{
if (RequireOnline && state != APIState.Online)
if (state != APIState.Online)
forcefullyExit();
}