aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs13
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs128
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs2
3 files changed, 15 insertions, 128 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index fdc20dd..0402883 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Framework.Communications.Tests
54 CachedUserInfo nonExistingUserInfo; 54 CachedUserInfo nonExistingUserInfo;
55 55
56 TestCommunicationsManager commsManager = new TestCommunicationsManager(); 56 TestCommunicationsManager commsManager = new TestCommunicationsManager();
57 Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
57 58
58 // Check we can't retrieve info before it exists by uuid 59 // Check we can't retrieve info before it exists by uuid
59 nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); 60 nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
@@ -116,7 +117,7 @@ namespace OpenSim.Framework.Communications.Tests
116 { 117 {
117 TestHelper.InMethod(); 118 TestHelper.InMethod();
118 119
119 Scene myScene = SceneSetupHelpers.SetupScene(); 120 Scene myScene = SceneSetupHelpers.SetupScene("inventory");
120 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager); 121 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
121 for (int i = 0 ; i < 50 ; i++) 122 for (int i = 0 ; i < 50 ; i++)
122 { 123 {
@@ -132,7 +133,7 @@ namespace OpenSim.Framework.Communications.Tests
132 { 133 {
133 TestHelper.InMethod(); 134 TestHelper.InMethod();
134 135
135 Scene myScene = SceneSetupHelpers.SetupScene(); 136 Scene myScene = SceneSetupHelpers.SetupScene("inventory");
136 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager); 137 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
137 for (int i = 0 ; i < 50 ; i++) 138 for (int i = 0 ; i < 50 ; i++)
138 { 139 {
@@ -154,7 +155,7 @@ namespace OpenSim.Framework.Communications.Tests
154 { 155 {
155 TestHelper.InMethod(); 156 TestHelper.InMethod();
156 157
157 Scene myScene = SceneSetupHelpers.SetupScene(); 158 Scene myScene = SceneSetupHelpers.SetupScene("inventory");
158 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager); 159 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
159 for (int i = 0 ; i < 50 ; i++) 160 for (int i = 0 ; i < 50 ; i++)
160 { 161 {
@@ -190,7 +191,7 @@ namespace OpenSim.Framework.Communications.Tests
190 { 191 {
191 TestHelper.InMethod(); 192 TestHelper.InMethod();
192 193
193 Scene myScene = SceneSetupHelpers.SetupScene(); 194 Scene myScene = SceneSetupHelpers.SetupScene("inventory");
194 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager); 195 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
195 for (int i = 0 ; i < 50 ; i++) 196 for (int i = 0 ; i < 50 ; i++)
196 { 197 {
@@ -256,7 +257,7 @@ namespace OpenSim.Framework.Communications.Tests
256 { 257 {
257 TestHelper.InMethod(); 258 TestHelper.InMethod();
258 259
259 Scene myScene = SceneSetupHelpers.SetupScene(); 260 Scene myScene = SceneSetupHelpers.SetupScene("inventory");
260 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager); 261 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
261 for (int i = 0 ; i < 50 ; i++) 262 for (int i = 0 ; i < 50 ; i++)
262 { 263 {
@@ -297,7 +298,7 @@ namespace OpenSim.Framework.Communications.Tests
297 TestHelper.InMethod(); 298 TestHelper.InMethod();
298 //log4net.Config.XmlConfigurator.Configure(); 299 //log4net.Config.XmlConfigurator.Configure();
299 300
300 Scene myScene = SceneSetupHelpers.SetupScene(); 301 Scene myScene = SceneSetupHelpers.SetupScene("inventory");
301 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager); 302 CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
302 for (int i = 0 ; i < 50 ; i++) 303 for (int i = 0 ; i < 50 ; i++)
303 { 304 {
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 47e0293..9e181f3 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -36,6 +36,7 @@ using Nwc.XmlRpc;
36using OpenSim.Framework.Communications.Cache; 36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Framework.Communications.Services; 37using OpenSim.Framework.Communications.Services;
38using OpenSim.Region.Communications.Local; 38using OpenSim.Region.Communications.Local;
39using OpenSim.Tests.Common.Setup;
39using OpenSim.Tests.Common.Mock; 40using OpenSim.Tests.Common.Mock;
40using OpenSim.Client.Linden; 41using OpenSim.Client.Linden;
41using OpenSim.Tests.Common; 42using OpenSim.Tests.Common;
@@ -57,11 +58,12 @@ namespace OpenSim.Framework.Communications.Tests
57 private string m_regionExternalName = "localhost"; 58 private string m_regionExternalName = "localhost";
58 59
59 private IPEndPoint m_capsEndPoint; 60 private IPEndPoint m_capsEndPoint;
60 private CommunicationsManager m_commsManager; 61 private TestCommunicationsManager m_commsManager;
61 private TestLoginToRegionConnector m_regionConnector; 62 private TestLoginToRegionConnector m_regionConnector;
62 private LocalUserServices m_localUserServices; 63 private LocalUserServices m_localUserServices;
63 private LoginService m_loginService; 64 private LoginService m_loginService;
64 private UserProfileData m_userProfileData; 65 private UserProfileData m_userProfileData;
66 private TestScene m_testScene;
65 67
66 [SetUp] 68 [SetUp]
67 public void SetUpLoginEnviroment() 69 public void SetUpLoginEnviroment()
@@ -69,13 +71,16 @@ namespace OpenSim.Framework.Communications.Tests
69 m_capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 71 m_capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
70 m_commsManager = new TestCommunicationsManager(new NetworkServersInfo(42, 43)); 72 m_commsManager = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
71 m_regionConnector = new TestLoginToRegionConnector(); 73 m_regionConnector = new TestLoginToRegionConnector();
74 m_testScene = SceneSetupHelpers.SetupScene(m_commsManager, "");
72 75
73 m_regionConnector.AddRegion(new RegionInfo(42, 43, m_capsEndPoint, m_regionExternalName)); 76 m_regionConnector.AddRegion(new RegionInfo(42, 43, m_capsEndPoint, m_regionExternalName));
74 77
78 //IInventoryService m_inventoryService = new TestInventoryService();
79
75 m_localUserServices = (LocalUserServices) m_commsManager.UserService; 80 m_localUserServices = (LocalUserServices) m_commsManager.UserService;
76 m_localUserServices.AddUser(m_firstName,m_lastName,"boingboing","abc@ftw.com",42,43); 81 m_localUserServices.AddUser(m_firstName,m_lastName,"boingboing","abc@ftw.com",42,43);
77 82
78 m_loginService = new LLStandaloneLoginService((UserManagerBase) m_localUserServices, "Hello folks", new TestInventoryService(), 83 m_loginService = new LLStandaloneLoginService((UserManagerBase) m_localUserServices, "Hello folks", m_testScene.InventoryService,
79 m_commsManager.NetworkServersInfo, true, new LibraryRootFolder(String.Empty), m_regionConnector); 84 m_commsManager.NetworkServersInfo, true, new LibraryRootFolder(String.Empty), m_regionConnector);
80 85
81 m_userProfileData = m_localUserServices.GetUserProfile(m_firstName, m_lastName); 86 m_userProfileData = m_localUserServices.GetUserProfile(m_firstName, m_lastName);
@@ -442,123 +447,4 @@ namespace OpenSim.Framework.Communications.Tests
442 #endregion 447 #endregion
443 } 448 }
444 } 449 }
445
446 class TestInventoryService : IInventoryService
447 {
448 public TestInventoryService()
449 {
450 }
451
452 /// <summary>
453 /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
454 /// </summary>
455 /// <param name="userId"></param>
456 /// <returns></returns>
457 public bool CreateUserInventory(UUID userId)
458 {
459 return false;
460 }
461
462 /// <summary>
463 /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
464 /// </summary>
465 /// <param name="userId"></param>
466 /// <returns></returns>
467 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
468 {
469 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
470 InventoryFolderBase folder = new InventoryFolderBase();
471 folder.ID = UUID.Random();
472 folder.Owner = userId;
473 folders.Add(folder);
474 return folders;
475 }
476
477 /// <summary>
478 /// Returns a list of all the active gestures in a user's inventory.
479 /// </summary>
480 /// <param name="userId">
481 /// The <see cref="UUID"/> of the user
482 /// </param>
483 /// <returns>
484 /// A flat list of the gesture items.
485 /// </returns>
486 public List<InventoryItemBase> GetActiveGestures(UUID userId)
487 {
488 return null;
489 }
490
491 public InventoryCollection GetUserInventory(UUID userID)
492 {
493 return null;
494 }
495
496 public void GetUserInventory(UUID userID, OpenSim.Services.Interfaces.InventoryReceiptCallback callback)
497 {
498 }
499
500 public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
501 {
502 return null;
503 }
504
505 public bool AddFolder(InventoryFolderBase folder)
506 {
507 return false;
508 }
509
510 public bool UpdateFolder(InventoryFolderBase folder)
511 {
512 return false;
513 }
514
515 public bool MoveFolder(InventoryFolderBase folder)
516 {
517 return false;
518 }
519
520 public bool PurgeFolder(InventoryFolderBase folder)
521 {
522 return false;
523 }
524
525 public bool AddItem(InventoryItemBase item)
526 {
527 return false;
528 }
529
530 public bool UpdateItem(InventoryItemBase item)
531 {
532 return false;
533 }
534
535 public bool DeleteItem(InventoryItemBase item)
536 {
537 return false;
538 }
539
540 public InventoryItemBase QueryItem(InventoryItemBase item)
541 {
542 return null;
543 }
544
545 public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
546 {
547 return null;
548 }
549
550 public bool HasInventoryForUser(UUID userID)
551 {
552 return false;
553 }
554
555 public InventoryFolderBase RequestRootFolder(UUID userID)
556 {
557 InventoryFolderBase root = new InventoryFolderBase();
558 root.ID = UUID.Random();
559 root.Owner = userID;
560 root.ParentID = UUID.Zero;
561 return root;
562 }
563 }
564} 450}
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index bd5d0e3..b9044eb 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -698,7 +698,7 @@ namespace OpenSim.Framework.Communications
698 if (rootfolder != null) 698 if (rootfolder != null)
699 userProf.RootInventoryFolderID = rootfolder.ID; 699 userProf.RootInventoryFolderID = rootfolder.ID;
700 } 700 }
701 else if (m_commsManager.InterServiceInventoryService != null) 701 else
702 { 702 {
703 // used by the user server 703 // used by the user server
704 m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory"); 704 m_log.Debug("[USERSTORAGE]: using m_commsManager.InterServiceInventoryService to create user's inventory");