sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 08:49:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect DI usage of IAPIProvider in many tests

Browse Source
This commit is contained in:
Dean Herbert
2019-09-13 17:15:33 +09:00
parent 0231984127
commit 7cb79dd760
14 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Tests/Visual/OsuTestScene.cs
View File

@ -46,13 +46,27 @@ namespace osu.Game.Tests.Visual
protected Storage LocalStorage => localStorage.Value;
private readonly Lazy<DatabaseContextFactory> contextFactory;
protected IAPIProvider API
{
get
{
if (UseOnlineAPI)
throw new Exception("Using the OsuTestScene dummy API is not supported when UseOnlineAPI is true");
return dummyAPI;
}
}
private DummyAPIAccess dummyAPI;
protected DatabaseContextFactory ContextFactory => contextFactory.Value;
/// <summary>
/// Whether this test scene requires API access
/// Setting this will cache an actual <see cref="APIAccess"/>.
/// Whether this test scene requires real-world API access.
/// If true, this will bypass the local <see cref="dummyAPI"/> and use the <see cref="OsuGameBase"/> provided one.
/// </summary>
protected virtual bool RequiresAPIAccess => false;
protected virtual bool UseOnlineAPI => false;
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
@ -66,10 +80,9 @@ namespace osu.Game.Tests.Visual
Dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
if (!RequiresAPIAccess)
if (!UseOnlineAPI)
{
var dummyAPI = new DummyAPIAccess();
dummyAPI = new DummyAPIAccess();
Dependencies.CacheAs<IAPIProvider>(dummyAPI);
Add(dummyAPI);
}