diff options
author | Kunnis | 2009-08-16 23:25:12 -0500 |
---|---|---|
committer | Melanie | 2009-08-19 23:46:25 +0100 |
commit | b1853d9f265fb32cf51d65fdcf2d5b4741911f00 (patch) | |
tree | c3d814cc0a53ef3a68310e5872eafc3f5acc0280 /OpenSim/Framework/Communications | |
parent | * Switching IAssetData to follow the new naming schema, removing the separate... (diff) | |
download | opensim-SC_OLD-b1853d9f265fb32cf51d65fdcf2d5b4741911f00.zip opensim-SC_OLD-b1853d9f265fb32cf51d65fdcf2d5b4741911f00.tar.gz opensim-SC_OLD-b1853d9f265fb32cf51d65fdcf2d5b4741911f00.tar.bz2 opensim-SC_OLD-b1853d9f265fb32cf51d65fdcf2d5b4741911f00.tar.xz |
Fixing a spot I missed in assets. Switching Grid to the new naming schema with Store/Get
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index c9f5236..7f1c7e9 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -184,7 +184,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
184 | // Commented out for now. The implementation needs to be improved by protecting against race conditions, | 184 | // Commented out for now. The implementation needs to be improved by protecting against race conditions, |
185 | // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via | 185 | // probably by making sure that the update doesn't use the UserCacheInfo.UserProfile directly (possibly via |
186 | // returning a read only class from the cache). | 186 | // returning a read only class from the cache). |
187 | // public bool UpdateProfile(UserProfileData userProfile) | 187 | // public bool StoreProfile(UserProfileData userProfile) |
188 | // { | 188 | // { |
189 | // lock (m_userProfilesById) | 189 | // lock (m_userProfilesById) |
190 | // { | 190 | // { |
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 670c9ff..933fa12 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
@@ -110,14 +110,14 @@ namespace OpenSim.Framework.Communications.Tests | |||
110 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; | 110 | IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin; |
111 | 111 | ||
112 | // Check that we can't update info before it exists | 112 | // Check that we can't update info before it exists |
113 | Assert.That(userCacheService.UpdateProfile(newProfile), Is.False); | 113 | Assert.That(userCacheService.StoreProfile(newProfile), Is.False); |
114 | Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null); | 114 | Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null); |
115 | 115 | ||
116 | // Check that we can update a profile once it exists | 116 | // Check that we can update a profile once it exists |
117 | LocalUserServices lus = (LocalUserServices)commsManager.UserService; | 117 | LocalUserServices lus = (LocalUserServices)commsManager.UserService; |
118 | lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId); | 118 | lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId); |
119 | 119 | ||
120 | Assert.That(userCacheService.UpdateProfile(newProfile), Is.True); | 120 | Assert.That(userCacheService.StoreProfile(newProfile), Is.True); |
121 | UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile; | 121 | UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile; |
122 | Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName)); | 122 | Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName)); |
123 | Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName)); | 123 | Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName)); |