Correct error and unit test

refs idaholab#29141
loganharbour · Nov 30, 2024 · d5f5a67 · d5f5a67
1 parent 62b2473
commit d5f5a67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/framework/src/base/Registry.C b/framework/src/base/Registry.C
@@ -95,7 +95,7 @@ Registry::addDataFilePath(const std::string & name, const std::string & in_tree_
 
   // Enforce that the folder is called "data", because we rely on the installed path
   // to be within PREFIX/share/<name>/data (see determineDataFilePath())
-  const auto folder = MooseUtils::shortName(in_tree_path);
+  const std::string folder = std::filesystem::path(in_tree_path).filename().c_str();
   if (folder != "data")
     mooseError("While registering data file path '",
                in_tree_path,

diff --git a/unit/src/RegistryTest.C b/unit/src/RegistryTest.C
@@ -80,8 +80,8 @@ TEST_F(RegistryTest, appNameFromAppPathFailed)
 TEST_F(RegistryTest, addDataFilePathNonDataFolder)
 {
   const std::string name = "non_data_folder";
-  const std::string path = "foo";
-  const std::string abs_path = MooseUtils::absolutePath(path);
+  const std::string path = "files/data_file_tests/data0";
+  const std::string folder = std::filesystem::path(path).filename().c_str();
 
   EXPECT_THROW(
       {
@@ -92,8 +92,8 @@ TEST_F(RegistryTest, addDataFilePathNonDataFolder)
         catch (const std::exception & e)
         {
           EXPECT_EQ(std::string(e.what()),
-                    "While registering data file path '" + abs_path + "' for '" + name +
-                        "': The folder must be named 'data' and it is named '" + path + "'");
+                    "While registering data file path '" + path + "' for '" + name +
+                        "': The folder must be named 'data' and it is named '" + folder + "'");
           throw;
         }
       },