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

Update tests to use correct parameters of CleanRunGameHost

Browse Source
This commit is contained in:
Dean Herbert
2020-10-19 15:34:46 +09:00
parent 7ed862edd7
commit 9c566e7ffb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game.Tournament.Tests/NonVisual/CustomTourneyDirectoryTest.cs
View File

@ -20,14 +20,14 @@ namespace osu.Game.Tournament.Tests.NonVisual
[Test] [Test]
public void TestDefaultDirectory() public void TestDefaultDirectory()
{ {
using (HeadlessGameHost host = new CleanRunHeadlessGameHost(nameof(TestDefaultDirectory))) using (HeadlessGameHost host = new CleanRunHeadlessGameHost())
{ {
try try
{ {
var osu = loadOsu(host); var osu = loadOsu(host);
var storage = osu.Dependencies.Get<Storage>(); var storage = osu.Dependencies.Get<Storage>();
var defaultStorage = Path.Combine(tournamentBasePath(nameof(TestDefaultDirectory)), "default");
Assert.That(storage.GetFullPath("."), Is.EqualTo(defaultStorage)); Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(host.Storage.GetFullPath("."), "tournaments", "default")));
} }
finally finally
{ {
@ -39,7 +39,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
[Test] [Test]
public void TestCustomDirectory() public void TestCustomDirectory()
{ {
using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestCustomDirectory))) using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestCustomDirectory))) // don't use clean run as we are writing a config file.
{ {
string osuDesktopStorage = basePath(nameof(TestCustomDirectory)); string osuDesktopStorage = basePath(nameof(TestCustomDirectory));
const string custom_tournament = "custom"; const string custom_tournament = "custom";
@ -58,7 +58,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
storage = osu.Dependencies.Get<Storage>(); storage = osu.Dependencies.Get<Storage>();
Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(tournamentBasePath(nameof(TestCustomDirectory)), custom_tournament))); Assert.That(storage.GetFullPath("."), Is.EqualTo(Path.Combine(host.Storage.GetFullPath("."), "tournaments", custom_tournament)));
} }
finally finally
{ {
@ -70,7 +70,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
[Test] [Test]
public void TestMigration() public void TestMigration()
{ {
using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration))) using (HeadlessGameHost host = new HeadlessGameHost(nameof(TestMigration))) // don't use clean run as we are writing test files for migration.
{ {
string osuRoot = basePath(nameof(TestMigration)); string osuRoot = basePath(nameof(TestMigration));
string configFile = Path.Combine(osuRoot, "tournament.ini"); string configFile = Path.Combine(osuRoot, "tournament.ini");
@ -115,7 +115,7 @@ namespace osu.Game.Tournament.Tests.NonVisual
var storage = osu.Dependencies.Get<Storage>(); var storage = osu.Dependencies.Get<Storage>();
var migratedPath = Path.Combine(tournamentBasePath(nameof(TestMigration)), "default"); string migratedPath = Path.Combine(host.Storage.GetFullPath("."), "tournaments", "default");
videosPath = Path.Combine(migratedPath, "videos"); videosPath = Path.Combine(migratedPath, "videos");
modsPath = Path.Combine(migratedPath, "mods"); modsPath = Path.Combine(migratedPath, "mods");
@ -165,7 +165,5 @@ namespace osu.Game.Tournament.Tests.NonVisual
} }
private string basePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance); private string basePath(string testInstance) => Path.Combine(RuntimeInfo.StartupDirectory, "headless", testInstance);
private string tournamentBasePath(string testInstance) => Path.Combine(basePath(testInstance), "tournaments");
} }
} }