Merge branch 'master' into fix-out-of-order-events-on-block-fail

This commit is contained in:
Dean Herbert
2022-01-26 15:21:10 +09:00
48 changed files with 321 additions and 237 deletions

View File

@ -43,7 +43,7 @@ namespace osu.Game.Tests.Database
using (var importer = new BeatmapModelManager(realm, storage))
using (new RulesetStore(realm, storage))
{
ILive<BeatmapSetInfo>? beatmapSet;
Live<BeatmapSetInfo>? beatmapSet;
using (var reader = new ZipArchiveReader(TestResources.GetTestBeatmapStream()))
beatmapSet = await importer.Import(reader);
@ -87,7 +87,7 @@ namespace osu.Game.Tests.Database
using (var importer = new BeatmapModelManager(realm, storage))
using (new RulesetStore(realm, storage))
{
ILive<BeatmapSetInfo>? beatmapSet;
Live<BeatmapSetInfo>? beatmapSet;
using (var reader = new ZipArchiveReader(TestResources.GetTestBeatmapStream()))
beatmapSet = await importer.Import(reader);
@ -144,7 +144,7 @@ namespace osu.Game.Tests.Database
using (var importer = new BeatmapModelManager(realm, storage))
using (new RulesetStore(realm, storage))
{
ILive<BeatmapSetInfo>? imported;
Live<BeatmapSetInfo>? imported;
using (var reader = new ZipArchiveReader(TestResources.GetTestBeatmapStream()))
imported = await importer.Import(reader);
@ -219,7 +219,7 @@ namespace osu.Game.Tests.Database
string? tempPath = TestResources.GetTestBeatmapForImport();
ILive<BeatmapSetInfo>? importedSet;
Live<BeatmapSetInfo>? importedSet;
using (var stream = File.OpenRead(tempPath))
{
@ -685,7 +685,7 @@ namespace osu.Game.Tests.Database
[Test]
public void TestImportWithDuplicateBeatmapIDs()
{
RunTestWithRealmAsync(async (realm, storage) =>
RunTestWithRealm((realm, storage) =>
{
using var importer = new BeatmapModelManager(realm, storage);
using var store = new RulesetStore(realm, storage);
@ -718,7 +718,7 @@ namespace osu.Game.Tests.Database
}
};
var imported = await importer.Import(toImport);
var imported = importer.Import(toImport);
Assert.NotNull(imported);
Debug.Assert(imported != null);

View File

@ -23,9 +23,9 @@ namespace osu.Game.Tests.Database
{
RunTestWithRealm((realm, _) =>
{
ILive<BeatmapInfo> beatmap = realm.Run(r => r.Write(_ => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))).ToLive(realm));
Live<BeatmapInfo> beatmap = realm.Run(r => r.Write(_ => r.Add(new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata()))).ToLive(realm));
ILive<BeatmapInfo> beatmap2 = realm.Run(r => r.All<BeatmapInfo>().First().ToLive(realm));
Live<BeatmapInfo> beatmap2 = realm.Run(r => r.All<BeatmapInfo>().First().ToLive(realm));
Assert.AreEqual(beatmap, beatmap2);
});
@ -38,7 +38,7 @@ namespace osu.Game.Tests.Database
{
var beatmap = new BeatmapInfo(CreateRuleset(), new BeatmapDifficulty(), new BeatmapMetadata());
ILive<BeatmapInfo>? liveBeatmap = null;
Live<BeatmapInfo>? liveBeatmap = null;
realm.Run(r =>
{
@ -100,7 +100,7 @@ namespace osu.Game.Tests.Database
{
RunTestWithRealm((realm, _) =>
{
ILive<BeatmapInfo>? liveBeatmap = null;
Live<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() =>
{
realm.Run(threadContext =>
@ -129,7 +129,7 @@ namespace osu.Game.Tests.Database
{
RunTestWithRealm((realm, _) =>
{
ILive<BeatmapInfo>? liveBeatmap = null;
Live<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() =>
{
realm.Run(threadContext =>
@ -170,7 +170,7 @@ namespace osu.Game.Tests.Database
{
RunTestWithRealm((realm, _) =>
{
ILive<BeatmapInfo>? liveBeatmap = null;
Live<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() =>
{
@ -209,7 +209,7 @@ namespace osu.Game.Tests.Database
{
RunTestWithRealm((realm, _) =>
{
ILive<BeatmapInfo>? liveBeatmap = null;
Live<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() =>
{
realm.Run(threadContext =>
@ -242,7 +242,7 @@ namespace osu.Game.Tests.Database
realm.RegisterCustomSubscription(outerRealm =>
{
outerRealm.All<BeatmapInfo>().QueryAsyncWithNotifications(gotChange);
ILive<BeatmapInfo>? liveBeatmap = null;
Live<BeatmapInfo>? liveBeatmap = null;
Task.Factory.StartNew(() =>
{