From 0a6c221de4dda5d3f41c504974f204b79be4f0ab Mon Sep 17 00:00:00 2001
From: tbrose <tbrose@uni-bremen.de>
Date: Mon, 6 Dec 2021 22:07:47 +0100
Subject: [PATCH] Adds tests for checkContainsUsername function of
 MessageNotifier component

---
 .../Online/Chat/MessageNotifierTest.cs        | 66 +++++++++++++++++++
 osu.Game/Online/Chat/MessageNotifier.cs       |  2 +-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 osu.Game.Tests/Online/Chat/MessageNotifierTest.cs

diff --git a/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs b/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs
new file mode 100644
index 0000000000..9fed72d249
--- /dev/null
+++ b/osu.Game.Tests/Online/Chat/MessageNotifierTest.cs
@@ -0,0 +1,66 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using NUnit.Framework;
+using osu.Game.Online.Chat;
+
+namespace osu.Game.Tests.Online.Chat
+{
+    [TestFixture]
+    public class TestCheckUsername
+    {
+        [Test]
+        public void TestContainsUsernameMidlinePositive()
+        {
+            Assert.IsTrue(MessageNotifier.checkContainsUsername("This is a test message", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameStartOfLinePositive()
+        {
+            Assert.IsTrue(MessageNotifier.checkContainsUsername("Test message", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameEndOfLinePositive()
+        {
+            Assert.IsTrue(MessageNotifier.checkContainsUsername("This is a test", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameMidlineNegative()
+        {
+            Assert.IsFalse(MessageNotifier.checkContainsUsername("This is a testmessage for notifications", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameStartOfLineNegative()
+        {
+            Assert.IsFalse(MessageNotifier.checkContainsUsername("Testmessage", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameEndOfLineNegative()
+        {
+            Assert.IsFalse(MessageNotifier.checkContainsUsername("This is a notificationtest", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameBetweenInterpunction()
+        {
+            Assert.IsTrue(MessageNotifier.checkContainsUsername("Hello 'test'-message", "Test"));
+        }
+
+        [Test]
+        public void TestContainsUsernameUnicode()
+        {
+            Assert.IsTrue(MessageNotifier.checkContainsUsername("Test \u0460\u0460 message", "\u0460\u0460"));
+        }
+
+        [Test]
+        public void TestContainsUsernameUnicodeNegative()
+        {
+            Assert.IsFalse(MessageNotifier.checkContainsUsername("Test ha\u0460\u0460o message", "\u0460\u0460"));
+        }
+    }
+}
diff --git a/osu.Game/Online/Chat/MessageNotifier.cs b/osu.Game/Online/Chat/MessageNotifier.cs
index ca6317566f..69b3b18b3e 100644
--- a/osu.Game/Online/Chat/MessageNotifier.cs
+++ b/osu.Game/Online/Chat/MessageNotifier.cs
@@ -129,7 +129,7 @@ namespace osu.Game.Online.Chat
         /// Checks if <paramref name="message"/> contains <paramref name="username"/>.
         /// This will match against the case where underscores are used instead of spaces (which is how osu-stable handles usernames with spaces).
         /// </summary>
-        private static bool checkContainsUsername(string message, string username) => message.Contains(username, StringComparison.OrdinalIgnoreCase) || message.Contains(username.Replace(' ', '_'), StringComparison.OrdinalIgnoreCase);
+        public static bool checkContainsUsername(string message, string username) => message.Contains(username, StringComparison.OrdinalIgnoreCase) || message.Contains(username.Replace(' ', '_'), StringComparison.OrdinalIgnoreCase);
 
         public class PrivateMessageNotification : OpenChannelNotification
         {