From 9a7e5a3e2c26a8113a3b3182e750ca76d1306a17 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Tue, 29 May 2018 04:16:19 -0300
Subject: [PATCH] Update TestCaseMatch.

---
 osu.Game.Tests/Visual/TestCaseMatch.cs        | 47 +++++++++++++++++++
 osu.Game.Tests/Visual/TestCaseMatchInfo.cs    |  4 +-
 osu.Game/Screens/Multi/Screens/Match/Match.cs |  2 +-
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tests/Visual/TestCaseMatch.cs b/osu.Game.Tests/Visual/TestCaseMatch.cs
index 69c1a6a0b2..bb22358425 100644
--- a/osu.Game.Tests/Visual/TestCaseMatch.cs
+++ b/osu.Game.Tests/Visual/TestCaseMatch.cs
@@ -89,6 +89,53 @@ namespace osu.Game.Tests.Visual
             Match match = new Match(room);
 
             AddStep(@"show", () => Add(match));
+            AddStep(@"null beatmap", () => room.Beatmap.Value = null);
+            AddStep(@"change name", () => room.Name.Value = @"Two Awesome Rooms");
+            AddStep(@"change status", () => room.Status.Value = new RoomStatusPlaying());
+            AddStep(@"change availability", () => room.Availability.Value = RoomAvailability.FriendsOnly);
+            AddStep(@"change type", () => room.Type.Value = new GameTypeTag());
+            AddStep(@"change beatmap", () => room.Beatmap.Value = new BeatmapInfo
+            {
+                StarDifficulty = 4.33,
+                Ruleset = rulesets.GetRuleset(2),
+                Metadata = new BeatmapMetadata
+                {
+                    Title = @"Yasashisa no Riyuu",
+                    Artist = @"ChouCho",
+                    AuthorString = @"celerih",
+                },
+                BeatmapSet = new BeatmapSetInfo
+                {
+                    OnlineInfo = new BeatmapSetOnlineInfo
+                    {
+                        Covers = new BeatmapSetOnlineCovers
+                        {
+                            Cover = @"https://assets.ppy.sh/beatmaps/685391/covers/cover.jpg?1524597970",
+                        },
+                    },
+                },
+            });
+
+            AddStep(@"null max participants", () => room.MaxParticipants.Value = null);
+            AddStep(@"change participants", () => room.Participants.Value = new[]
+            {
+                new User
+                {
+                    Username = @"Spectator",
+                    Id = 702598,
+                    Country = new Country { FlagName = @"KR" },
+                    CoverUrl = @"https://assets.ppy.sh/user-profile-covers/702598/3bbf4cb8b8d2cf8b03145000a975ff27e191ab99b0920832e7dd67386280e288.jpeg",
+                    IsSupporter = true,
+                },
+                new User
+                {
+                    Username = @"celerih",
+                    Id = 4696296,
+                    Country = new Country { FlagName = @"CA" },
+                    CoverUrl = @"https://assets.ppy.sh/user-profile-covers/4696296/7f8500731d0ac66d5472569d146a7be07d9460273361913f22c038867baddaef.jpeg",
+                },
+            });
+
             AddStep(@"exit", match.Exit);
         }
     }
diff --git a/osu.Game.Tests/Visual/TestCaseMatchInfo.cs b/osu.Game.Tests/Visual/TestCaseMatchInfo.cs
index da5f429363..205da6932f 100644
--- a/osu.Game.Tests/Visual/TestCaseMatchInfo.cs
+++ b/osu.Game.Tests/Visual/TestCaseMatchInfo.cs
@@ -39,6 +39,8 @@ namespace osu.Game.Tests.Visual
             AddStep(@"change name", () => info.Name = @"Room Name!");
             AddStep(@"change availability", () => info.Availability = RoomAvailability.InviteOnly);
             AddStep(@"change status", () => info.Status = new RoomStatusOpen());
+            AddStep(@"null beatmap", () => info.Beatmap = null);
+            AddStep(@"change type", () => info.Type = new GameTypeTeamVersus());
             AddStep(@"change beatmap", () => info.Beatmap = new BeatmapInfo
             {
                 StarDifficulty = 4.2,
@@ -50,8 +52,6 @@ namespace osu.Game.Tests.Visual
                     AuthorString = @"Someone",
                 },
             });
-
-            AddStep(@"change type", () => info.Type = new GameTypeTeamVersus());
         }
     }
 }
diff --git a/osu.Game/Screens/Multi/Screens/Match/Match.cs b/osu.Game/Screens/Multi/Screens/Match/Match.cs
index 3a2aef2ff4..525682e9c5 100644
--- a/osu.Game/Screens/Multi/Screens/Match/Match.cs
+++ b/osu.Game/Screens/Multi/Screens/Match/Match.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Screens.Multi.Screens.Match
 
             beatmapBind.ValueChanged += b =>
             {
-                header.BeatmapSet = b.BeatmapSet;
+                header.BeatmapSet = b?.BeatmapSet;
                 info.Beatmap = b;
             };