diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
tree | 756554b330c8bdd970f319c3af0327efb9017673 /OpenSim/Framework/Communications/Tests/Cache | |
parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
download | opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC_OLD-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz |
*remove conflicts
Diffstat (limited to 'OpenSim/Framework/Communications/Tests/Cache')
-rw-r--r-- | OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index fe88cf5..670c9ff 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
@@ -186,14 +186,14 @@ namespace OpenSim.Framework.Communications.Tests | |||
186 | 186 | ||
187 | Assert.That( | 187 | Assert.That( |
188 | userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False); | 188 | userInfo.CreateFolder("testFolder1", folderId, (ushort)AssetType.Animation, missingFolderId), Is.False); |
189 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Null); | 189 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); |
190 | Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False); | 190 | Assert.That(userInfo.RootFolder.ContainsChildFolder(missingFolderId), Is.False); |
191 | Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null); | 191 | Assert.That(userInfo.RootFolder.FindFolder(folderId), Is.Null); |
192 | 192 | ||
193 | // 2: Try a folder create that should work | 193 | // 2: Try a folder create that should work |
194 | Assert.That( | 194 | Assert.That( |
195 | userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True); | 195 | userInfo.CreateFolder("testFolder2", folderId, (ushort)AssetType.Animation, userInfo.RootFolder.ID), Is.True); |
196 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Not.Null); | 196 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null); |
197 | Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True); | 197 | Assert.That(userInfo.RootFolder.ContainsChildFolder(folderId), Is.True); |
198 | } | 198 | } |
199 | 199 | ||
@@ -228,7 +228,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
228 | Assert.That(newFolderName1, Is.EqualTo(folder1.Name)); | 228 | Assert.That(newFolderName1, Is.EqualTo(folder1.Name)); |
229 | Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type)); | 229 | Assert.That(folderType1, Is.EqualTo((ushort)folder1.Type)); |
230 | 230 | ||
231 | InventoryFolderBase dataFolder1 = myScene.InventoryService.QueryFolder(myFolder); | 231 | InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder); |
232 | Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name)); | 232 | Assert.That(newFolderName1, Is.EqualTo(dataFolder1.Name)); |
233 | Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type)); | 233 | Assert.That(folderType1, Is.EqualTo((ushort)dataFolder1.Type)); |
234 | } | 234 | } |
@@ -254,7 +254,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
254 | Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True); | 254 | Assert.That(folder2.ContainsChildFolder(folder1Id), Is.True); |
255 | Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False); | 255 | Assert.That(rootFolder.ContainsChildFolder(folder1Id), Is.False); |
256 | 256 | ||
257 | InventoryFolderBase dataFolder1 = myScene.InventoryService.QueryFolder(myFolder2); | 257 | InventoryFolderBase dataFolder1 = myScene.InventoryService.GetFolder(myFolder2); |
258 | Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name)); | 258 | Assert.That(newFolderName2, Is.EqualTo(dataFolder1.Name)); |
259 | Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type)); | 259 | Assert.That(folderType2, Is.EqualTo((ushort)dataFolder1.Type)); |
260 | Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID)); | 260 | Assert.That(folder2Id, Is.EqualTo(dataFolder1.ParentID)); |
@@ -296,7 +296,7 @@ namespace OpenSim.Framework.Communications.Tests | |||
296 | InventoryFolderBase myFolder = new InventoryFolderBase(); | 296 | InventoryFolderBase myFolder = new InventoryFolderBase(); |
297 | myFolder.ID = folderToMoveId; | 297 | myFolder.ID = folderToMoveId; |
298 | Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True); | 298 | Assert.That(folder2.ContainsChildFolder(folderToMoveId), Is.True); |
299 | Assert.That(myScene.InventoryService.QueryFolder(myFolder).ParentID, Is.EqualTo(folder2Id)); | 299 | Assert.That(myScene.InventoryService.GetFolder(myFolder).ParentID, Is.EqualTo(folder2Id)); |
300 | 300 | ||
301 | Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False); | 301 | Assert.That(folder1.ContainsChildFolder(folderToMoveId), Is.False); |
302 | } | 302 | } |
@@ -322,13 +322,13 @@ namespace OpenSim.Framework.Communications.Tests | |||
322 | myFolder.ID = folder1Id; | 322 | myFolder.ID = folder1Id; |
323 | 323 | ||
324 | userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID); | 324 | userInfo.CreateFolder("folder1", folder1Id, (ushort)AssetType.Animation, rootFolder.ID); |
325 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Not.Null); | 325 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Not.Null); |
326 | 326 | ||
327 | // Test purge | 327 | // Test purge |
328 | userInfo.PurgeFolder(rootFolder.ID); | 328 | userInfo.PurgeFolder(rootFolder.ID); |
329 | 329 | ||
330 | Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); | 330 | Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); |
331 | Assert.That(myScene.InventoryService.QueryFolder(myFolder), Is.Null); | 331 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); |
332 | } | 332 | } |
333 | } | 333 | } |
334 | } \ No newline at end of file | 334 | } \ No newline at end of file |