From 1e1b2ab221851efc414678b7ea52ef2ca788ce9f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 Jan 2010 10:40:07 -0800
Subject: * OMG! All but one references to UserProfileCacheService have been
 rerouted! * HG is seriously broken here * Compiles. Untested.

---
 OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | 147 +++++++++++----------
 1 file changed, 75 insertions(+), 72 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index cb76bc1..b54299b 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -37,82 +37,85 @@ namespace OpenSim.Tests.Common.Setup
     /// </summary>
     public static class UserProfileTestUtils
     {
-        /// <summary>
-        /// 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, OnInventoryReceivedDelegate callback)
-        {
-            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
-            return CreateUserWithInventory(commsManager, userId, callback);
-        }
+        // REFACTORING PROBLEM
+        // This needs to be rewritten
+
+        ///// <summary>
+        ///// 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, OnInventoryReceivedDelegate callback)
+        //{
+        //    UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
+        //    return CreateUserWithInventory(commsManager, userId, callback);
+        //}
         
-        /// <summary>
-        /// Create a test user with a standard inventory
-        /// </summary>
-        /// <param name="commsManager"></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, 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="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, 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)
-        {
-            return CreateUserWithInventory(commsManager, firstName, lastName, "troll", 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)
+        //{
+        //    return CreateUserWithInventory(commsManager, firstName, lastName, "troll", 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="password">Password</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, string password,
-            UUID userId, OnInventoryReceivedDelegate callback)
-        {
-            LocalUserServices lus = (LocalUserServices)commsManager.UserService;
-            lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId);
+        ///// <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="password">Password</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, string password,
+        //    UUID userId, OnInventoryReceivedDelegate callback)
+        //{
+        //    LocalUserServices lus = (LocalUserServices)commsManager.UserService;
+        //    lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId);
             
-            CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
-            userInfo.OnInventoryReceived += callback;
-            userInfo.FetchInventory();
+        //    CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
+        //    userInfo.OnInventoryReceived += callback;
+        //    userInfo.FetchInventory();
             
-            return userInfo;
-        }
+        //    return userInfo;
+        //}
     }
 }
-- 
cgit v1.1