keii.dev
A game framework written with osu! in mind.
Rename test scene in line with existing cases
+24
-25
+24
-25
osu.Framework.Tests/Visual/Drawables/TestSceneUnloadingModelBackedDrawable.cs
osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithUnloading.cs
+24
-25
osu.Framework.Tests/Visual/Drawables/TestSceneUnloadingModelBackedDrawable.cs
osu.Framework.Tests/Visual/Drawables/TestSceneModelBackedDrawableWithUnloading.cs
···
14
14
15
15
namespace osu.Framework.Tests.Visual.Drawables
16
16
{
17
-
[System.ComponentModel.Description("MBD behaviour with unloading wrapper")]
18
-
public class TestSceneUnloadingModelBackedDrawable : FrameworkTestScene
17
+
public class TestSceneModelBackedDrawableWithUnloading : FrameworkTestScene
19
18
{
20
-
private TestUnloadingModelBackedDrawable mbd;
19
+
private TestUnloadingModelBackedDrawable backedDrawable;
21
20
private Drawable initialDrawable;
22
21
23
22
[SetUpSteps]
24
23
public void SetUpSteps()
25
24
{
26
-
AddStep("setup mbd", () =>
25
+
AddStep("setup drawable", () =>
27
26
{
28
-
Child = mbd = new TestUnloadingModelBackedDrawable(TimePerAction)
27
+
Child = backedDrawable = new TestUnloadingModelBackedDrawable(TimePerAction)
29
28
{
30
29
Anchor = Anchor.Centre,
31
30
Origin = Anchor.Centre,
···
34
33
};
35
34
});
36
35
37
-
AddUntilStep("wait for load", () => mbd.DisplayedDrawable != null);
38
-
AddStep("get displayed drawable", () => initialDrawable = mbd.DisplayedDrawable);
36
+
AddUntilStep("wait for load", () => backedDrawable.DisplayedDrawable != null);
37
+
AddStep("get displayed drawable", () => initialDrawable = backedDrawable.DisplayedDrawable);
39
38
}
40
39
41
40
[Test]
42
41
public void TestUnloading()
43
42
{
44
-
AddStep("mask away", () => mbd.Position = new Vector2(-2));
45
-
AddUntilStep("drawable unloaded", () => initialDrawable.IsDisposed && mbd.DisplayedDrawable == null);
43
+
AddStep("mask away", () => backedDrawable.Position = new Vector2(-2));
44
+
AddUntilStep("drawable unloaded", () => initialDrawable.IsDisposed && backedDrawable.DisplayedDrawable == null);
46
45
47
-
AddStep("return back", () => mbd.Position = Vector2.Zero);
48
-
AddUntilStep("new drawable displayed", () => mbd.DisplayedDrawable != null && mbd.DisplayedDrawable != initialDrawable);
46
+
AddStep("return back", () => backedDrawable.Position = Vector2.Zero);
47
+
AddUntilStep("new drawable displayed", () => backedDrawable.DisplayedDrawable != null && backedDrawable.DisplayedDrawable != initialDrawable);
49
48
}
50
49
51
50
[Test]
52
51
public void TestChangeWhileMaskedAway()
53
52
{
54
-
AddStep("mask away", () => mbd.Position = new Vector2(-2));
55
-
AddUntilStep("wait for drawable unload", () => mbd.DisplayedDrawable == null);
53
+
AddStep("mask away", () => backedDrawable.Position = new Vector2(-2));
54
+
AddUntilStep("wait for drawable unload", () => backedDrawable.DisplayedDrawable == null);
56
55
57
-
AddStep("change model", () => mbd.Model = 1);
56
+
AddStep("change model", () => backedDrawable.Model = 1);
58
57
AddWaitStep("wait a bit", 5);
59
-
AddAssert("no drawable loaded", () => mbd.DisplayedDrawable == null);
58
+
AddAssert("no drawable loaded", () => backedDrawable.DisplayedDrawable == null);
60
59
61
-
AddStep("return back", () => mbd.Position = Vector2.Zero);
62
-
AddUntilStep("new drawable displayed", () => mbd.DisplayedDrawable != null);
60
+
AddStep("return back", () => backedDrawable.Position = Vector2.Zero);
61
+
AddUntilStep("new drawable displayed", () => backedDrawable.DisplayedDrawable != null);
63
62
}
64
63
65
64
[Test]
66
65
public void TestTransformsAppliedOnReloading()
67
66
{
68
-
AddStep("mask away", () => mbd.Position = new Vector2(-2));
69
-
AddUntilStep("wait for drawable unload", () => mbd.DisplayedDrawable == null);
67
+
AddStep("mask away", () => backedDrawable.Position = new Vector2(-2));
68
+
AddUntilStep("wait for drawable unload", () => backedDrawable.DisplayedDrawable == null);
70
69
71
-
AddStep("reset transform counters", () => mbd.ResetTransformCounters());
72
-
AddStep("return back", () => mbd.Position = Vector2.Zero);
73
-
AddUntilStep("wait for new drawable", () => mbd.DisplayedDrawable != null);
70
+
AddStep("reset transform counters", () => backedDrawable.ResetTransformCounters());
71
+
AddStep("return back", () => backedDrawable.Position = Vector2.Zero);
72
+
AddUntilStep("wait for new drawable", () => backedDrawable.DisplayedDrawable != null);
74
73
75
74
// on loading, mbd applies immediate hide transform on new drawable then applies show transform.
76
-
AddAssert("initial hide transform applied", () => mbd.HideTransforms == 1);
77
-
AddAssert("show transform applied", () => mbd.ShowTransforms == 1);
78
-
AddUntilStep("new drawable alpha = 1", () => mbd.DisplayedDrawable.Alpha == 1);
75
+
AddAssert("initial hide transform applied", () => backedDrawable.HideTransforms == 1);
76
+
AddAssert("show transform applied", () => backedDrawable.ShowTransforms == 1);
77
+
AddUntilStep("new drawable alpha = 1", () => backedDrawable.DisplayedDrawable.Alpha == 1);
79
78
}
80
79
81
80
private class TestUnloadingModelBackedDrawable : ModelBackedDrawable<int>