From 1543fd7fff3b3f3a7ce07caa3ed19846b6587df7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 4 Jun 2011 00:20:54 +0100
Subject: extend TestGiveInventoryFolder() to check for the receipt by user 2

---
 .../Framework/Scenes/Tests/UserInventoryTests.cs    |  6 ++++--
 .../Tests/Common/Helpers/UserInventoryHelpers.cs    | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index 651df3e..c6bd296 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 e33145f..03215f2 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;
         }
+
+        /// <summary>
+        /// Get the inventory folder that matches the path name.  If there are multiple folders then only the first
+        /// is returned.
+        /// </summary>
+        /// <param name="inventoryService"></param>
+        /// <param name="userId"></param>
+        /// <param name="path"></param>
+        /// <returns>null if no folder matching the path was found</returns>
+        public static InventoryFolderBase GetInventoryFolder(IInventoryService inventoryService, UUID userId, string path)
+        {
+            List<InventoryFolderBase> folders
+                = InventoryArchiveUtils.FindFolderByPath(inventoryService, userId, path);
+
+            if (folders.Count != 0)
+                return folders[0];
+            else
+                return null;
+        }
     }
 }
\ No newline at end of file
-- 
cgit v1.1