Merge branch 'master' of ssh://MyConnection/var/git/opensim

2 files changed, 13 insertions, 3 deletions

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
             IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
 
             // Check that we can't update info before it exists
-            Assert.That(userCacheService.UpdateProfile(newProfile), Is.False);
+            Assert.That(userCacheService.StoreProfile(newProfile), Is.False);
             Assert.That(userDataPlugin.GetUserByUUID(userId), Is.Null);
 
             // Check that we can update a profile once it exists
             LocalUserServices lus = (LocalUserServices)commsManager.UserService;
             lus.AddUser(firstName, originalLastName, "pingu", "ted@excellentadventure.com", 1000, 1000, userId);
 
-            Assert.That(userCacheService.UpdateProfile(newProfile), Is.True);
+            Assert.That(userCacheService.StoreProfile(newProfile), Is.True);
             UserProfileData retrievedProfile = userCacheService.GetUserDetails(userId).UserProfile;
             Assert.That(retrievedProfile.SurName, Is.EqualTo(newLastName));
             Assert.That(userDataPlugin.GetUserByUUID(userId).SurName, Is.EqualTo(newLastName));
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 22dcef9..57a908e 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -532,6 +532,11 @@ namespace OpenSim.Framework.Communications.Tests
             return false;
         }
 
+        public bool DeleteFolders(UUID ownerID, List<UUID> ids)
+        {
+            return false;
+        }
+
         public bool PurgeFolder(InventoryFolderBase folder)
         {
             return false;
@@ -547,7 +552,12 @@ namespace OpenSim.Framework.Communications.Tests
             return false;
         }
 
-        public bool DeleteItem(InventoryItemBase item)
+        public bool MoveItems(UUID owner, List<InventoryItemBase> items)
+        {
+            return false;
+        }
+
+        public bool DeleteItems(UUID owner, List<UUID> items)
         {
             return false;
         }