Establish CachedUserInfo.OnInventoryReceived event so that region/test inventory code can be written with the async inventory fetch

1 files changed, 36 insertions, 6 deletions

diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index fc41166..f146a15 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -41,28 +41,58 @@ namespace OpenSim.Tests.Common.Setup
         /// Create a test user with a standard inventory
         /// </summary>
         /// <param name="commsManager"></param>
+        /// <param name="callback">
+        /// Callback to invoke when inventory has been loaded.  This is required because
+        /// loading may be asynchronous, even on standalone
+        /// </param>
         /// <returns></returns>
-        public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager)
+        public static CachedUserInfo CreateUserWithInventory(
+            CommunicationsManager commsManager, OnInventoryReceivedDelegate callback)
         {
             UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
-            return CreateUserWithInventory(commsManager, userId);
+            return CreateUserWithInventory(commsManager, userId, callback);
         }        
         
         /// <summary>
         /// Create a test user with a standard inventory
         /// </summary>
         /// <param name="commsManager"></param>
-        /// <param name="userId">Explicit user id to use for user creation</param>
+        /// <param name="userId">User ID</param>
+        /// <param name="callback">
+        /// Callback to invoke when inventory has been loaded.  This is required because
+        /// loading may be asynchronous, even on standalone
+        /// </param>
         /// <returns></returns>
-        public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager, UUID userId)
+        public static CachedUserInfo CreateUserWithInventory(
+            CommunicationsManager commsManager, UUID userId, OnInventoryReceivedDelegate callback)
+        {                                    
+            return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
+        }
+
+        /// <summary>
+        /// Create a test user with a standard inventory
+        /// </summary>
+        /// <param name="commsManager"></param>
+        /// <param name="firstName">First name of user</param>
+        /// <param name="lastName">Last name of user</param>
+        /// <param name="userId">User ID</param>
+        /// <param name="callback">
+        /// Callback to invoke when inventory has been loaded.  This is required because
+        /// loading may be asynchronous, even on standalone
+        /// </param>
+        /// <returns></returns>
+        public static CachedUserInfo CreateUserWithInventory(
+            CommunicationsManager commsManager, string firstName, string lastName, 
+            UUID userId, OnInventoryReceivedDelegate callback)
         {                        
             LocalUserServices lus = (LocalUserServices)commsManager.UserService;           
-            lus.AddUser("Bill", "Bailey", "troll", "bill@bailey.com", 1000, 1000, userId);
+            lus.AddUser(firstName, lastName, "troll", "bill@bailey.com", 1000, 1000, userId);
             
             CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
+            userInfo.OnInventoryReceived += callback;
             userInfo.FetchInventory();
             
             return userInfo;
-        }
+        }        
     }
 }