Use `DependencyProvidingContainer` in `TestSceneCatcher`

This commit is contained in:
ekrctb 2021-07-05 19:07:29 +09:00
parent d3bb4ddbee
commit 5a0a223b1b
1 changed files with 17 additions and 19 deletions

View File

@ -31,22 +31,9 @@ public class TestSceneCatcher : OsuTestScene
[Resolved]
private OsuConfigManager config { get; set; }
[Cached]
private readonly DroppedObjectContainer droppedObjectContainer;
private readonly Container trailContainer;
private TestCatcher catcher;
public TestSceneCatcher()
{
Add(trailContainer = new Container
{
Anchor = Anchor.Centre,
Depth = -1
});
Add(droppedObjectContainer = new DroppedObjectContainer());
}
private DroppedObjectContainer droppedObjectContainer;
[SetUp]
public void SetUp() => Schedule(() =>
@ -56,13 +43,24 @@ public void SetUp() => Schedule(() =>
CircleSize = 0,
};
if (catcher != null)
Remove(catcher);
Add(catcher = new TestCatcher(trailContainer, difficulty)
var trailContainer = new Container
{
Anchor = Anchor.Centre,
};
Child = new DependencyProvidingContainer
{
Types = new[]
{
typeof(DroppedObjectContainer),
},
Children = new Drawable[]
{
droppedObjectContainer = new DroppedObjectContainer(),
catcher = new TestCatcher(trailContainer, difficulty),
trailContainer
},
Anchor = Anchor.Centre
});
};
});
[Test]