1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 15:23:14 +08:00

Remove load checks and place one in the constructor

This commit is contained in:
David Zhao 2019-01-24 20:11:28 +09:00 committed by Dean Herbert
parent f5aaf13363
commit d80424b1d6

View File

@ -71,6 +71,8 @@ namespace osu.Game.Rulesets.Osu.Tests
Ruleset = new OsuRuleset().RulesetInfo Ruleset = new OsuRuleset().RulesetInfo
}, },
}); });
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
} }
private const double time_before_slider = 250; private const double time_before_slider = 250;
@ -93,7 +95,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestLeftBeforeSliderThenRight() public void TestLeftBeforeSliderThenRight()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Invalid key transfer test", () => AddStep("Invalid key transfer test", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -121,7 +122,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestLeftBeforeSliderThenRightThenLettingGoOfLeft() public void TestLeftBeforeSliderThenRightThenLettingGoOfLeft()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Left to both to right test", () => AddStep("Left to both to right test", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -149,7 +149,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingRetentionLeftRightLeft() public void TestTrackingRetentionLeftRightLeft()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Tracking retention test", () => AddStep("Tracking retention test", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -177,7 +176,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingLeftBeforeSliderToRight() public void TestTrackingLeftBeforeSliderToRight()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Tracking retention test", () => AddStep("Tracking retention test", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -204,7 +202,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingPreclicked() public void TestTrackingPreclicked()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Tracking retention test", () => AddStep("Tracking retention test", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -231,7 +228,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingReturnMidSlider() public void TestTrackingReturnMidSlider()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Mid-sldier tracking re-acquisition", () => AddStep("Mid-sldier tracking re-acquisition", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -263,7 +259,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingReturnMidSliderKeyDownBefore() public void TestTrackingReturnMidSliderKeyDownBefore()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Key held down before slider, mid-slider tracking re-acquisition", () => AddStep("Key held down before slider, mid-slider tracking re-acquisition", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -294,7 +289,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingMidSlider() public void TestTrackingMidSlider()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Mid-slider new tracking acquisition", () => AddStep("Mid-slider new tracking acquisition", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -325,7 +319,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingReleasedKeys() public void TestTrackingReleasedKeys()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Mid-slider new tracking acquisition", () => AddStep("Mid-slider new tracking acquisition", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>
@ -356,7 +349,6 @@ namespace osu.Game.Rulesets.Osu.Tests
[Test] [Test]
public void TestTrackingReleasedValidKey() public void TestTrackingReleasedValidKey()
{ {
AddUntilStep(() => Beatmap.Value.BeatmapLoaded, "Wait for bm load");
AddStep("Mid-slider new tracking acquisition", () => AddStep("Mid-slider new tracking acquisition", () =>
{ {
var frames = new List<ReplayFrame> var frames = new List<ReplayFrame>