From 8cd2f509efc095d0b9a3c34bb8b7152764840a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 3 Jun 2017 17:33:24 +0200
Subject: [PATCH 1/3] Move skip button into its own test, because it is no
 longer two-layered

---
 .../Tests/TestCaseSkipButton.cs               | 21 +++++++++++++++++++
 .../Tests/TestCaseTwoLayerButton.cs           |  4 +---
 .../osu.Desktop.VisualTests.csproj            |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
new file mode 100644
index 0000000000..c9244516eb
--- /dev/null
+++ b/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Testing;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Screens.Play;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    internal class TestCaseSkipButton : TestCase
+    {
+        public override string Description => @"Skip skip skippediskip";
+
+        public override void Reset()
+        {
+            base.Reset();
+            
+            Add(new SkipButton(Clock.CurrentTime + 5000));
+        }
+    }
+}
diff --git a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs
index ba17cfc3d8..2decb4c469 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseTwoLayerButton.cs
@@ -3,20 +3,18 @@
 
 using osu.Framework.Testing;
 using osu.Game.Graphics.UserInterface;
-using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCaseTwoLayerButton : TestCase
     {
-        public override string Description => @"Back and skip and what not";
+        public override string Description => @"Mostly back button";
 
         public override void Reset()
         {
             base.Reset();
 
             Add(new BackButton());
-            Add(new SkipButton(Clock.CurrentTime + 5000));
         }
     }
 }
diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
index 5a532d7234..8b4edb3192 100644
--- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
+++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
@@ -203,6 +203,7 @@
     <Compile Include="Tests\TestCaseReplay.cs" />
     <Compile Include="Tests\TestCaseResults.cs" />
     <Compile Include="Tests\TestCaseScoreCounter.cs" />
+    <Compile Include="Tests\TestCaseSkipButton.cs" />
     <Compile Include="Tests\TestCaseTabControl.cs" />
     <Compile Include="Tests\TestCaseTaikoHitObjects.cs" />
     <Compile Include="Tests\TestCaseTaikoPlayfield.cs" />

From d498a4a0224d3dfc476fa777284294293d24b5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 3 Jun 2017 17:45:44 +0200
Subject: [PATCH 2/3] Trim whitespace

---
 osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
index c9244516eb..04ff794dd8 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
@@ -14,7 +14,6 @@ internal class TestCaseSkipButton : TestCase
         public override void Reset()
         {
             base.Reset();
-            
             Add(new SkipButton(Clock.CurrentTime + 5000));
         }
     }

From 0afb188cde87ea1975d327653b1a4b791c943d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 3 Jun 2017 20:05:37 +0200
Subject: [PATCH 3/3] Remove unused using

---
 osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs b/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
index 04ff794dd8..fb5be719c1 100644
--- a/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
+++ b/osu.Desktop.VisualTests/Tests/TestCaseSkipButton.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Testing;
-using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play;
 
 namespace osu.Desktop.VisualTests.Tests