#5825: Add unit test checking the support of absolute paths as snapsh…

…ot folder
codereader · Feb 27, 2022 · b90cf49 · b90cf49
1 parent 3b1ae25
commit b90cf49
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/radiantcore/map/autosaver/AutoSaver.cpp b/radiantcore/map/autosaver/AutoSaver.cpp
@@ -86,13 +86,15 @@ void AutoMapSaver::saveSnapshot()
         fullPath = GlobalFileSystem().findFile(fullPath.string()) + fullPath.string();
     }
 
-	// Append the the snapshot folder to the path
+	// Assemble the absolute path to the snapshot folder
 	fs::path snapshotPath = fullPath;
 	snapshotPath.remove_filename();
+
+    // If the snapshots folder in the registry is absolute, operator/= will use the absolute one
 	snapshotPath /= GlobalRegistry().get(RKEY_AUTOSAVE_SNAPSHOTS_FOLDER);
 
 	// Retrieve the mapname
-	std::string mapName = fullPath.filename().string();
+	auto mapName = fullPath.filename().string();
 
 	// Check if the folder exists and create it if necessary
 	if (os::fileOrDirExists(snapshotPath.string()) || os::makeDirectory(snapshotPath.string()))
@@ -115,8 +117,7 @@ void AutoMapSaver::saveSnapshot()
 	}
 	else
 	{
-		rError() << "Snapshot save failed.. unable to create directory";
-		rError() << snapshotPath << std::endl;
+		rError() << "Snapshot save failed, unable to create directory " << snapshotPath << std::endl;
 	}
 }
 

diff --git a/test/MapSavingLoading.cpp b/test/MapSavingLoading.cpp
@@ -1312,6 +1312,35 @@ TEST_F(MapSavingTest, AutoSaveSnapshotsSupportRelativePaths)
     }
 }
 
+TEST_F(MapSavingTest, AutoSaveSnapshotsSupportAbsolutePaths)
+{
+    std::string modRelativePath = "maps/altar.map";
+    GlobalCommandSystem().executeCommand("OpenMap", modRelativePath);
+    checkAltarScene();
+
+    // Set this to an absolute path
+    auto snapshotFolder = _context.getTemporaryDataPath() + "customsnapshots/";
+    registry::setValue(map::RKEY_AUTOSAVE_SNAPSHOTS_ENABLED, true);
+    registry::setValue(map::RKEY_AUTOSAVE_SNAPSHOTS_FOLDER, snapshotFolder);
+
+    // We expect the file to end up there
+    std::string expectedSnapshotPath = snapshotFolder + "altar.0.map";
+
+    EXPECT_FALSE(GlobalFileSystem().openTextFileInAbsolutePath(expectedSnapshotPath)) << "Snapshot already exists in " << expectedSnapshotPath;
+
+    // Trigger an auto save now
+    GlobalAutoSaver().performAutosave();
+
+    EXPECT_TRUE(GlobalFileSystem().openTextFileInAbsolutePath(expectedSnapshotPath)) << "Snapshot should now exist in " << expectedSnapshotPath;
+
+    // Load and confirm the saved scene
+    GlobalCommandSystem().executeCommand("OpenMap", expectedSnapshotPath);
+    checkAltarScene();
+
+    fs::remove(os::replaceExtension(expectedSnapshotPath, "darkradiant"));
+    fs::remove(expectedSnapshotPath);
+}
+
 namespace
 {