sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 15:16:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Use plain bindable flow instead of binding to watcher directly

Browse Source
This commit is contained in:
Bartłomiej Dach
2022-12-24 10:27:28 +01:00
parent c7f248e13c
commit 4e5109a649
4 changed files with 53 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
osu.Game.Tests/Visual/Ranking/TestSceneOverallRanking.cs
View File

@ -1,10 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Diagnostics;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Online.Solo;
using osu.Game.Scoring;
@ -15,8 +12,7 @@ namespace osu.Game.Tests.Visual.Ranking
{
public partial class TestSceneOverallRanking : OsuTestScene
{
[Cached(typeof(ISoloStatisticsWatcher))]
private MockSoloStatisticsWatcher soloStatisticsWatcher { get; } = new MockSoloStatisticsWatcher();
private OverallRanking overallRanking = null!;
[Test]
public void TestUpdatePending()
@ -28,56 +24,50 @@ namespace osu.Game.Tests.Visual.Ranking
public void TestAllIncreased()
{
createDisplay();
AddStep("trigger update success", () =>
{
soloStatisticsWatcher.TriggerSuccess(
new UserStatistics
{
GlobalRank = 12_345,
Accuracy = 0.9899,
MaxCombo = 2_322,
RankedScore = 23_123_543_456,
TotalScore = 123_123_543_456,
PP = 5_072
},
new UserStatistics
{
GlobalRank = 1_234,
Accuracy = 0.9907,
MaxCombo = 2_352,
RankedScore = 23_124_231_435,
TotalScore = 123_124_231_435,
PP = 5_434
});
});
displayUpdate(
new UserStatistics
{
GlobalRank = 12_345,
Accuracy = 0.9899,
MaxCombo = 2_322,
RankedScore = 23_123_543_456,
TotalScore = 123_123_543_456,
PP = 5_072
},
new UserStatistics
{
GlobalRank = 1_234,
Accuracy = 0.9907,
MaxCombo = 2_352,
RankedScore = 23_124_231_435,
TotalScore = 123_124_231_435,
PP = 5_434
});
}
[Test]
public void TestAllDecreased()
{
createDisplay();
AddStep("trigger update success", () =>
{
soloStatisticsWatcher.TriggerSuccess(
new UserStatistics
{
GlobalRank = 1_234,
Accuracy = 0.9907,
MaxCombo = 2_352,
RankedScore = 23_124_231_435,
TotalScore = 123_124_231_435,
PP = 5_434
},
new UserStatistics
{
GlobalRank = 12_345,
Accuracy = 0.9899,
MaxCombo = 2_322,
RankedScore = 23_123_543_456,
TotalScore = 123_123_543_456,
PP = 5_072
});
});
displayUpdate(
new UserStatistics
{
GlobalRank = 1_234,
Accuracy = 0.9907,
MaxCombo = 2_352,
RankedScore = 23_124_231_435,
TotalScore = 123_124_231_435,
PP = 5_434
},
new UserStatistics
{
GlobalRank = 12_345,
Accuracy = 0.9899,
MaxCombo = 2_322,
RankedScore = 23_123_543_456,
TotalScore = 123_123_543_456,
PP = 5_072
});
}
[Test]
@ -94,7 +84,7 @@ namespace osu.Game.Tests.Visual.Ranking
};
createDisplay();
AddStep("trigger update success", () => soloStatisticsWatcher.TriggerSuccess(statistics, statistics));
displayUpdate(statistics, statistics);
}
[Test]
@ -111,32 +101,17 @@ namespace osu.Game.Tests.Visual.Ranking
};
createDisplay();
AddStep("trigger update success", () => soloStatisticsWatcher.TriggerSuccess(statistics, statistics));
displayUpdate(statistics, statistics);
}
private void createDisplay() => AddStep("create display", () => Child = new OverallRanking(new ScoreInfo())
private void createDisplay() => AddStep("create display", () => Child = overallRanking = new OverallRanking(new ScoreInfo())
{
Width = 400,
Anchor = Anchor.Centre,
Origin = Anchor.Centre
});
private class MockSoloStatisticsWatcher : ISoloStatisticsWatcher
{
private ScoreInfo? score;
private Action<SoloStatisticsUpdate>? onUpdateReady;
public void RegisterForStatisticsUpdateAfter(ScoreInfo score, Action<SoloStatisticsUpdate> onUpdateReady)
{
this.score = score;
this.onUpdateReady = onUpdateReady;
}
public void TriggerSuccess(UserStatistics before, UserStatistics after)
{
Debug.Assert(score != null && onUpdateReady != null);
onUpdateReady.Invoke(new SoloStatisticsUpdate(score, before, after));
}
}
private void displayUpdate(UserStatistics before, UserStatistics after) =>
AddStep("display update", () => overallRanking.StatisticsUpdate.Value = new SoloStatisticsUpdate(new ScoreInfo(), before, after));
}
}