From b45d7de4eccbd9aecbf621afefc6661ca986fa9e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 13 Apr 2021 15:04:01 +0900
Subject: [PATCH] Update asserts to use better nunit specifications

---
 .../Checks/CheckOffscreenObjectsTest.cs       | 29 ++++++-------------
 .../Editing/Checks/CheckBackgroundTest.cs     | 16 ++++------
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
index 4a5e4e18c0..9f9ba0e8db 100644
--- a/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Editor/Checks/CheckOffscreenObjectsTest.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
 using osu.Game.Beatmaps;
+using osu.Game.Rulesets.Edit.Checks.Components;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Osu.Edit.Checks;
@@ -42,9 +43,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -62,9 +61,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -124,9 +121,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -149,9 +144,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
                 }
             };
 
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -252,21 +245,17 @@ namespace osu.Game.Rulesets.Osu.Tests.Editor.Checks
         private void assertOffscreenCircle(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenCircle);
         }
 
         private void assertOffscreenSlider(IBeatmap beatmap)
         {
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckOffscreenObjects.IssueTemplateOffscreenSlider);
         }
     }
 }
diff --git a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
index 327abcab6c..635e3bb0f3 100644
--- a/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
+++ b/osu.Game.Tests/Editing/Checks/CheckBackgroundTest.cs
@@ -39,9 +39,7 @@ namespace osu.Game.Tests.Editing.Checks
         [Test]
         public void TestBackgroundSetAndInFiles()
         {
-            var issues = check.Run(beatmap);
-
-            Assert.That(!issues.Any());
+            Assert.That(check.Run(beatmap), Is.Empty);
         }
 
         [Test]
@@ -50,11 +48,9 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.BeatmapInfo.BeatmapSet.Files.Clear();
 
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckBackground.IssueTemplateDoesNotExist);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateDoesNotExist);
         }
 
         [Test]
@@ -63,11 +59,9 @@ namespace osu.Game.Tests.Editing.Checks
             beatmap.Metadata.BackgroundFile = null;
 
             var issues = check.Run(beatmap).ToList();
-            var issue = issues.FirstOrDefault();
 
-            Assert.That(issues.Count == 1);
-            Assert.That(issue != null);
-            Assert.That(issue.Template is CheckBackground.IssueTemplateNoneSet);
+            Assert.That(issues, Has.Count.EqualTo(1));
+            Assert.That(issues.Single().Template is CheckBackground.IssueTemplateNoneSet);
         }
     }
 }