From e9cc22fea48a6d80fccbd624fd9710dfa3830980 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 16 Feb 2013 00:26:21 +0000
Subject: Add regression test TestSaveNonRootFolderToIar
---
.../Tests/Common/Helpers/UserInventoryHelpers.cs | 109 +++++++++++++++++----
1 file changed, 89 insertions(+), 20 deletions(-)
(limited to 'OpenSim/Tests/Common')
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 87d9410..a1794c9 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -45,6 +45,9 @@ namespace OpenSim.Tests.Common
///
/// Add an existing scene object as an item in the user's inventory.
///
+ ///
+ /// Will be added to the system Objects folder.
+ ///
///
///
///
@@ -63,7 +66,29 @@ namespace OpenSim.Tests.Common
}
///
- /// Creates a notecard in the objects folder and specify an item id.
+ /// Add an existing scene object as an item in the user's inventory at the given path.
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The inventory item created.
+ public static InventoryItemBase AddInventoryItem(
+ Scene scene, SceneObjectGroup so, int inventoryIdTail, int assetIdTail, string path)
+ {
+ return AddInventoryItem(
+ scene,
+ so.Name,
+ TestHelpers.ParseTail(inventoryIdTail),
+ InventoryType.Object,
+ AssetHelpers.CreateAsset(TestHelpers.ParseTail(assetIdTail), so),
+ so.OwnerID,
+ path);
+ }
+
+ ///
+ /// Adds the given item to the existing system folder for its type (e.g. an object will go in the "Objects"
+ /// folder).
///
///
///
@@ -75,6 +100,25 @@ namespace OpenSim.Tests.Common
private static InventoryItemBase AddInventoryItem(
Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId)
{
+ return AddInventoryItem(
+ scene, itemName, itemId, itemType, asset, userId,
+ scene.InventoryService.GetFolderForType(userId, (AssetType)asset.Type).Name);
+ }
+
+ ///
+ /// Adds the given item to an inventory folder
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The serialized asset for this item
+ ///
+ /// Existing inventory path at which to add.
+ ///
+ private static InventoryItemBase AddInventoryItem(
+ Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId, string path)
+ {
scene.AssetService.Store(asset);
InventoryItemBase item = new InventoryItemBase();
@@ -85,7 +129,7 @@ namespace OpenSim.Tests.Common
item.AssetType = asset.Type;
item.InvType = (int)itemType;
- InventoryFolderBase folder = scene.InventoryService.GetFolderForType(userId, (AssetType)asset.Type);
+ InventoryFolderBase folder = InventoryArchiveUtils.FindFoldersByPath(scene.InventoryService, userId, path)[0];
item.Folder = folder.ID;
scene.AddInventoryItem(item);
@@ -156,58 +200,83 @@ namespace OpenSim.Tests.Common
///
/// Create inventory folders starting from the user's root folder.
///
- ///
- /// Ignores any existing folders with the same name
- ///
///
///
///
/// The folders to create. Multiple folders can be specified on a path delimited by the PATH_DELIMITER
///
+ ///
+ /// If true, then folders in the path which already the same name are
+ /// used. This applies to the terminal folder as well.
+ /// If false, then all folders in the path are created, even if there is already a folder at a particular
+ /// level with the same name.
+ ///
///
/// The folder created. If the path contains multiple folders then the last one created is returned.
/// Will return null if the root folder could not be found.
///
public static InventoryFolderBase CreateInventoryFolder(
- IInventoryService inventoryService, UUID userId, string path)
+ IInventoryService inventoryService, UUID userId, string path, bool useExistingFolders)
{
InventoryFolderBase rootFolder = inventoryService.GetRootFolder(userId);
if (null == rootFolder)
return null;
- return CreateInventoryFolder(inventoryService, rootFolder, path);
+ return CreateInventoryFolder(inventoryService, rootFolder, path, useExistingFolders);
}
///
/// Create inventory folders starting from a given parent folder
///
- ///
- /// Ignores any existing folders with the same name
- ///
+ ///
+ /// If any stem of the path names folders that already exist then these are not recreated. This includes the
+ /// final folder.
+ /// TODO: May need to make it an option to create duplicate folders.
+ ///
///
///
///
- /// The folders to create. Multiple folders can be specified on a path delimited by the PATH_DELIMITER
+ /// The folder to create.
+ ///
+ ///
+ /// If true, then folders in the path which already the same name are
+ /// used. This applies to the terminal folder as well.
+ /// If false, then all folders in the path are created, even if there is already a folder at a particular
+ /// level with the same name.
///
///
/// The folder created. If the path contains multiple folders then the last one created is returned.
///
public static InventoryFolderBase CreateInventoryFolder(
- IInventoryService inventoryService, InventoryFolderBase parentFolder, string path)
+ IInventoryService inventoryService, InventoryFolderBase parentFolder, string path, bool useExistingFolders)
{
string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None);
- InventoryFolderBase newFolder
- = new InventoryFolderBase(
- UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
-
- inventoryService.AddFolder(newFolder);
+ InventoryFolderBase folder = null;
+
+ if (useExistingFolders)
+ folder = InventoryArchiveUtils.FindFolderByPath(inventoryService, parentFolder, components[0]);
+
+ if (folder == null)
+ {
+// Console.WriteLine("Creating folder {0} at {1}", components[0], parentFolder.Name);
+
+ folder
+ = new InventoryFolderBase(
+ UUID.Random(), components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0);
+
+ inventoryService.AddFolder(folder);
+ }
+// else
+// {
+// Console.WriteLine("Found existing folder {0}", folder.Name);
+// }
if (components.Length > 1)
- return CreateInventoryFolder(inventoryService, newFolder, components[1]);
+ return CreateInventoryFolder(inventoryService, folder, components[1], useExistingFolders);
else
- return newFolder;
+ return folder;
}
///
@@ -237,7 +306,7 @@ namespace OpenSim.Tests.Common
/// An empty list if no matching folders were found
public static List GetInventoryFolders(IInventoryService inventoryService, UUID userId, string path)
{
- return InventoryArchiveUtils.FindFolderByPath(inventoryService, userId, path);
+ return InventoryArchiveUtils.FindFoldersByPath(inventoryService, userId, path);
}
///
--
cgit v1.1