From 7dcf2c6269acdf99f2df4da0e646630ca3e625dc Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 28 Sep 2016 15:30:06 +0900 Subject: [PATCH] Add TestCase for main menu ButtonSystem. --- .../Tests/TestCaseMenuButtonSystem.cs | 21 +++++++++++++++++++ .../osu.Desktop.VisualTests.csproj | 1 + osu.Game/GameModes/Menu/ButtonSystem.cs | 4 +--- osu.Game/Graphics/Containers/OsuComponent.cs | 9 +------- .../Graphics/Containers/OsuLargeComponent.cs | 9 ++------ 5 files changed, 26 insertions(+), 18 deletions(-) create mode 100644 osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs diff --git a/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs new file mode 100644 index 0000000000..ef8e5e5b12 --- /dev/null +++ b/osu.Desktop.VisualTests/Tests/TestCaseMenuButtonSystem.cs @@ -0,0 +1,21 @@ +//Copyright (c) 2007-2016 ppy Pty Ltd . +//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +using osu.Framework.GameModes.Testing; +using osu.Game.GameModes.Menu; + +namespace osu.Desktop.Tests +{ + class TestCaseMenuButtonSystem : TestCase + { + public override string Name => @"ButtonSystem"; + public override string Description => @"Main menu button system"; + + public override void Reset() + { + base.Reset(); + + Add(new ButtonSystem()); + } + } +} diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index 25faad0f12..2a43325c11 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -151,6 +151,7 @@ + diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 0876c181cf..a24af25863 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -11,7 +11,6 @@ using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transformations; using osu.Framework.Input; -using osu.Framework.Threading; using osu.Game.Graphics; using osu.Game.Graphics.Containers; using OpenTK; @@ -20,7 +19,7 @@ using OpenTK.Input; namespace osu.Game.GameModes.Menu { - internal class ButtonSystem : OsuLargeComponent + public class ButtonSystem : OsuLargeComponent { private FlowContainerWithOrigin buttonFlow; @@ -291,7 +290,6 @@ namespace osu.Game.GameModes.Menu Sprite ripple; - Children = new Drawable[] { logoBounceContainer = new AutoSizeContainer diff --git a/osu.Game/Graphics/Containers/OsuComponent.cs b/osu.Game/Graphics/Containers/OsuComponent.cs index 40d49c1332..51a1f3eb7a 100644 --- a/osu.Game/Graphics/Containers/OsuComponent.cs +++ b/osu.Game/Graphics/Containers/OsuComponent.cs @@ -1,19 +1,12 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; namespace osu.Game.Graphics.Containers { class OsuComponent : AutoSizeContainer { - public new OsuGame Game => base.Game as OsuGame; + public new OsuGameBase Game => base.Game as OsuGameBase; } } diff --git a/osu.Game/Graphics/Containers/OsuLargeComponent.cs b/osu.Game/Graphics/Containers/OsuLargeComponent.cs index 761ac557e2..af91eb20de 100644 --- a/osu.Game/Graphics/Containers/OsuLargeComponent.cs +++ b/osu.Game/Graphics/Containers/OsuLargeComponent.cs @@ -1,17 +1,12 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework.Graphics.Containers; namespace osu.Game.Graphics.Containers { - class OsuLargeComponent : LargeContainer + public class OsuLargeComponent : LargeContainer { - public new OsuGame Game => base.Game as OsuGame; + public new OsuGameBase Game => base.Game as OsuGameBase; } }