Merge branch 'master' into update-branch

osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.IO;

osu.Game.Tests/Beatmaps/Formats/LegacyStoryboardDecoderTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.IO;
@@ -70,7 +70,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.AreEqual(new Vector2(320, 240), sprite.InitialPosition);
                 Assert.IsTrue(sprite.IsDrawable);
                 Assert.AreEqual(Anchor.Centre, sprite.Origin);
-                Assert.AreEqual(Path.Combine("SB", "lyric", "ja-21.png"), sprite.Path);
+                Assert.AreEqual("SB/lyric/ja-21.png", sprite.Path);
 
                 var animation = background.Elements.ElementAt(12) as StoryboardAnimation;
                 Assert.NotNull(animation);
@@ -82,7 +82,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
                 Assert.IsTrue(animation.IsDrawable);
                 Assert.AreEqual(AnimationLoopType.LoopForever, animation.LoopType);
                 Assert.AreEqual(Anchor.Centre, animation.Origin);
-                Assert.AreEqual(Path.Combine("SB", "red jitter", "red_0000.jpg"), animation.Path);
+                Assert.AreEqual("SB/red jitter/red_0000.jpg", animation.Path);
                 Assert.AreEqual(78993, animation.StartTime);
             }
         }

osu.Game.Tests/Beatmaps/Formats/OsuJsonDecoderTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.IO;

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -24,7 +24,7 @@ namespace osu.Game.Tests.Beatmaps.IO
         public void TestImportWhenClosed()
         {
             //unfortunately for the time being we need to reference osu.Framework.Desktop for a game host here.
-            using (HeadlessGameHost host = new HeadlessGameHost("TestImportWhenClosed"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWhenClosed"))
             {
                 var osu = loadOsu(host);
 
@@ -37,6 +37,8 @@ namespace osu.Game.Tests.Beatmaps.IO
                 ensureLoaded(osu);
 
                 waitForOrAssert(() => !File.Exists(temp), "Temporary file still exists after standard import", 5000);
+
+                host.Exit();
             }
         }
 
@@ -45,8 +47,8 @@ namespace osu.Game.Tests.Beatmaps.IO
         [Ignore("Binding IPC on Appveyor isn't working (port in use). Need to figure out why")]
         public void TestImportOverIPC()
         {
-            using (HeadlessGameHost host = new HeadlessGameHost("host", true))
-            using (HeadlessGameHost client = new HeadlessGameHost("client", true))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("host", true))
+            using (HeadlessGameHost client = new CleanRunHeadlessGameHost("client", true))
             {
                 Assert.IsTrue(host.IsPrimaryInstance);
                 Assert.IsFalse(client.IsPrimaryInstance);
@@ -64,13 +66,15 @@ namespace osu.Game.Tests.Beatmaps.IO
                 ensureLoaded(osu);
 
                 waitForOrAssert(() => !File.Exists(temp), "Temporary still exists after IPC import", 5000);
+
+                host.Exit();
             }
         }
 
         [Test]
         public void TestImportWhenFileOpen()
         {
-            using (HeadlessGameHost host = new HeadlessGameHost("TestImportWhenFileOpen"))
+            using (HeadlessGameHost host = new CleanRunHeadlessGameHost("TestImportWhenFileOpen"))
             {
                 var osu = loadOsu(host);
 
@@ -86,6 +90,8 @@ namespace osu.Game.Tests.Beatmaps.IO
                 File.Delete(temp);
 
                 Assert.IsFalse(File.Exists(temp), "We likely held a read lock on the file when we shouldn't");
+
+                host.Exit();
             }
         }
 
@@ -117,8 +123,8 @@ namespace osu.Game.Tests.Beatmaps.IO
             //ensure we were stored to beatmap database backing...
             Assert.IsTrue(resultSets.Count() == 1, $@"Incorrect result count found ({resultSets.Count()} but should be 1).");
 
-            Func<IEnumerable<BeatmapInfo>> queryBeatmaps = () => store.QueryBeatmaps(s => s.BeatmapSet.OnlineBeatmapSetID == 241526 && s.BaseDifficultyID > 0);
-            Func<IEnumerable<BeatmapSetInfo>> queryBeatmapSets = () => store.QueryBeatmapSets(s => s.OnlineBeatmapSetID == 241526);
+            IEnumerable<BeatmapInfo> queryBeatmaps() => store.QueryBeatmaps(s => s.BeatmapSet.OnlineBeatmapSetID == 241526 && s.BaseDifficultyID > 0);
+            IEnumerable<BeatmapSetInfo> queryBeatmapSets() => store.QueryBeatmapSets(s => s.OnlineBeatmapSetID == 241526);
 
             //if we don't re-check here, the set will be inserted but the beatmaps won't be present yet.
             waitForOrAssert(() => queryBeatmaps().Count() == 12,

osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.IO;

osu.Game.Tests/Chat/MessageFormatterTests.cs

@@ -0,0 +1,247 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using NUnit.Framework;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Tests.Chat
+{
+    [TestFixture]
+    public class MessageFormatterTests
+    {
+        [Test]
+        public void TestBareLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a http://www.basic-link.com/?test=test." });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("http://www.basic-link.com/?test=test", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(36, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestMultipleComplexLinks()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a http://test.io/link#fragment. (see https://twitter.com). Also, This string should not be altered. http://example.com/" });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(3, result.Links.Count);
+
+            Assert.AreEqual("http://test.io/link#fragment", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(28, result.Links[0].Length);
+
+            Assert.AreEqual("https://twitter.com", result.Links[1].Url);
+            Assert.AreEqual(45, result.Links[1].Index);
+            Assert.AreEqual(19, result.Links[1].Length);
+
+            Assert.AreEqual("http://example.com/", result.Links[2].Url);
+            Assert.AreEqual(108, result.Links[2].Index);
+            Assert.AreEqual(19, result.Links[2].Length);
+        }
+
+        [Test]
+        public void TestAjaxLinks()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "https://twitter.com/#!/hashbanglinks" });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(result.Content, result.Links[0].Url);
+            Assert.AreEqual(0, result.Links[0].Index);
+            Assert.AreEqual(36, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestUnixHomeLinks()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "http://www.chiark.greenend.org.uk/~sgtatham/putty/" });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(result.Content, result.Links[0].Url);
+            Assert.AreEqual(0, result.Links[0].Index);
+            Assert.AreEqual(50, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestCaseInsensitiveLinks()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "look: http://puu.sh/7Ggh8xcC6/asf0asd9876.NEF" });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(6, result.Links[0].Index);
+            Assert.AreEqual(39, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestWikiLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a [[Wiki Link]]." });
+
+            Assert.AreEqual("This is a Wiki Link.", result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("https://osu.ppy.sh/wiki/Wiki Link", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(9, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestMultiWikiLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a [[Wiki Link]] [[Wiki:Link]][[Wiki.Link]]." });
+
+            Assert.AreEqual("This is a Wiki Link Wiki:LinkWiki.Link.", result.DisplayContent);
+            Assert.AreEqual(3, result.Links.Count);
+
+            Assert.AreEqual("https://osu.ppy.sh/wiki/Wiki Link", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(9, result.Links[0].Length);
+
+            Assert.AreEqual("https://osu.ppy.sh/wiki/Wiki:Link", result.Links[1].Url);
+            Assert.AreEqual(20, result.Links[1].Index);
+            Assert.AreEqual(9, result.Links[1].Length);
+
+            Assert.AreEqual("https://osu.ppy.sh/wiki/Wiki.Link", result.Links[2].Url);
+            Assert.AreEqual(29, result.Links[2].Index);
+            Assert.AreEqual(9, result.Links[2].Length);
+        }
+
+        [Test]
+        public void TestOldFormatLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a (simple test)[https://osu.ppy.sh] of links." });
+
+            Assert.AreEqual("This is a simple test of links.", result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("https://osu.ppy.sh", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(11, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestNewFormatLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a [https://osu.ppy.sh simple test]." });
+
+            Assert.AreEqual("This is a simple test.", result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("https://osu.ppy.sh", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(11, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestMarkdownFormatLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a [simple test](https://osu.ppy.sh)." });
+
+            Assert.AreEqual("This is a simple test.", result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("https://osu.ppy.sh", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(11, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestChannelLink()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is an #english and #japanese." });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(2, result.Links.Count);
+            Assert.AreEqual("osu://chan/#english", result.Links[0].Url);
+            Assert.AreEqual("osu://chan/#japanese", result.Links[1].Url);
+        }
+
+        [Test]
+        public void TestOsuProtocol()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a custom protocol osu://chan/#english." });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("osu://chan/#english", result.Links[0].Url);
+            Assert.AreEqual(26, result.Links[0].Index);
+            Assert.AreEqual(19, result.Links[0].Length);
+
+            result = MessageFormatter.FormatMessage(new Message { Content = "This is a [custom protocol](osu://chan/#english)." });
+
+            Assert.AreEqual("This is a custom protocol.", result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("osu://chan/#english", result.Links[0].Url);
+            Assert.AreEqual("#english", result.Links[0].Argument);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(15, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestOsuMpProtocol()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "Join my multiplayer game osump://12346." });
+
+            Assert.AreEqual(result.Content, result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("osump://12346", result.Links[0].Url);
+            Assert.AreEqual(25, result.Links[0].Index);
+            Assert.AreEqual(13, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestRecursiveBreaking()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a [https://osu.ppy.sh [[simple test]]]." });
+
+            Assert.AreEqual("This is a [[simple test]].", result.DisplayContent);
+            Assert.AreEqual(1, result.Links.Count);
+            Assert.AreEqual("https://osu.ppy.sh", result.Links[0].Url);
+            Assert.AreEqual(10, result.Links[0].Index);
+            Assert.AreEqual(15, result.Links[0].Length);
+        }
+
+        [Test]
+        public void TestLinkComplex()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "This is a [http://www.simple-test.com simple test] with some [traps] and [[wiki links]]. Don't forget to visit https://osu.ppy.sh (now!)[http://google.com]\uD83D\uDE12" });
+
+            Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now!\0\0\0", result.DisplayContent);
+            Assert.AreEqual(5, result.Links.Count);
+
+            Link f = result.Links.Find(l => l.Url == "https://osu.ppy.sh/wiki/wiki links");
+            Assert.AreEqual(44, f.Index);
+            Assert.AreEqual(10, f.Length);
+
+            f = result.Links.Find(l => l.Url == "http://www.simple-test.com");
+            Assert.AreEqual(10, f.Index);
+            Assert.AreEqual(11, f.Length);
+
+            f = result.Links.Find(l => l.Url == "http://google.com");
+            Assert.AreEqual(97, f.Index);
+            Assert.AreEqual(4, f.Length);
+
+            f = result.Links.Find(l => l.Url == "https://osu.ppy.sh");
+            Assert.AreEqual(78, f.Index);
+            Assert.AreEqual(18, f.Length);
+
+            f = result.Links.Find(l => l.Url == "\uD83D\uDE12");
+            Assert.AreEqual(101, f.Index);
+            Assert.AreEqual(3, f.Length);
+        }
+
+        [Test]
+        public void TestEmoji()
+        {
+            Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });
+            Assert.AreEqual("Hello world\0\0\0<--This is an emoji,There are more:\0\0\0\0\0\0,\0\0\0", result.DisplayContent);
+            Assert.AreEqual(result.Links.Count, 4);
+            Assert.AreEqual(result.Links[0].Index, 11);
+            Assert.AreEqual(result.Links[1].Index, 49);
+            Assert.AreEqual(result.Links[2].Index, 52);
+            Assert.AreEqual(result.Links[3].Index, 56);
+            Assert.AreEqual(result.Links[0].Url, "\uD83D\uDE12");
+            Assert.AreEqual(result.Links[1].Url, "\uD83D\uDE10");
+            Assert.AreEqual(result.Links[2].Url, "\uD83D\uDE00");
+            Assert.AreEqual(result.Links[3].Url, "\uD83D\uDE20");
+        }
+    }
+}

osu.Game.Tests/Resources/Resource.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -17,4 +17,4 @@ namespace osu.Game.Tests.Resources
                 Assembly.LoadFrom(Path.Combine(localPath, @"osu.Game.Resources.dll")).GetManifestResourceStream($@"osu.Game.Resources.{name}");
         }
     }
-}
+}

osu.Game.Tests/Visual/TestCaseAllPlayers.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 namespace osu.Game.Tests.Visual

osu.Game.Tests/Visual/TestCaseAutoplay.cs

@@ -0,0 +1,21 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System.ComponentModel;
+using System.Linq;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
+using osu.Game.Screens.Play;
+
+namespace osu.Game.Tests.Visual
+{
+    [Description("Player instantiated with an autoplay mod.")]
+    public class TestCaseAutoplay : TestCasePlayer
+    {
+        protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
+        {
+            beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
+            return base.CreatePlayer(beatmap, ruleset);
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseBeatSyncedContainer.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseBeatmapCarousel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -128,6 +128,20 @@ namespace osu.Game.Tests.Visual
             selectedSets.Pop();
         });
 
+        private bool selectedBeatmapVisible()
+        {
+            var currentlySelected = carousel.Items.FirstOrDefault(s => s.Item is CarouselBeatmap && s.Item.State == CarouselItemState.Selected);
+            if (currentlySelected == null)
+                return true;
+            return currentlySelected.Item.Visible;
+        }
+
+        private void checkInvisibleDifficultiesUnselectable()
+        {
+            nextRandom();
+            AddAssert("Selection is visible", selectedBeatmapVisible);
+        }
+
         /// <summary>
         /// Test keyboard traversal
         /// </summary>
@@ -222,6 +236,15 @@ namespace osu.Game.Tests.Visual
 
             nextRandom();
             AddAssert("ensure repeat", () => selectedSets.Contains(carousel.SelectedBeatmapSet));
+
+            AddStep("Add set with 100 difficulties", () => carousel.UpdateBeatmapSet(createTestBeatmapSetWithManyDifficulties(set_count + 1)));
+            AddStep("Filter Extra", () => carousel.Filter(new FilterCriteria { SearchText = "Extra 10" }, false));
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            checkInvisibleDifficultiesUnselectable();
+            AddStep("Un-filter", () => carousel.Filter(new FilterCriteria(), false));
         }
 
         /// <summary>
@@ -330,26 +353,26 @@ namespace osu.Game.Tests.Visual
             }
         }
 
-        private BeatmapSetInfo createTestBeatmapSet(int i)
+        private BeatmapSetInfo createTestBeatmapSet(int id)
         {
             return new BeatmapSetInfo
             {
-                ID = i,
-                OnlineBeatmapSetID = i,
+                ID = id,
+                OnlineBeatmapSetID = id,
                 Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(),
                 Metadata = new BeatmapMetadata
                 {
-                    OnlineBeatmapSetID = i,
+                    OnlineBeatmapSetID = id,
                     // Create random metadata, then we can check if sorting works based on these
-                    Artist = $"peppy{i.ToString().PadLeft(6, '0')}",
-                    Title = $"test set #{i}!",
-                    AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, i - 1)), 5))
+                    Artist = $"peppy{id.ToString().PadLeft(6, '0')}",
+                    Title = $"test set #{id}!",
+                    AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
                 },
                 Beatmaps = new List<BeatmapInfo>(new[]
                 {
                     new BeatmapInfo
                     {
-                        OnlineBeatmapID = i * 10,
+                        OnlineBeatmapID = id * 10,
                         Path = "normal.osu",
                         Version = "Normal",
                         StarDifficulty = 2,
@@ -360,7 +383,7 @@ namespace osu.Game.Tests.Visual
                     },
                     new BeatmapInfo
                     {
-                        OnlineBeatmapID = i * 10 + 1,
+                        OnlineBeatmapID = id * 10 + 1,
                         Path = "hard.osu",
                         Version = "Hard",
                         StarDifficulty = 5,
@@ -371,7 +394,7 @@ namespace osu.Game.Tests.Visual
                     },
                     new BeatmapInfo
                     {
-                        OnlineBeatmapID = i * 10 + 2,
+                        OnlineBeatmapID = id * 10 + 2,
                         Path = "insane.osu",
                         Version = "Insane",
                         StarDifficulty = 6,
@@ -384,6 +407,40 @@ namespace osu.Game.Tests.Visual
             };
         }
 
+        private BeatmapSetInfo createTestBeatmapSetWithManyDifficulties(int id)
+        {
+            var toReturn = new BeatmapSetInfo
+            {
+                ID = id,
+                OnlineBeatmapSetID = id,
+                Hash = new MemoryStream(Encoding.UTF8.GetBytes(Guid.NewGuid().ToString())).ComputeMD5Hash(),
+                Metadata = new BeatmapMetadata
+                {
+                    OnlineBeatmapSetID = id,
+                    // Create random metadata, then we can check if sorting works based on these
+                    Artist = $"peppy{id.ToString().PadLeft(6, '0')}",
+                    Title = $"test set #{id}!",
+                    AuthorString = string.Concat(Enumerable.Repeat((char)('z' - Math.Min(25, id - 1)), 5))
+                },
+                Beatmaps = new List<BeatmapInfo>(),
+            };
+            for (int b = 1; b < 101; b++)
+            {
+                toReturn.Beatmaps.Add(new BeatmapInfo
+                {
+                    OnlineBeatmapID = b * 10,
+                    Path = $"extra{b}.osu",
+                    Version = $"Extra {b}",
+                    StarDifficulty = 2,
+                    BaseDifficulty = new BeatmapDifficulty
+                    {
+                        OverallDifficulty = 3.5f,
+                    }
+                });
+            }
+            return toReturn;
+        }
+
         private class TestBeatmapCarousel : BeatmapCarousel
         {
             public new List<DrawableCarouselItem> Items => base.Items;

osu.Game.Tests/Visual/TestCaseBeatmapDetailArea.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using NUnit.Framework;

osu.Game.Tests/Visual/TestCaseBeatmapDetails.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;

osu.Game.Tests/Visual/TestCaseBeatmapOptionsOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;

osu.Game.Tests/Visual/TestCaseBeatmapSetOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseBreadcrumbs.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseBreakOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Timing;

osu.Game.Tests/Visual/TestCaseButtonSystem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseChatDisplay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseChatLink.cs

@@ -0,0 +1,217 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using OpenTK.Graphics;
+using osu.Framework.Allocation;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Game.Graphics;
+using osu.Game.Online.Chat;
+using osu.Game.Overlays.Chat;
+using osu.Game.Users;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using osu.Game.Graphics.Containers;
+using osu.Game.Graphics.Sprites;
+using osu.Game.Overlays;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseChatLink : OsuTestCase
+    {
+        private readonly TestChatLineContainer textContainer;
+        private Color4 linkColour;
+
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(ChatLine),
+            typeof(Message),
+            typeof(LinkFlowContainer),
+            typeof(DummyEchoMessage),
+            typeof(LocalEchoMessage),
+            typeof(MessageFormatter)
+        };
+
+        private DependencyContainer dependencies;
+        protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent) => dependencies = new DependencyContainer(parent);
+
+        public TestCaseChatLink()
+        {
+            Add(textContainer = new TestChatLineContainer
+            {
+                Padding = new MarginPadding { Left = 20, Right = 20 },
+                RelativeSizeAxes = Axes.X,
+                AutoSizeAxes = Axes.Y,
+                Direction = FillDirection.Vertical,
+            });
+        }
+
+        [BackgroundDependencyLoader]
+        private void load(OsuColour colours)
+        {
+            linkColour = colours.Blue;
+            dependencies.Cache(new ChatOverlay
+            {
+                AvailableChannels =
+                {
+                    new Channel { Name = "#english" },
+                    new Channel { Name = "#japanese" }
+                }
+            });
+
+            testLinksGeneral();
+            testEcho();
+        }
+
+        private void clear() => AddStep("clear messages", textContainer.Clear);
+
+        private void addMessageWithChecks(string text, int linkAmount = 0, bool isAction = false, bool isImportant = false, params LinkAction[] expectedActions)
+        {
+            int index = textContainer.Count + 1;
+            var newLine = new ChatLine(new DummyMessage(text, isAction, isImportant, index));
+            textContainer.Add(newLine);
+
+            AddAssert($"msg #{index} has {linkAmount} link(s)", () => newLine.Message.Links.Count == linkAmount);
+            AddAssert($"msg #{index} has the right action", hasExpectedActions);
+            AddAssert($"msg #{index} is " + (isAction ? "italic" : "not italic"), () => newLine.ContentFlow.Any() && isAction == isItalic());
+            AddAssert($"msg #{index} shows {linkAmount} link(s)", isShowingLinks);
+
+            bool hasExpectedActions()
+            {
+                var expectedActionsList = expectedActions.ToList();
+
+                if (expectedActionsList.Count != newLine.Message.Links.Count)
+                    return false;
+
+                for (int i = 0; i < newLine.Message.Links.Count; i++)
+                {
+                    var action = newLine.Message.Links[i].Action;
+                    if (action != expectedActions[i]) return false;
+                }
+
+                return true;
+            }
+
+            bool isItalic() => newLine.ContentFlow.Where(d => d is OsuSpriteText).Cast<OsuSpriteText>().All(sprite => sprite.Font == "Exo2.0-MediumItalic");
+
+            bool isShowingLinks()
+            {
+                bool hasBackground = !string.IsNullOrEmpty(newLine.Message.Sender.Colour);
+
+                Color4 textColour = isAction && hasBackground ? OsuColour.FromHex(newLine.Message.Sender.Colour) : Color4.White;
+
+                var linkCompilers = newLine.ContentFlow.Where(d => d is DrawableLinkCompiler).ToList();
+                var linkSprites = linkCompilers.SelectMany(comp => ((DrawableLinkCompiler)comp).Parts);
+
+                return linkSprites.All(d => d.Colour == linkColour)
+                       && newLine.ContentFlow.Except(linkSprites.Concat(linkCompilers)).All(d => d.Colour == textColour);
+            }
+        }
+
+        private void testLinksGeneral()
+        {
+            addMessageWithChecks("test!");
+            addMessageWithChecks("osu.ppy.sh!");
+            addMessageWithChecks("https://osu.ppy.sh!", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("00:12:345 (1,2) - Test?", 1, expectedActions: LinkAction.OpenEditorTimestamp);
+            addMessageWithChecks("Wiki link for tasty [[Performance Points]]", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("(osu forums)[https://osu.ppy.sh/forum] (old link format)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://osu.ppy.sh/home New site] (new link format)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[osu forums](https://osu.ppy.sh/forum) (new link format 2)", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("[https://osu.ppy.sh/home This is only a link to the new osu webpage but this is supposed to test word wrap.]", 1, expectedActions: LinkAction.External);
+            addMessageWithChecks("is now listening to [https://osu.ppy.sh/s/93523 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmapSet);
+            addMessageWithChecks("is now playing [https://osu.ppy.sh/b/252238 IMAGE -MATERIAL- <Version 0>]", 1, true, expectedActions: LinkAction.OpenBeatmap);
+            addMessageWithChecks("Let's (try)[https://osu.ppy.sh/home] [https://osu.ppy.sh/b/252238 multiple links] https://osu.ppy.sh/home", 3,
+                expectedActions: new[] { LinkAction.External, LinkAction.OpenBeatmap, LinkAction.External });
+            // note that there's 0 links here (they get removed if a channel is not found)
+            addMessageWithChecks("#lobby or #osu would be blue (and work) in the ChatDisplay test (when a proper ChatOverlay is present).");
+            addMessageWithChecks("I am important!", 0, false, true);
+            addMessageWithChecks("feels important", 0, true, true);
+            addMessageWithChecks("likes to post this [https://osu.ppy.sh/home link].", 1, true, true, expectedActions: LinkAction.External);
+            addMessageWithChecks("Join my multiplayer game osump://12346.", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks("Join my [multiplayer game](osump://12346).", 1, expectedActions: LinkAction.JoinMultiplayerMatch);
+            addMessageWithChecks("Join my [#english](osu://chan/#english).", 1, expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks("Join my osu://chan/#english.", 1, expectedActions: LinkAction.OpenChannel);
+            addMessageWithChecks("Join my #english or #japanese channels.", 2, expectedActions: new[] { LinkAction.OpenChannel, LinkAction.OpenChannel });
+            addMessageWithChecks("Join my #english or #nonexistent #hashtag channels.", 1, expectedActions: LinkAction.OpenChannel);
+        }
+
+        private void testEcho()
+        {
+            int echoCounter = 0;
+
+            addEchoWithWait("sent!", "received!");
+            addEchoWithWait("https://osu.ppy.sh/home", null, 500);
+            addEchoWithWait("[https://osu.ppy.sh/forum let's try multiple words too!]");
+            addEchoWithWait("(long loading times! clickable while loading?)[https://osu.ppy.sh/home]", null, 5000);
+
+            void addEchoWithWait(string text, string completeText = null, double delay = 250)
+            {
+                var newLine = new ChatLine(new DummyEchoMessage(text));
+
+                AddStep($"send msg #{++echoCounter} after {delay}ms", () =>
+                {
+                    textContainer.Add(newLine);
+                    Scheduler.AddDelayed(() => newLine.Message = new DummyMessage(completeText ?? text), delay);
+                });
+
+                AddUntilStep(() => textContainer.All(line => line.Message is DummyMessage), $"wait for msg #{echoCounter}");
+            }
+        }
+
+        private class DummyEchoMessage : LocalEchoMessage
+        {
+            public DummyEchoMessage(string text)
+            {
+                Content = text;
+                Timestamp = DateTimeOffset.Now;
+                Sender = DummyMessage.TEST_SENDER;
+            }
+        }
+
+        private class DummyMessage : Message
+        {
+            private static long messageCounter;
+
+            internal static readonly User TEST_SENDER_BACKGROUND = new User
+            {
+                Username = @"i-am-important",
+                Id = 42,
+                Colour = "#250cc9",
+            };
+
+            internal static readonly User TEST_SENDER = new User
+            {
+                Username = @"Somebody",
+                Id = 1,
+            };
+
+            public new DateTimeOffset Timestamp = DateTimeOffset.Now;
+
+            public DummyMessage(string text, bool isAction = false, bool isImportant = false, int number = 0)
+                : base(messageCounter++)
+            {
+                Content = text;
+                IsAction = isAction;
+                Sender = new User
+                {
+                    Username = $"User {number}",
+                    Id = number,
+                    Colour = isImportant ? "#250cc9" : null,
+                };
+            }
+        }
+
+        private class TestChatLineContainer : FillFlowContainer<ChatLine>
+        {
+            protected override int Compare(Drawable x, Drawable y)
+            {
+                var xC = (ChatLine)x;
+                var yC = (ChatLine)y;
+
+                return xC.Message.CompareTo(yC.Message);
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseContextMenu.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseCursors.cs

@@ -0,0 +1,274 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using osu.Framework.Extensions.IEnumerableExtensions;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Cursor;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Input;
+using osu.Framework.MathUtils;
+using osu.Framework.Testing.Input;
+using osu.Game.Graphics.Cursor;
+using osu.Game.Graphics.Sprites;
+using OpenTK;
+using OpenTK.Graphics;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseCursors : OsuTestCase
+    {
+        private readonly ManualInputManager inputManager;
+        private readonly CursorOverrideContainer cursorOverrideContainer;
+        private readonly CustomCursorBox[] cursorBoxes = new CustomCursorBox[6];
+
+        public TestCaseCursors()
+        {
+            Child = inputManager = new ManualInputManager
+            {
+                Child = cursorOverrideContainer = new CursorOverrideContainer
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Children = new[]
+                    {
+                        // Middle user
+                        cursorBoxes[0] = new CustomCursorBox(Color4.Green)
+                        {
+                            Anchor = Anchor.Centre,
+                            Origin = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.5f),
+                        },
+                        // Top-left user
+                        cursorBoxes[1] = new CustomCursorBox(Color4.Blue)
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.4f)
+                        },
+                        // Bottom-right user
+                        cursorBoxes[2] = new CustomCursorBox(Color4.Red)
+                        {
+                            Anchor = Anchor.BottomRight,
+                            Origin = Anchor.BottomRight,
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.4f)
+                        },
+                        // Bottom-left local
+                        cursorBoxes[3] = new CustomCursorBox(Color4.Magenta, false)
+                        {
+                            Anchor = Anchor.BottomLeft,
+                            Origin = Anchor.BottomLeft,
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.4f)
+                        },
+                        // Top-right local
+                        cursorBoxes[4] = new CustomCursorBox(Color4.Cyan, false)
+                        {
+                            Anchor = Anchor.TopRight,
+                            Origin = Anchor.TopRight,
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.4f)
+                        },
+                        // Left-local
+                        cursorBoxes[5] = new CustomCursorBox(Color4.Yellow, false)
+                        {
+                            Anchor = Anchor.CentreLeft,
+                            Origin = Anchor.CentreLeft,
+                            RelativeSizeAxes = Axes.Both,
+                            Size = new Vector2(0.2f, 1),
+                        },
+                    }
+                }
+            };
+
+            returnUserInput();
+
+            AddToggleStep("Smooth transitions", b => cursorBoxes.ForEach(box => box.SmoothTransition = b));
+
+            testUserCursor();
+            testLocalCursor();
+            testUserCursorOverride();
+            testMultipleLocalCursors();
+            returnUserInput();
+        }
+
+        /// <summary>
+        /// Returns input back to the user.
+        /// </summary>
+        private void returnUserInput()
+        {
+            AddStep("Return user input", () => inputManager.UseParentState = true);
+        }
+
+        /// <summary>
+        /// -- Green Box --
+        /// Tests whether hovering in and out of a drawable that provides the user cursor (green)
+        /// results in the correct visibility state for that cursor.
+        /// </summary>
+        private void testUserCursor()
+        {
+            AddStep("Move to green area", () => inputManager.MoveMouseTo(cursorBoxes[0]));
+            AddAssert("Check green cursor visible", () => checkVisible(cursorBoxes[0].Cursor));
+            AddAssert("Check green cursor at mouse", () => checkAtMouse(cursorBoxes[0].Cursor));
+            AddStep("Move out", moveOut);
+            AddAssert("Check green cursor invisible", () => !checkVisible(cursorBoxes[0].Cursor));
+            AddAssert("Check global cursor visible", () => checkVisible(cursorOverrideContainer.Cursor));
+        }
+
+        /// <summary>
+        /// -- Purple Box --
+        /// Tests whether hovering in and out of a drawable that provides a local cursor (purple)
+        /// results in the correct visibility and state for that cursor.
+        /// </summary>
+        private void testLocalCursor()
+        {
+            AddStep("Move to purple area", () => inputManager.MoveMouseTo(cursorBoxes[3]));
+            AddAssert("Check purple cursor visible", () => checkVisible(cursorBoxes[3].Cursor));
+            AddAssert("Check purple cursor at mouse", () => checkAtMouse(cursorBoxes[3].Cursor));
+            AddAssert("Check global cursor visible", () => checkVisible(cursorOverrideContainer.Cursor));
+            AddAssert("Check global cursor at mouse", () => checkAtMouse(cursorOverrideContainer.Cursor));
+            AddStep("Move out", moveOut);
+            AddAssert("Check purple cursor visible", () => checkVisible(cursorBoxes[3].Cursor));
+            AddAssert("Check global cursor visible", () => checkVisible(cursorOverrideContainer.Cursor));
+        }
+
+        /// <summary>
+        /// -- Blue-Green Box Boundary --
+        /// Tests whether overriding a user cursor (green) with another user cursor (blue)
+        /// results in the correct visibility and states for the cursors.
+        /// </summary>
+        private void testUserCursorOverride()
+        {
+            AddStep("Move to blue-green boundary", () => inputManager.MoveMouseTo(cursorBoxes[1].ScreenSpaceDrawQuad.BottomRight - new Vector2(10)));
+            AddAssert("Check blue cursor visible", () => checkVisible(cursorBoxes[1].Cursor));
+            AddAssert("Check green cursor invisible", () => !checkVisible(cursorBoxes[0].Cursor));
+            AddAssert("Check blue cursor at mouse", () => checkAtMouse(cursorBoxes[1].Cursor));
+            AddStep("Move out", moveOut);
+            AddAssert("Check blue cursor not visible", () => !checkVisible(cursorBoxes[1].Cursor));
+            AddAssert("Check green cursor not visible", () => !checkVisible(cursorBoxes[0].Cursor));
+        }
+
+        /// <summary>
+        /// -- Yellow-Purple Box Boundary --
+        /// Tests whether multiple local cursors (purple + yellow) may be visible and at the mouse position at the same time.
+        /// </summary>
+        private void testMultipleLocalCursors()
+        {
+            AddStep("Move to yellow-purple boundary", () => inputManager.MoveMouseTo(cursorBoxes[5].ScreenSpaceDrawQuad.BottomRight - new Vector2(10)));
+            AddAssert("Check purple cursor visible", () => checkVisible(cursorBoxes[3].Cursor));
+            AddAssert("Check purple cursor at mouse", () => checkAtMouse(cursorBoxes[3].Cursor));
+            AddAssert("Check yellow cursor visible", () => checkVisible(cursorBoxes[5].Cursor));
+            AddAssert("Check yellow cursor at mouse", () => checkAtMouse(cursorBoxes[5].Cursor));
+            AddStep("Move out", moveOut);
+            AddAssert("Check purple cursor visible", () => checkVisible(cursorBoxes[3].Cursor));
+            AddAssert("Check yellow cursor visible", () => checkVisible(cursorBoxes[5].Cursor));
+        }
+
+        /// <summary>
+        /// -- Yellow-Blue Box Boundary --
+        /// Tests whether a local cursor (yellow) may be displayed along with a user cursor override (blue).
+        /// </summary>
+        private void testUserOverrideWithLocal()
+        {
+            AddStep("Move to yellow-blue boundary", () => inputManager.MoveMouseTo(cursorBoxes[5].ScreenSpaceDrawQuad.TopRight - new Vector2(10)));
+            AddAssert("Check blue cursor visible", () => checkVisible(cursorBoxes[1].Cursor));
+            AddAssert("Check blue cursor at mouse", () => checkAtMouse(cursorBoxes[1].Cursor));
+            AddAssert("Check yellow cursor visible", () => checkVisible(cursorBoxes[5].Cursor));
+            AddAssert("Check yellow cursor at mouse", () => checkAtMouse(cursorBoxes[5].Cursor));
+            AddStep("Move out", moveOut);
+            AddAssert("Check blue cursor invisible", () => !checkVisible(cursorBoxes[1].Cursor));
+            AddAssert("Check yellow cursor visible", () => checkVisible(cursorBoxes[5].Cursor));
+        }
+
+        /// <summary>
+        /// Moves the cursor to a point not covered by any cursor containers.
+        /// </summary>
+        private void moveOut()
+            => inputManager.MoveMouseTo(new Vector2(inputManager.ScreenSpaceDrawQuad.Centre.X, inputManager.ScreenSpaceDrawQuad.TopLeft.Y));
+
+        /// <summary>
+        /// Checks if a cursor is visible.
+        /// </summary>
+        /// <param name="cursorContainer">The cursor to check.</param>
+        private bool checkVisible(CursorContainer cursorContainer) => cursorContainer.State == Visibility.Visible;
+
+        /// <summary>
+        /// Checks if a cursor is at the current inputmanager screen position.
+        /// </summary>
+        /// <param name="cursorContainer">The cursor to check.</param>
+        private bool checkAtMouse(CursorContainer cursorContainer)
+            => Precision.AlmostEquals(inputManager.CurrentState.Mouse.NativeState.Position, cursorContainer.ToScreenSpace(cursorContainer.ActiveCursor.DrawPosition));
+
+        private class CustomCursorBox : Container, IProvideCursor
+        {
+            public bool SmoothTransition;
+
+            public CursorContainer Cursor { get; }
+            public bool ProvidingUserCursor { get; }
+
+            public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || SmoothTransition && !ProvidingUserCursor;
+
+            private readonly Box background;
+
+            public CustomCursorBox(Color4 cursorColour, bool providesUserCursor = true)
+            {
+                ProvidingUserCursor = providesUserCursor;
+
+                Colour = cursorColour;
+                Masking = true;
+
+                Children = new Drawable[]
+                {
+                    background = new Box
+                    {
+                        RelativeSizeAxes = Axes.Both,
+                        Alpha = 0.1f
+                    },
+                    new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                        Text = providesUserCursor ? "User cursor" : "Local cursor"
+                    },
+                    Cursor = new TestCursorContainer
+                    {
+                        State = providesUserCursor ? Visibility.Hidden : Visibility.Visible,
+                    }
+                };
+            }
+
+            protected override bool OnHover(InputState state)
+            {
+                background.FadeTo(0.4f, 250, Easing.OutQuint);
+                return false;
+            }
+
+            protected override void OnHoverLost(InputState state)
+            {
+                background.FadeTo(0.1f, 250);
+                base.OnHoverLost(state);
+            }
+        }
+
+        private class TestCursorContainer : CursorContainer
+        {
+            protected override Drawable CreateCursor() => new TestCursor();
+
+            private class TestCursor : CircularContainer
+            {
+                public TestCursor()
+                {
+                    Origin = Anchor.Centre;
+
+                    Size = new Vector2(50);
+                    Masking = true;
+
+                    Blending = BlendingMode.Additive;
+                    Alpha = 0.5f;
+
+                    Child = new Box { RelativeSizeAxes = Axes.Both };
+                }
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseDialogOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Graphics;

osu.Game.Tests/Visual/TestCaseDirect.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;

osu.Game.Tests/Visual/TestCaseDrawableRoom.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
@@ -63,8 +63,8 @@ namespace osu.Game.Tests.Visual
                         {
                             Value = new[]
                             {
-                                new User { GlobalRank = 1355 },
-                                new User { GlobalRank = 8756 },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 1355 } } },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 8756 } } },
                             },
                         },
                     }),
@@ -99,10 +99,10 @@ namespace osu.Game.Tests.Visual
                         },
                         Participants =
                         {
-                            Value =  new[]
+                            Value = new[]
                             {
-                                new User { GlobalRank = 578975 },
-                                new User { GlobalRank = 24554 },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 578975 } } },
+                                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 24554 } } },
                             },
                         },
                     }),
@@ -116,8 +116,8 @@ namespace osu.Game.Tests.Visual
             AddStep(@"change beatmap", () => first.Room.Beatmap.Value = null);
             AddStep(@"change participants", () => first.Room.Participants.Value = new[]
             {
-                new User { GlobalRank = 1254 },
-                new User { GlobalRank = 123189 },
+                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 1254 } } },
+                new User { Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 123189 } } },
             });
         }
 

osu.Game.Tests/Visual/TestCaseDrawings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;

osu.Game.Tests/Visual/TestCaseEditor.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseEditorCompose.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseEditorComposeRadioButtons.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseEditorMenuBar.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseEditorSelectionLayer.cs

@@ -1,12 +1,15 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
 using System.Collections.Generic;
+using osu.Framework.Allocation;
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Timing;
+using osu.Game.Beatmaps;
+using osu.Game.Beatmaps.ControlPoints;
 using osu.Game.Rulesets.Edit.Layers.Selection;
 using osu.Game.Rulesets.Osu.Edit;
 using osu.Game.Rulesets.Osu.Objects;
@@ -18,26 +21,10 @@ namespace osu.Game.Tests.Visual
     {
         public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(SelectionLayer) };
 
-        public TestCaseEditorSelectionLayer()
+        [BackgroundDependencyLoader]
+        private void load()
         {
-            var playfield = new OsuEditPlayfield
-            {
-                new DrawableHitCircle(new HitCircle { Position = new Vector2(256, 192), Scale = 0.5f }),
-                new DrawableHitCircle(new HitCircle { Position = new Vector2(344, 148), Scale = 0.5f }),
-                new DrawableSlider(new Slider
-                {
-                    ControlPoints = new List<Vector2>
-                    {
-                        new Vector2(128, 256),
-                        new Vector2(344, 256),
-                    },
-                    Distance = 400,
-                    Position = new Vector2(128, 256),
-                    Velocity = 1,
-                    TickDistance = 100,
-                    Scale = 0.5f
-                })
-            };
+            var playfield = new OsuEditPlayfield();
 
             Children = new Drawable[]
             {
@@ -49,6 +36,30 @@ namespace osu.Game.Tests.Visual
                 },
                 new SelectionLayer(playfield)
             };
+
+            var hitCircle1 = new HitCircle { Position = new Vector2(256, 192), Scale = 0.5f };
+            var hitCircle2 = new HitCircle { Position = new Vector2(344, 148), Scale = 0.5f };
+            var slider = new Slider
+            {
+                ControlPoints = new List<Vector2>
+                {
+                    new Vector2(128, 256),
+                    new Vector2(344, 256),
+                },
+                Distance = 400,
+                Position = new Vector2(128, 256),
+                Velocity = 1,
+                TickDistance = 100,
+                Scale = 0.5f,
+            };
+
+            hitCircle1.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            hitCircle2.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+            slider.ApplyDefaults(new ControlPointInfo(), new BeatmapDifficulty());
+
+            playfield.Add(new DrawableHitCircle(hitCircle1));
+            playfield.Add(new DrawableHitCircle(hitCircle2));
+            playfield.Add(new DrawableSlider(slider));
         }
     }
 }

osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseGamefield.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Beatmaps.ControlPoints;
@@ -56,25 +56,25 @@ namespace osu.Game.Tests.Visual
                     Clock = new FramedClock(),
                     Children = new Drawable[]
                     {
-                        new OsuRulesetContainer(new OsuRuleset(new RulesetInfo()), beatmap, false)
+                        new OsuRulesetContainer(new OsuRuleset(), beatmap, false)
                         {
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopLeft,
                             Origin = Anchor.TopLeft
                         },
-                        new TaikoRulesetContainer(new TaikoRuleset(new RulesetInfo()),beatmap, false)
+                        new TaikoRulesetContainer(new TaikoRuleset(),beatmap, false)
                         {
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.TopRight,
                             Origin = Anchor.TopRight
                         },
-                        new CatchRulesetContainer(new CatchRuleset(new RulesetInfo()),beatmap, false)
+                        new CatchRulesetContainer(new CatchRuleset(),beatmap, false)
                         {
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomLeft,
                             Origin = Anchor.BottomLeft
                         },
-                        new ManiaRulesetContainer(new ManiaRuleset(new RulesetInfo()),beatmap, false)
+                        new ManiaRulesetContainer(new ManiaRuleset(),beatmap, false)
                         {
                             Scale = new Vector2(0.5f),
                             Anchor = Anchor.BottomRight,

osu.Game.Tests/Visual/TestCaseGameplayMenuOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseGraph.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Linq;

osu.Game.Tests/Visual/TestCaseHistoricalSection.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseIconButton.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using OpenTK;

osu.Game.Tests/Visual/TestCaseIntroSequence.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseKeyConfiguration.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Overlays;

osu.Game.Tests/Visual/TestCaseKeyCounter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseLeaderboard.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseMedalOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseMods.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseMusicController.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;

osu.Game.Tests/Visual/TestCaseNotificationOverlay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseOnScreenDisplay.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;

osu.Game.Tests/Visual/TestCaseOsuGame.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCasePlaySongSelect.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual
             // this is by no means clean. should be replacing inside of OsuGameBase somehow.
             var context = new OsuDbContext();
 
-            Func<OsuDbContext> contextFactory = () => context;
+            OsuDbContext contextFactory() => context;
 
             dependencies.Cache(rulesets = new RulesetStore(contextFactory));
             dependencies.Cache(manager = new BeatmapManager(storage, contextFactory, rulesets, null)

osu.Game.Tests/Visual/TestCasePlaybackControl.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCasePopupDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseRankGraph.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Overlays.Profile;
@@ -65,7 +65,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 123456,
+                        Ranks = new UserStatistics.UserRanks { Global = 123456 },
                         PP = 12345,
                     }
                 };
@@ -77,7 +77,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 89000,
+                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
                         PP = 12345,
                     },
                     RankHistory = new User.RankHistoryData
@@ -93,7 +93,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 89000,
+                        Ranks = new UserStatistics.UserRanks { Global = 89000 },
                         PP = 12345,
                     },
                     RankHistory = new User.RankHistoryData
@@ -109,7 +109,7 @@ namespace osu.Game.Tests.Visual
                 {
                     Statistics = new UserStatistics
                     {
-                        Rank = 12000,
+                        Ranks = new UserStatistics.UserRanks { Global = 12000 },
                         PP = 12345,
                     },
                     RankHistory = new User.RankHistoryData

osu.Game.Tests/Visual/TestCaseReplay.cs

@@ -1,19 +1,35 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.ComponentModel;
 using System.Linq;
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
+using osu.Game.Rulesets.Mods;
 using osu.Game.Screens.Play;
 
 namespace osu.Game.Tests.Visual
 {
+    [Description("Player instantiated with a replay.")]
     public class TestCaseReplay : TestCasePlayer
     {
         protected override Player CreatePlayer(WorkingBeatmap beatmap, Ruleset ruleset)
         {
+            // We create a dummy RulesetContainer just to get the replay - we don't want to use mods here
+            // to simulate setting a replay rather than having the replay already set for us
             beatmap.Mods.Value = beatmap.Mods.Value.Concat(new[] { ruleset.GetAutoplayMod() });
-            return base.CreatePlayer(beatmap, ruleset);
+            var dummyRulesetContainer = ruleset.CreateRulesetContainerWith(beatmap, false);
+
+            // We have the replay
+            var replay = dummyRulesetContainer.Replay;
+
+            // Reset the mods
+            beatmap.Mods.Value = beatmap.Mods.Value.Where(m => !(m is ModAutoplay));
+
+            return new ReplayPlayer(replay)
+            {
+                InitialBeatmap = beatmap
+            };
         }
     }
 }

osu.Game.Tests/Visual/TestCaseReplaySettingsOverlay.cs

@@ -1,10 +1,10 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Play.HUD;
-using osu.Game.Screens.Play.ReplaySettings;
+using osu.Game.Screens.Play.PlayerSettings;
 
 namespace osu.Game.Tests.Visual
 {
@@ -14,7 +14,7 @@ namespace osu.Game.Tests.Visual
         {
             ExampleContainer container;
 
-            Add(new ReplaySettingsOverlay
+            Add(new PlayerSettingsOverlay
             {
                 Anchor = Anchor.TopRight,
                 Origin = Anchor.TopRight,
@@ -28,7 +28,7 @@ namespace osu.Game.Tests.Visual
                 Text = @"Button",
             }));
 
-            AddStep(@"Add checkbox", () => container.Add(new ReplayCheckbox
+            AddStep(@"Add checkbox", () => container.Add(new PlayerCheckbox
             {
                 LabelText = "Checkbox",
             }));
@@ -42,7 +42,7 @@ namespace osu.Game.Tests.Visual
             }));
         }
 
-        private class ExampleContainer : ReplayGroup
+        private class ExampleContainer : PlayerSettingsGroup
         {
             protected override string Title => @"example";
         }

osu.Game.Tests/Visual/TestCaseResults.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseRoomInspector.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;
@@ -54,12 +54,12 @@ namespace osu.Game.Tests.Visual
                 {
                     Value = new[]
                     {
-                        new User { Username = @"flyte", Id = 3103765, GlobalRank = 1425 },
-                        new User { Username = @"Cookiezi", Id = 124493, GlobalRank = 5466 },
-                        new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 2873 },
-                        new User { Username = @"Rafis", Id = 2558286, GlobalRank = 4687 },
-                        new User { Username = @"hvick225", Id = 50265, GlobalRank = 3258 },
-                        new User { Username = @"peppy", Id = 2, GlobalRank = 6251 }
+                        new User { Username = @"flyte", Id = 3103765, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 142 } } },
+                        new User { Username = @"Cookiezi", Id = 124493, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 546 } } },
+                        new User { Username = @"Angelsim", Id = 1777162, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 287 } } },
+                        new User { Username = @"Rafis", Id = 2558286, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 468 } } },
+                        new User { Username = @"hvick225", Id = 50265, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 325 } } },
+                        new User { Username = @"peppy", Id = 2, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 625 } } },
                     }
                 }
             };
@@ -80,8 +80,8 @@ namespace osu.Game.Tests.Visual
             AddStep(@"change max participants", () => room.MaxParticipants.Value = null);
             AddStep(@"change participants", () => room.Participants.Value = new[]
             {
-                new User { Username = @"filsdelama", Id = 2831793, GlobalRank = 8542 },
-                new User { Username = @"_index", Id = 652457, GlobalRank = 15024 }
+                new User { Username = @"filsdelama", Id = 2831793, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 854 } } },
+                new User { Username = @"_index", Id = 652457, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 150 } } }
             });
 
             AddStep(@"change room", () =>
@@ -121,9 +121,9 @@ namespace osu.Game.Tests.Visual
                     {
                         Value = new[]
                         {
-                            new User { Username = @"Angelsim", Id = 1777162, GlobalRank = 4 },
-                            new User { Username = @"HappyStick", Id = 256802, GlobalRank = 752 },
-                            new User { Username = @"-Konpaku-", Id = 2258797, GlobalRank = 571 }
+                            new User { Username = @"Angelsim", Id = 1777162, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 4 } } },
+                            new User { Username = @"HappyStick", Id = 256802, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 752 } } },
+                            new User { Username = @"-Konpaku-", Id = 2258797, Statistics = new UserStatistics { Ranks = new UserStatistics.UserRanks { Global = 571 } } }
                         }
                     }
                 };

osu.Game.Tests/Visual/TestCaseScoreCounter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseScrollingHitObjects.cs

@@ -0,0 +1,184 @@
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+
+using System;
+using System.Collections.Generic;
+using osu.Framework.Extensions.IEnumerableExtensions;
+using OpenTK;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Timing;
+using osu.Game.Rulesets.UI;
+using osu.Game.Rulesets.UI.Scrolling;
+
+namespace osu.Game.Tests.Visual
+{
+    public class TestCaseScrollingHitObjects : OsuTestCase
+    {
+        public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(Playfield) };
+
+        private readonly TestPlayfield[] playfields = new TestPlayfield[4];
+
+        public TestCaseScrollingHitObjects()
+        {
+            Add(new GridContainer
+            {
+                RelativeSizeAxes = Axes.Both,
+                Content = new[]
+                {
+                    new Drawable[]
+                    {
+                        playfields[0] = new TestPlayfield(ScrollingDirection.Up),
+                        playfields[1] = new TestPlayfield(ScrollingDirection.Down)
+                    },
+                    new Drawable[]
+                    {
+                        playfields[2] = new TestPlayfield(ScrollingDirection.Left),
+                        playfields[3] = new TestPlayfield(ScrollingDirection.Right)
+                    }
+                }
+            });
+
+            AddSliderStep("Time range", 100, 10000, 5000, v => playfields.ForEach(p => p.VisibleTimeRange.Value = v));
+            AddStep("Add control point", () => addControlPoint(Time.Current + 5000));
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            playfields.ForEach(p => p.HitObjects.AddControlPoint(new MultiplierControlPoint(0)));
+
+            for (int i = 0; i <= 5000; i += 1000)
+                addHitObject(Time.Current + i);
+
+            Scheduler.AddDelayed(() => addHitObject(Time.Current + 5000), 1000, true);
+        }
+
+        private void addHitObject(double time)
+        {
+            playfields.ForEach(p =>
+            {
+                var hitObject = new TestDrawableHitObject(time);
+                setAnchor(hitObject, p);
+
+                p.Add(hitObject);
+            });
+        }
+
+        private void addControlPoint(double time)
+        {
+            playfields.ForEach(p =>
+            {
+                p.HitObjects.AddControlPoint(new MultiplierControlPoint(time) { DifficultyPoint = { SpeedMultiplier = 3 } });
+                p.HitObjects.AddControlPoint(new MultiplierControlPoint(time + 2000) { DifficultyPoint = { SpeedMultiplier = 2 } });
+                p.HitObjects.AddControlPoint(new MultiplierControlPoint(time + 3000) { DifficultyPoint = { SpeedMultiplier = 1 } });
+
+                TestDrawableControlPoint createDrawablePoint(double t)
+                {
+                    var obj = new TestDrawableControlPoint(p.Direction, t);
+                    setAnchor(obj, p);
+                    return obj;
+                }
+
+                p.Add(createDrawablePoint(time));
+                p.Add(createDrawablePoint(time + 2000));
+                p.Add(createDrawablePoint(time + 3000));
+            });
+        }
+
+        private void setAnchor(DrawableHitObject obj, TestPlayfield playfield)
+        {
+            switch (playfield.Direction)
+            {
+                case ScrollingDirection.Up:
+                    obj.Anchor = Anchor.TopCentre;
+                    break;
+                case ScrollingDirection.Down:
+                    obj.Anchor = Anchor.BottomCentre;
+                    break;
+                case ScrollingDirection.Left:
+                    obj.Anchor = Anchor.CentreLeft;
+                    break;
+                case ScrollingDirection.Right:
+                    obj.Anchor = Anchor.CentreRight;
+                    break;
+            }
+        }
+
+
+        private class TestPlayfield : ScrollingPlayfield
+        {
+            public readonly ScrollingDirection Direction;
+
+            public TestPlayfield(ScrollingDirection direction)
+                : base(direction)
+            {
+                Direction = direction;
+
+                Padding = new MarginPadding(2);
+                ScaledContent.Masking = true;
+
+                AddInternal(new Box
+                {
+                    RelativeSizeAxes = Axes.Both,
+                    Alpha = 0.5f,
+                    Depth = float.MaxValue
+                });
+            }
+        }
+
+        private class TestDrawableControlPoint : DrawableHitObject<HitObject>
+        {
+            public TestDrawableControlPoint(ScrollingDirection direction, double time)
+                : base(new HitObject { StartTime = time })
+            {
+                Origin = Anchor.Centre;
+
+                Add(new Box
+                {
+                    Anchor = Anchor.Centre,
+                    Origin = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both
+                });
+
+                switch (direction)
+                {
+                    case ScrollingDirection.Up:
+                    case ScrollingDirection.Down:
+                        RelativeSizeAxes = Axes.X;
+                        Height = 2;
+                        break;
+                    case ScrollingDirection.Left:
+                    case ScrollingDirection.Right:
+                        RelativeSizeAxes = Axes.Y;
+                        Width = 2;
+                        break;
+                }
+            }
+
+            protected override void UpdateState(ArmedState state)
+            {
+            }
+        }
+
+        private class TestDrawableHitObject : DrawableHitObject<HitObject>
+        {
+            public TestDrawableHitObject(double time)
+                : base(new HitObject { StartTime = time })
+            {
+                Origin = Anchor.Centre;
+                AutoSizeAxes = Axes.Both;
+
+                Add(new Box { Size = new Vector2(75) });
+            }
+
+            protected override void UpdateState(ArmedState state)
+            {
+            }
+        }
+    }
+}

osu.Game.Tests/Visual/TestCaseScrollingPlayfield.cs

@@ -1,219 +0,0 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
-
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Framework.Input;
-using osu.Framework.Timing;
-using osu.Game.Beatmaps;
-using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects;
-using osu.Game.Rulesets.Objects.Drawables;
-using osu.Game.Rulesets.Scoring;
-using osu.Game.Rulesets.Timing;
-using osu.Game.Rulesets.UI;
-using osu.Game.Tests.Beatmaps;
-using OpenTK;
-
-namespace osu.Game.Tests.Visual
-{
-    /// <summary>
-    /// The most minimal implementation of a playfield with scrolling hit objects.
-    /// </summary>
-    [TestFixture]
-    public class TestCaseScrollingPlayfield : OsuTestCase
-    {
-        public TestCaseScrollingPlayfield()
-        {
-            Clock = new FramedClock();
-
-            var objects = new List<HitObject>();
-
-            int time = 1500;
-            for (int i = 0; i < 50; i++)
-            {
-                objects.Add(new TestHitObject { StartTime = time });
-
-                time += 500;
-            }
-
-            Beatmap b = new Beatmap
-            {
-                HitObjects = objects,
-                BeatmapInfo = new BeatmapInfo
-                {
-                    BaseDifficulty = new BeatmapDifficulty(),
-                    Metadata = new BeatmapMetadata()
-                }
-            };
-
-            WorkingBeatmap beatmap = new TestWorkingBeatmap(b);
-
-            TestRulesetContainer horizontalRulesetContainer;
-            Add(horizontalRulesetContainer = new TestRulesetContainer(Axes.X, beatmap, true));
-
-            TestRulesetContainer verticalRulesetContainer;
-            Add(verticalRulesetContainer = new TestRulesetContainer(Axes.Y, beatmap, true));
-
-            AddStep("Reverse direction", () =>
-            {
-                horizontalRulesetContainer.Playfield.Reverse();
-                verticalRulesetContainer.Playfield.Reverse();
-            });
-        }
-
-        [Test]
-        public void TestSpeedAdjustmentOrdering()
-        {
-            var hitObjectContainer = new ScrollingPlayfield.ScrollingHitObjectContainer(Axes.X);
-
-            var speedAdjustments = new[]
-            {
-                new SpeedAdjustmentContainer(new MultiplierControlPoint()),
-                new SpeedAdjustmentContainer(new MultiplierControlPoint(1000)
-                {
-                    TimingPoint = new TimingControlPoint { BeatLength = 500 }
-                }),
-                new SpeedAdjustmentContainer(new MultiplierControlPoint(2000)
-                {
-                    TimingPoint = new TimingControlPoint { BeatLength = 1000 },
-                    DifficultyPoint = new DifficultyControlPoint { SpeedMultiplier = 2}
-                }),
-                new SpeedAdjustmentContainer(new MultiplierControlPoint(3000)
-                {
-                    TimingPoint = new TimingControlPoint { BeatLength = 1000 },
-                    DifficultyPoint = new DifficultyControlPoint { SpeedMultiplier = 1}
-                }),
-            };
-
-            var hitObjects = new[]
-            {
-                new DrawableTestHitObject(Axes.X, new TestHitObject { StartTime = -1000 }),
-                new DrawableTestHitObject(Axes.X, new TestHitObject()),
-                new DrawableTestHitObject(Axes.X, new TestHitObject { StartTime = 1000 }),
-                new DrawableTestHitObject(Axes.X, new TestHitObject { StartTime = 2000 }),
-                new DrawableTestHitObject(Axes.X, new TestHitObject { StartTime = 3000 }),
-                new DrawableTestHitObject(Axes.X, new TestHitObject { StartTime = 4000 }),
-            };
-
-            hitObjects.ForEach(h => hitObjectContainer.Add(h));
-            speedAdjustments.ForEach(hitObjectContainer.AddSpeedAdjustment);
-
-            // The 0th index in hitObjectContainer.SpeedAdjustments is the "default" control point
-            // Check multiplier of the default speed adjustment
-            Assert.AreEqual(1, hitObjectContainer.SpeedAdjustments[0].ControlPoint.Multiplier);
-            Assert.AreEqual(1, speedAdjustments[0].ControlPoint.Multiplier);
-            Assert.AreEqual(2, speedAdjustments[1].ControlPoint.Multiplier);
-            Assert.AreEqual(2, speedAdjustments[2].ControlPoint.Multiplier);
-            Assert.AreEqual(1, speedAdjustments[3].ControlPoint.Multiplier);
-
-            // Check insertion of hit objects
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[4].Contains(hitObjects[0]));
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[3].Contains(hitObjects[1]));
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[2].Contains(hitObjects[2]));
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[1].Contains(hitObjects[3]));
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[0].Contains(hitObjects[4]));
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[0].Contains(hitObjects[5]));
-
-            hitObjectContainer.RemoveSpeedAdjustment(hitObjectContainer.SpeedAdjustments[3]);
-
-            // The hit object contained in this speed adjustment should be resorted into the one occuring before it
-
-            Assert.IsTrue(hitObjectContainer.SpeedAdjustments[3].Contains(hitObjects[1]));
-        }
-
-        private class TestRulesetContainer : ScrollingRulesetContainer<TestPlayfield, TestHitObject>
-        {
-            private readonly Axes scrollingAxes;
-
-            public TestRulesetContainer(Axes scrollingAxes, WorkingBeatmap beatmap, bool isForCurrentRuleset)
-                : base(null, beatmap, isForCurrentRuleset)
-            {
-                this.scrollingAxes = scrollingAxes;
-            }
-
-            public new TestPlayfield Playfield => base.Playfield;
-
-            public override ScoreProcessor CreateScoreProcessor() => new TestScoreProcessor();
-
-            public override PassThroughInputManager CreateInputManager() => new PassThroughInputManager();
-
-            protected override BeatmapConverter<TestHitObject> CreateBeatmapConverter() => new TestBeatmapConverter();
-
-            protected override Playfield CreatePlayfield() => new TestPlayfield(scrollingAxes);
-
-            protected override DrawableHitObject<TestHitObject> GetVisualRepresentation(TestHitObject h) => new DrawableTestHitObject(scrollingAxes, h);
-        }
-
-        private class TestScoreProcessor : ScoreProcessor<TestHitObject>
-        {
-            protected override void OnNewJudgement(Judgement judgement)
-            {
-            }
-        }
-
-        private class TestBeatmapConverter : BeatmapConverter<TestHitObject>
-        {
-            protected override IEnumerable<Type> ValidConversionTypes => new[] { typeof(HitObject) };
-
-            protected override IEnumerable<TestHitObject> ConvertHitObject(HitObject original, Beatmap beatmap)
-            {
-                yield return original as TestHitObject;
-            }
-        }
-
-        private class DrawableTestHitObject : DrawableScrollingHitObject<TestHitObject>
-        {
-            public DrawableTestHitObject(Axes scrollingAxes, TestHitObject hitObject)
-                : base(hitObject)
-            {
-                Anchor = scrollingAxes == Axes.Y ? Anchor.TopCentre : Anchor.CentreLeft;
-                Origin = Anchor.Centre;
-
-                AutoSizeAxes = Axes.Both;
-
-                Add(new Circle
-                {
-                    Size = new Vector2(50)
-                });
-            }
-
-            protected override void UpdateState(ArmedState state)
-            {
-            }
-        }
-
-        private class TestPlayfield : ScrollingPlayfield
-        {
-            protected override Container<Drawable> Content => content;
-            private readonly Container<Drawable> content;
-
-            public TestPlayfield(Axes scrollingAxes)
-                : base(scrollingAxes)
-            {
-                InternalChildren = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Alpha = 0.2f
-                    },
-                    content = new Container { RelativeSizeAxes = Axes.Both }
-                };
-            }
-
-            public void Reverse() => Reversed.Toggle();
-        }
-
-
-        private class TestHitObject : HitObject
-        {
-        }
-    }
-}

osu.Game.Tests/Visual/TestCaseSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;

osu.Game.Tests/Visual/TestCaseSkipButton.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Screens.Play;

osu.Game.Tests/Visual/TestCaseSocial.cs

@@ -1,13 +1,26 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
+using System.Collections.Generic;
 using osu.Game.Overlays;
+using osu.Game.Overlays.Social;
 using osu.Game.Users;
 
 namespace osu.Game.Tests.Visual
 {
     public class TestCaseSocial : OsuTestCase
     {
+        public override IReadOnlyList<Type> RequiredTypes => new[]
+        {
+            typeof(UserPanel),
+            typeof(SocialPanel),
+            typeof(FilterControl),
+            typeof(SocialOverlay),
+            typeof(SocialGridPanel),
+            typeof(SocialListPanel)
+        };
+
         public TestCaseSocial()
         {
             SocialOverlay s = new SocialOverlay

osu.Game.Tests/Visual/TestCaseSongProgress.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;

osu.Game.Tests/Visual/TestCaseStoryboard.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Allocation;

osu.Game.Tests/Visual/TestCaseTabControl.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseTextAwesome.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseToolbar.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;

osu.Game.Tests/Visual/TestCaseTwoLayerButton.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.ComponentModel;

osu.Game.Tests/Visual/TestCaseUserPanel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseUserProfile.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System;
@@ -42,11 +42,10 @@ namespace osu.Game.Tests.Visual
                 LastVisit = DateTimeOffset.Now,
                 Age = 1,
                 ProfileOrder = new[] { "me" },
-                CountryRank = 1,
                 Statistics = new UserStatistics
                 {
-                    Rank = 2148,
-                    PP = 4567.89m
+                    Ranks = new UserStatistics.UserRanks { Global = 2148, Country = 1 },
+                    PP = 4567.89m,
                 },
                 RankHistory = new User.RankHistoryData
                 {

osu.Game.Tests/Visual/TestCaseUserRanks.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics;

osu.Game.Tests/Visual/TestCaseWaveform.cs

@@ -1,6 +1,7 @@
-// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
+// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using NUnit.Framework;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Allocation;
@@ -15,6 +16,7 @@ using osu.Game.Screens.Edit.Screens.Compose.Timeline;
 
 namespace osu.Game.Tests.Visual
 {
+    [Ignore("CI regularly hangs on this TestCase...")]
     public class TestCaseWaveform : OsuTestCase
     {
         private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();