Merge remote-tracking branch 'upstream/master' into desktop-unit-tests

osu.Desktop.VisualTests/Tests/TestCaseNotificationManager.cs

@@ -0,0 +1,121 @@
+// 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.Collections.Generic;
+using osu.Framework.Graphics;
+using osu.Framework.GameModes.Testing;
+using osu.Framework.MathUtils;
+using osu.Framework.Timing;
+using osu.Game.Overlays;
+using System.Linq;
+using osu.Game.Overlays.Notifications;
+using osu.Game.Screens.Backgrounds;
+
+namespace osu.Desktop.VisualTests.Tests
+{
+    class TestCaseNotificationManager : TestCase
+    {
+        public override string Name => @"Notification Manager";
+        public override string Description => @"I handle notifications";
+
+        NotificationManager manager;
+
+        public override void Reset()
+        {
+            base.Reset();
+
+            progressingNotifications.Clear();
+
+            AddInternal(new BackgroundModeDefault() { Depth = 10 });
+
+            Content.Add(manager = new NotificationManager
+            {
+                Anchor = Anchor.TopRight,
+                Origin = Anchor.TopRight,
+            });
+
+            AddToggle(@"show", manager.ToggleVisibility);
+
+            AddButton(@"simple #1", sendNotification1);
+            AddButton(@"simple #2", sendNotification2);
+            AddButton(@"progress #1", sendProgress1);
+            AddButton(@"progress #2", sendProgress2);
+            AddButton(@"barrage", () => sendBarrage());
+        }
+
+        private void sendBarrage(int remaining = 100)
+        {
+            switch (RNG.Next(0, 4))
+            {
+                case 0:
+                    sendNotification1();
+                    break;
+                case 1:
+                    sendNotification2();
+                    break;
+                case 2:
+                    sendProgress1();
+                    break;
+                case 3:
+                    sendProgress2();
+                    break;
+            }
+
+            if (remaining > 0)
+            {
+                Delay(80);
+                Schedule(() => sendBarrage(remaining - 1));
+            }
+        }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            progressingNotifications.RemoveAll(n => n.State == ProgressNotificationState.Completed);
+
+            while (progressingNotifications.Count(n => n.State == ProgressNotificationState.Active) < 3)
+            {
+                var p = progressingNotifications.FirstOrDefault(n => n.IsLoaded && n.State == ProgressNotificationState.Queued);
+                if (p == null)
+                    break;
+
+                p.State = ProgressNotificationState.Active;
+            }
+
+            foreach (var n in progressingNotifications.FindAll(n => n.State == ProgressNotificationState.Active))
+            {
+                if (n.Progress < 1)
+                    n.Progress += (float)(Time.Elapsed / 2000) * RNG.NextSingle();
+                else
+                    n.Complete();
+            }
+        }
+
+        private void sendProgress2()
+        {
+            var n = new ProgressNotification(@"Downloading Haitai...");
+            manager.Post(n);
+            progressingNotifications.Add(n);
+        }
+
+        List<ProgressNotification> progressingNotifications = new List<ProgressNotification>();
+
+        private void sendProgress1()
+        {
+            var n = new ProgressNotification(@"Uploading to BSS...");
+            manager.Post(n);
+            progressingNotifications.Add(n);
+        }
+
+        private void sendNotification2()
+        {
+            manager.Post(new SimpleNotification(@"You are amazing"));
+        }
+
+        private void sendNotification1()
+        {
+            manager.Post(new SimpleNotification(@"Welcome to osu!. Enjoy your stay!"));
+        }
+    }
+}

osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

@@ -176,6 +176,7 @@
     <Compile Include="Tests\TestCaseChatDisplay.cs" />
     <Compile Include="Tests\TestCaseGamefield.cs" />
     <Compile Include="Tests\TestCaseMusicController.cs" />
+    <Compile Include="Tests\TestCaseNotificationManager.cs" />
     <Compile Include="Tests\TestCasePlayer.cs" />
     <Compile Include="Tests\TestCaseHitObjects.cs" />
     <Compile Include="Tests\TestCaseKeyCounter.cs" />