From ce68b6661e3e957d28a5af0eee817be92b3e9d14 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Fri, 8 Sep 2017 14:15:28 -0300
Subject: [PATCH] Update visual test.

---
 .../Visual/TestCaseBeatmapDetails.cs          | 117 +++++++++++++-----
 osu.Game/Screens/Select/BeatmapDetails.cs     |   4 +-
 2 files changed, 88 insertions(+), 33 deletions(-)

diff --git a/osu.Desktop.Tests/Visual/TestCaseBeatmapDetails.cs b/osu.Desktop.Tests/Visual/TestCaseBeatmapDetails.cs
index 11a15cf56f..7f447337bd 100644
--- a/osu.Desktop.Tests/Visual/TestCaseBeatmapDetails.cs
+++ b/osu.Desktop.Tests/Visual/TestCaseBeatmapDetails.cs
@@ -20,42 +20,97 @@ namespace osu.Desktop.Tests.Visual
             {
                 RelativeSizeAxes = Axes.Both,
                 Padding = new MarginPadding(150),
-                Beatmap = new BeatmapInfo
+            });
+
+            AddStep("beatmap all metrics", () => details.Beatmap = new BeatmapInfo
+            {
+                Version = "All Metrics",
+                Metadata = new BeatmapMetadata
                 {
-                    Version = "VisualTest",
-                    Metadata = new BeatmapMetadata
-                    {
-                        Source = "Some guy",
-                        Tags = "beatmap metadata example with a very very long list of tags and not much creativity",
-                    },
-                    Difficulty = new BeatmapDifficulty
-                    {
-                        CircleSize = 7,
-                        ApproachRate = 3.5f,
-                        OverallDifficulty = 5.7f,
-                        DrainRate = 1,
-                    },
-                    StarDifficulty = 5.3f,
-                    Metrics = new BeatmapMetrics
-                    {
-                        Ratings = Enumerable.Range(0, 10),
-                        Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6),
-                        Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6),
-                    },
+                    Source = "osu!lazer",
+                    Tags = "this beatmap has all the metrics",
+                },
+                Difficulty = new BeatmapDifficulty
+                {
+                    CircleSize = 7,
+                    DrainRate = 1,
+                    OverallDifficulty = 5.7f,
+                    ApproachRate = 3.5f,
+                },
+                StarDifficulty = 5.3f,
+                Metrics = new BeatmapMetrics
+                {
+                    Ratings = Enumerable.Range(0, 10),
+                    Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6),
+                    Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6),
                 },
             });
 
-            AddRepeatStep("fail values", newRetryAndFailValues, 10);
-        }
+            AddStep("beatmap ratings", () => details.Beatmap = new BeatmapInfo
+            {
+                Version = "Only Ratings",
+                Metadata = new BeatmapMetadata
+                {
+                    Source = "osu!lazer",
+                    Tags = "this beatmap has ratings metrics but not retries or fails",
+                },
+                Difficulty = new BeatmapDifficulty
+                {
+                    CircleSize = 6,
+                    DrainRate = 9,
+                    OverallDifficulty = 6,
+                    ApproachRate = 6,
+                },
+                StarDifficulty = 4.8f,
+                Metrics = new BeatmapMetrics
+                {
+                    Ratings = Enumerable.Range(0, 10),
+                },
+            });
 
-        private int lastRange = 1;
+            AddStep("beatmap fails retries", () => details.Beatmap = new BeatmapInfo
+            {
+                Version = "Only Retries and Fails",
+                Metadata = new BeatmapMetadata
+                {
+                    Source = "osu!lazer",
+                    Tags = "this beatmap has retries and fails but no ratings",
+                },
+                Difficulty = new BeatmapDifficulty
+                {
+                    CircleSize = 3.7f,
+                    DrainRate = 6,
+                    OverallDifficulty = 6,
+                    ApproachRate = 7,
+                },
+                StarDifficulty = 2.91f,
+                Metrics = new BeatmapMetrics
+                {
+                    Fails = Enumerable.Range(1, 100).Select(i => i % 12 - 6),
+                    Retries = Enumerable.Range(-2, 100).Select(i => i % 12 - 6),
+                },
+            });
 
-        private void newRetryAndFailValues()
-        {
-            details.Beatmap.Metrics.Fails = Enumerable.Range(lastRange, 100).Select(i => i % 12 - 6);
-            details.Beatmap.Metrics.Retries = Enumerable.Range(lastRange - 3, 100).Select(i => i % 12 - 6);
-            details.Beatmap = details.Beatmap;
-            lastRange += 100;
+            AddStep("beatmap no metrics", () => details.Beatmap = new BeatmapInfo
+            {
+                Version = "No Metrics",
+                Metadata = new BeatmapMetadata
+                {
+                    Source = "osu!lazer",
+                    Tags = "this beatmap has no metrics",
+                },
+                Difficulty = new BeatmapDifficulty
+                {
+                    CircleSize = 5,
+                    DrainRate = 5,
+                    OverallDifficulty = 5.5f,
+                    ApproachRate = 6.5f,
+                },
+                StarDifficulty = 1.97f,
+                Metrics = new BeatmapMetrics(),
+            });
+
+            AddStep("null beatmap", () => details.Beatmap = null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 7c3b8ba905..b389489e0f 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -215,8 +215,8 @@ namespace osu.Game.Screens.Select
 
         private void displayMetrics(BeatmapMetrics metrics, bool failOnMissing = true)
         {
-            var hasRatings = metrics?.Ratings.Any() ?? false;
-            var hasRetriesFails = (metrics?.Retries.Any() ?? false) && metrics.Fails.Any();
+            var hasRatings = metrics?.Ratings?.Any() ?? false;
+            var hasRetriesFails = (metrics?.Retries?.Any() ?? false) && (metrics?.Fails?.Any() ?? false);
 
             if (failOnMissing) loading.Hide();