From 3db52d95ef42bf82182af02c9c4ad5ea8cecee9e Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 17 Apr 2009 14:41:56 +0000 Subject: * Extend get user profile test to cover retrieval by name --- .../Tests/Cache/UserProfileCacheServiceTests.cs | 62 ++++++++++------------ .../Tests/Cache/UserProfileTestUtils.cs | 3 +- 2 files changed, 28 insertions(+), 37 deletions(-) (limited to 'OpenSim/Framework/Communications/Tests/Cache') diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index e2576ef..34f5c97 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs @@ -30,39 +30,46 @@ using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework.Communications.Cache; +using OpenSim.Region.Communications.Local; using OpenSim.Tests.Common.Mock; -//using OpenSim.Framework; namespace OpenSim.Framework.Communications.Tests { - /// - /// User profile cache service tests - /// [TestFixture] public class UserProfileCacheServiceTests { - /// - /// Test user details get. - /// [Test] public void TestGetUserDetails() { - UUID nonExistingUserId = UUID.Parse("00000000-0000-0000-0000-000000000001"); - UUID existingUserId = UUID.Parse("00000000-0000-0000-0000-000000000002"); - + UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000002"); + string firstName = "Bill"; + string lastName = "Bailey"; + CachedUserInfo nonExistingUserInfo; + TestCommunicationsManager commsManager = new TestCommunicationsManager(); - CachedUserInfo existingUserInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, existingUserId); - - Assert.That(existingUserInfo, Is.Not.Null, "Existing user info unexpectedly not found"); - - CachedUserInfo nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(nonExistingUserId); - - Assert.That(nonExistingUserInfo, Is.Null, "Non existing user info unexpectedly found"); + + // Check we can't retrieve info before it exists by uuid + nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); + Assert.That(nonExistingUserInfo, Is.Null, "User info found by uuid before user creation"); + + // Check we can't retrieve info before it exists by name + nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); + Assert.That(nonExistingUserInfo, Is.Null, "User info found by name before user creation"); + + LocalUserServices lus = (LocalUserServices)commsManager.UserService; + lus.AddUser(firstName, lastName, "troll", "bill@bailey.com", 1000, 1000, userId); + + CachedUserInfo existingUserInfo; + + // Check we can retrieve info by uuid + existingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); + Assert.That(existingUserInfo, Is.Not.Null, "User info not found by uuid"); + + // Check we can retrieve info by name + existingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); + Assert.That(existingUserInfo, Is.Not.Null, "User info not found by name"); } - /// - /// Test requesting inventory for a user - /// [Test] public void TestFetchInventory() { @@ -72,9 +79,6 @@ namespace OpenSim.Framework.Communications.Tests Assert.That(userInfo.HasReceivedInventory, Is.True); } - /// - /// Test retrieving a child folder - /// [Test] public void TestGetChildFolder() { @@ -89,9 +93,6 @@ namespace OpenSim.Framework.Communications.Tests Assert.That(userInfo.RootFolder.GetChildFolder(folderId), Is.Not.Null); } - /// - /// Test creating an inventory folder - /// [Test] public void TestCreateFolder() { @@ -119,9 +120,6 @@ namespace OpenSim.Framework.Communications.Tests Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True); } - /// - /// Test updating a folder - /// [Test] public void TestUpdateFolder() { @@ -176,9 +174,6 @@ namespace OpenSim.Framework.Communications.Tests } - /// - /// Test moving an inventory folder - /// [Test] public void TestMoveFolder() { @@ -210,9 +205,6 @@ namespace OpenSim.Framework.Communications.Tests Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False); } - /// - /// Test purging an inventory folder - /// [Test] public void TestPurgeFolder() { diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs index 93ce916..d0f92d6 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs @@ -32,7 +32,7 @@ using OpenSim.Region.Communications.Local; namespace OpenSim.Framework.Communications.Tests { /// - /// Utility functions for carrying out user profile relate tests. + /// Utility functions for carrying out user profile related tests. /// public class UserProfileTestUtils { @@ -56,7 +56,6 @@ namespace OpenSim.Framework.Communications.Tests public static CachedUserInfo CreateUserWithInventory(CommunicationsManager commsManager, UUID userId) { LocalUserServices lus = (LocalUserServices)commsManager.UserService; - lus.AddUser("Bill", "Bailey", "troll", "bill@bailey.com", 1000, 1000, userId); CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); -- cgit v1.1