diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 651df3ea0d..c6bd296bb9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -66,8 +66,10 @@ namespace OpenSim.Region.Framework.Tests
scene.GiveInventoryFolder(user2.PrincipalID, user1.PrincipalID, folder1.ID, UUID.Zero);
-// InventoryFolderBase receivedFolder1Template = new InventoryFolderBase(
-// InventoryFolderBase receivedFolder1 = scene.InventoryService.GetFolder
+ InventoryFolderBase retrievedFolder1
+ = UserInventoryHelpers.GetInventoryFolder(scene.InventoryService, user2.PrincipalID, "folder1");
+
+ Assert.That(retrievedFolder1, Is.Not.Null);
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index e33145fc7a..03215f25d1 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -26,8 +26,10 @@
*/
using System;
+using System.Collections.Generic;
using OpenMetaverse;
using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
@@ -118,5 +120,24 @@ namespace OpenSim.Tests.Common
else
return newFolder;
}
+
+ ///
+ /// Get the inventory folder that matches the path name. If there are multiple folders then only the first
+ /// is returned.
+ ///
+ ///
+ ///
+ ///
+ /// null if no folder matching the path was found
+ public static InventoryFolderBase GetInventoryFolder(IInventoryService inventoryService, UUID userId, string path)
+ {
+ List folders
+ = InventoryArchiveUtils.FindFolderByPath(inventoryService, userId, path);
+
+ if (folders.Count != 0)
+ return folders[0];
+ else
+ return null;
+ }
}
}
\ No newline at end of file