Merge branch 'master' into refactor-mesh-position-genericrefactor-mesh-position-generic

1 files changed, 23 insertions, 0 deletions

diff --git a/source/blender/blenkernel/intern/asset_library_service_test.cc b/source/blender/blenkernel/intern/asset_library_service_test.cc
index 7952e7ea3b0..18fdcb80155 100644
--- a/source/blender/blenkernel/intern/asset_library_service_test.cc
+++ b/source/blender/blenkernel/intern/asset_library_service_test.cc
@@ -8,6 +8,9 @@
 
 #include "BKE_appdir.h"
 #include "BKE_callbacks.h"
+#include "BKE_main.h"
+
+#include "DNA_asset_types.h"
 
 #include "CLG_log.h"
 
@@ -102,6 +105,26 @@ TEST_F(AssetLibraryServiceTest, library_pointers)
    * cannot be reliably tested by just pointer comparison, though. */
 }
 
+TEST_F(AssetLibraryServiceTest, library_from_reference)
+{
+  AssetLibraryService *service = AssetLibraryService::get();
+  AssetLibrary *const lib = service->get_asset_library_on_disk(asset_library_root_);
+  AssetLibrary *const curfile_lib = service->get_asset_library_current_file();
+
+  AssetLibraryReference ref{};
+  ref.type = ASSET_LIBRARY_LOCAL;
+  EXPECT_EQ(curfile_lib, service->get_asset_library(nullptr, ref))
+      << "Getting the local (current file) reference without a main saved on disk should return "
+         "the current file library";
+
+  Main dummy_main{};
+  std::string dummy_filepath = asset_library_root_ + SEP + "dummy.blend";
+  BLI_strncpy(dummy_main.filepath, dummy_filepath.c_str(), sizeof(dummy_main.filepath));
+  EXPECT_EQ(lib, service->get_asset_library(&dummy_main, ref))
+      << "Getting the local (current file) reference with a main saved on disk should return "
+         "the an asset library for this directory";
+}
+
 TEST_F(AssetLibraryServiceTest, library_path_trailing_slashes)
 {
   AssetLibraryService *service = AssetLibraryService::get();