diff options
author | Justin Clark-Casey (justincc) | 2011-06-04 02:44:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-06-04 02:44:53 +0100 |
commit | fe471b64245f99a895d661a8952fc3c226ba6bfe (patch) | |
tree | 1b357992d0b320b429706392226d6eb7dc08f993 /OpenSim/Tests/Common | |
parent | Fix give inventory tests to use different users rather than (accidentally) th... (diff) | |
download | opensim-SC-fe471b64245f99a895d661a8952fc3c226ba6bfe.zip opensim-SC-fe471b64245f99a895d661a8952fc3c226ba6bfe.tar.gz opensim-SC-fe471b64245f99a895d661a8952fc3c226ba6bfe.tar.bz2 opensim-SC-fe471b64245f99a895d661a8952fc3c226ba6bfe.tar.xz |
Extend TestGiveInventoryFolder() to test giving back the freshly received folder
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index 875bf4a..1703597 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
@@ -147,8 +147,7 @@ namespace OpenSim.Tests.Common | |||
147 | /// <returns>null if no folder matching the path was found</returns> | 147 | /// <returns>null if no folder matching the path was found</returns> |
148 | public static InventoryFolderBase GetInventoryFolder(IInventoryService inventoryService, UUID userId, string path) | 148 | public static InventoryFolderBase GetInventoryFolder(IInventoryService inventoryService, UUID userId, string path) |
149 | { | 149 | { |
150 | List<InventoryFolderBase> folders | 150 | List<InventoryFolderBase> folders = GetInventoryFolders(inventoryService, userId, path); |
151 | = InventoryArchiveUtils.FindFolderByPath(inventoryService, userId, path); | ||
152 | 151 | ||
153 | if (folders.Count != 0) | 152 | if (folders.Count != 0) |
154 | return folders[0]; | 153 | return folders[0]; |
@@ -157,6 +156,18 @@ namespace OpenSim.Tests.Common | |||
157 | } | 156 | } |
158 | 157 | ||
159 | /// <summary> | 158 | /// <summary> |
159 | /// Get the inventory folders that match the path name. | ||
160 | /// </summary> | ||
161 | /// <param name="inventoryService"></param> | ||
162 | /// <param name="userId"></param> | ||
163 | /// <param name="path"></param> | ||
164 | /// <returns>An empty list if no matching folders were found</returns> | ||
165 | public static List<InventoryFolderBase> GetInventoryFolders(IInventoryService inventoryService, UUID userId, string path) | ||
166 | { | ||
167 | return InventoryArchiveUtils.FindFolderByPath(inventoryService, userId, path); | ||
168 | } | ||
169 | |||
170 | /// <summary> | ||
160 | /// Get the inventory item that matches the path name. If there are multiple items then only the first | 171 | /// Get the inventory item that matches the path name. If there are multiple items then only the first |
161 | /// is returned. | 172 | /// is returned. |
162 | /// </summary> | 173 | /// </summary> |