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

Fix tests failing due to timings

Browse Source
This commit is contained in:
smoogipoo 2020-09-08 13:23:50 +09:00
parent 0e93bbb62d
commit 525026e7f0
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game.Tests/Visual/Collections/TestSceneManageCollectionsDialog.cs
View File

@ -19,30 +19,30 @@ namespace osu.Game.Tests.Visual.Collections
{
public class TestSceneManageCollectionsDialog : OsuManualInputManagerTestScene
{
[Cached]
private readonly DialogOverlay dialogOverlay;
protected override Container<Drawable> Content => content;
private readonly Container content;
private readonly DialogOverlay dialogOverlay;
private readonly BeatmapCollectionManager manager;
private BeatmapCollectionManager manager;
private ManageCollectionsDialog dialog;
public TestSceneManageCollectionsDialog()
{
base.Content.AddRange(new Drawable[]
{
manager = new BeatmapCollectionManager(LocalStorage),
content = new Container { RelativeSizeAxes = Axes.Both },
dialogOverlay = new DialogOverlay()
});
}
[BackgroundDependencyLoader]
private void load()
protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
{
Dependencies.Cache(manager = new BeatmapCollectionManager(LocalStorage));
Add(manager);
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
dependencies.Cache(manager);
dependencies.Cache(dialogOverlay);
return dependencies;
}
[SetUp]
@ -120,6 +120,8 @@ namespace osu.Game.Tests.Visual.Collections
new BeatmapCollection { Name = { Value = "2" } },
}));
assertCollectionCount(2);
AddStep("click first delete button", () =>
{
InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
@ -146,6 +148,8 @@ namespace osu.Game.Tests.Visual.Collections
new BeatmapCollection { Name = { Value = "2" } },
}));
assertCollectionCount(2);
AddStep("click first delete button", () =>
{
InputManager.MoveMouseTo(dialog.ChildrenOfType<DrawableCollectionListItem.DeleteButton>().First(), new Vector2(5, 0));
@ -185,14 +189,16 @@ namespace osu.Game.Tests.Visual.Collections
new BeatmapCollection { Name = { Value = "2" } },
}));
assertCollectionCount(2);
AddStep("change first collection name", () => dialog.ChildrenOfType<TextBox>().First().Text = "First");
AddAssert("collection has new name", () => manager.Collections[0].Name.Value == "First");
}
private void assertCollectionCount(int count)
=> AddAssert($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count);
=> AddUntilStep($"{count} collections shown", () => dialog.ChildrenOfType<DrawableCollectionListItem>().Count() == count);
private void assertCollectionName(int index, string name)
=> AddAssert($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
=> AddUntilStep($"item {index + 1} has correct name", () => dialog.ChildrenOfType<DrawableCollectionListItem>().ElementAt(index).ChildrenOfType<TextBox>().First().Text == name);
}
}

1
osu.Game.Tests/Visual/SongSelect/TestSceneFilterControl.cs
View File

@ -26,7 +26,6 @@ namespace osu.Game.Tests.Visual.SongSelect
protected override Container<Drawable> Content => content;
private readonly Container content;
[Cached]
private readonly BeatmapCollectionManager collectionManager;
private RulesetStore rulesets;