From afc48d86df1be79ca37d02cb3fdee604d7f7ecaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 23 Jan 2022 19:50:02 +0100
Subject: [PATCH] Add failing test coverage for save after safeties addition

---
 .../Editing/TestSceneEditorBeatmapCreation.cs       |  1 +
 osu.Game/Screens/Edit/Editor.cs                     | 13 +++++++++----
 osu.Game/Tests/Visual/EditorTestScene.cs            |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
index 31348c1e17..a14c9aded3 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorBeatmapCreation.cs
@@ -109,6 +109,7 @@ namespace osu.Game.Tests.Visual.Editing
                        && set != null
                        && set.PerformRead(s => s.Beatmaps.Single().ID == beatmap.ID);
             });
+            AddAssert("can save again", () => Editor.Save());
 
             AddStep("create new difficulty", () => Editor.CreateNewDifficulty(new OsuRuleset().RulesetInfo));
             AddUntilStep("wait for created", () =>
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 64b23ccda8..78c5c862f7 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -378,12 +378,16 @@ namespace osu.Game.Screens.Edit
             Clipboard.Content.Value = state.ClipboardContent;
         });
 
-        protected void Save()
+        /// <summary>
+        /// Saves the currently edited beatmap.
+        /// </summary>
+        /// <returns>Whether the save was successful.</returns>
+        protected bool Save()
         {
             if (!canSave)
             {
                 notifications?.Post(new SimpleErrorNotification { Text = "Saving is not supported for this ruleset yet, sorry!" });
-                return;
+                return false;
             }
 
             try
@@ -395,12 +399,13 @@ namespace osu.Game.Screens.Edit
             {
                 // can fail e.g. due to duplicated difficulty names.
                 Logger.Error(ex, ex.Message);
-                return;
+                return false;
             }
 
             // no longer new after first user-triggered save.
             isNewBeatmap = false;
             updateLastSavedHash();
+            return true;
         }
 
         protected override void Update()
@@ -809,7 +814,7 @@ namespace osu.Game.Screens.Edit
         {
             var fileMenuItems = new List<MenuItem>
             {
-                new EditorMenuItem("Save", MenuItemType.Standard, Save)
+                new EditorMenuItem("Save", MenuItemType.Standard, () => Save())
             };
 
             if (RuntimeInfo.IsDesktop)
diff --git a/osu.Game/Tests/Visual/EditorTestScene.cs b/osu.Game/Tests/Visual/EditorTestScene.cs
index 52d61ed422..da13c6862f 100644
--- a/osu.Game/Tests/Visual/EditorTestScene.cs
+++ b/osu.Game/Tests/Visual/EditorTestScene.cs
@@ -97,7 +97,7 @@ namespace osu.Game.Tests.Visual
 
             public new void Redo() => base.Redo();
 
-            public new void Save() => base.Save();
+            public new bool Save() => base.Save();
 
             public new void Cut() => base.Cut();