h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 16:47:24 +08:00
Code Issues Releases Wiki Activity

Merge pull request #181 from peppy/general-fixes

Browse Source 
Fix unit tests failing.
This commit is contained in:
Dean Herbert 2016-11-22 12:30:49 +09:00 committed by GitHub
commit caf7199857
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
View File

@ -35,29 +35,31 @@ namespace osu.Game.Tests.Beatmaps.IO
public void TestImportWhenClosed()
{
//unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
HeadlessGameHost host = new HeadlessGameHost();
var osu = loadOsu(host);
osu.Dependencies.Get<BeatmapDatabase>().Import(osz_path);
ensureLoaded(osu);
using (HeadlessGameHost host = new HeadlessGameHost())
{
var osu = loadOsu(host);
osu.Dependencies.Get<BeatmapDatabase>().Import(osz_path);
ensureLoaded(osu);
}
}
[Test]
public void TestImportOverIPC()
{
HeadlessGameHost host = new HeadlessGameHost("host", true);
HeadlessGameHost client = new HeadlessGameHost("client", true);
using (HeadlessGameHost host = new HeadlessGameHost("host", true))
using (HeadlessGameHost client = new HeadlessGameHost("client", true))
{
Assert.IsTrue(host.IsPrimaryInstance);
Assert.IsTrue(!client.IsPrimaryInstance);
Assert.IsTrue(host.IsPrimaryInstance);
Assert.IsTrue(!client.IsPrimaryInstance);
var osu = loadOsu(host);
var osu = loadOsu(host);
var importer = new BeatmapImporter(client);
if (!importer.Import(osz_path).Wait(1000))
Assert.Fail(@"IPC took too long to send");
var importer = new BeatmapImporter(client);
if (!importer.Import(osz_path).Wait(1000))
Assert.Fail(@"IPC took too long to send");
ensureLoaded(osu, 10000);
ensureLoaded(osu, 10000);
}
}
private OsuGameBase loadOsu(BasicGameHost host)

7
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -89,6 +89,12 @@ namespace osu.Game.Beatmaps
set { lock (trackLock) track = value; }
}
~WorkingBeatmap()
{
Dispose(false);
}
public WorkingBeatmap(Beatmap beatmap)
{
this.beatmap = beatmap;
@ -116,6 +122,7 @@ namespace osu.Game.Beatmaps
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);
}
public void TransferTo(WorkingBeatmap working)