Merge branch 'SledjChisl'

1 files changed, 26 insertions, 28 deletions

diff --git a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
index 9e3fa69..2e4637c 100644
--- a/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
+++ b/OpenSim/Services/InventoryService/Tests/XInventoryServiceTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Services.InventoryService.Tests
     {
         private IInventoryService CreateXInventoryService()
         {
-            IConfigSource config = new IniConfigSource();            
+            IConfigSource config = new IniConfigSource();
             config.AddConfig("InventoryService");
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
 
@@ -73,25 +73,24 @@ namespace OpenSim.Services.InventoryService.Tests
             UUID folderId = TestHelpers.ParseTail(0x30);
             int invType = (int)InventoryType.Animation;
             int assetType = (int)AssetType.Animation;
-            string itemName = "item1";           
+            string itemName = "item1";
 
             IInventoryService xis = CreateXInventoryService();
 
-            InventoryItemBase itemToStore 
-                = new InventoryItemBase(itemId, ownerId) 
-                { 
-                    CreatorIdentification = creatorId.ToString(), 
-                    AssetID = assetId, 
-                    Name = itemName,  
-                    Folder = folderId, 
-                    InvType = invType, 
-                    AssetType = assetType 
+            InventoryItemBase itemToStore
+                = new InventoryItemBase(itemId, ownerId)
+                {
+                    CreatorIdentification = creatorId.ToString(),
+                    AssetID = assetId,
+                    Name = itemName,
+                    Folder = folderId,
+                    InvType = invType,
+                    AssetType = assetType
                 };
 
             Assert.That(xis.AddItem(itemToStore), Is.True);
 
-            InventoryItemBase itemRetrieved = new InventoryItemBase(itemId);
-            itemRetrieved = xis.GetItem(itemRetrieved);
+            InventoryItemBase itemRetrieved = xis.GetItem(UUID.Zero, itemId);
 
             Assert.That(itemRetrieved, Is.Not.Null);
             Assert.That(itemRetrieved.CreatorId, Is.EqualTo(creatorId));
@@ -116,20 +115,20 @@ namespace OpenSim.Services.InventoryService.Tests
             UUID folderId = TestHelpers.ParseTail(0x30);
             int invType = (int)InventoryType.Animation;
             int assetType = (int)AssetType.Animation;
-            string itemName = "item1";           
+            string itemName = "item1";
             string itemName2 = "item2";
 
             IInventoryService xis = CreateXInventoryService();
 
-            InventoryItemBase itemToStore 
-                = new InventoryItemBase(itemId, ownerId) 
-                { 
-                    CreatorIdentification = creatorId.ToString(), 
-                    AssetID = assetId, 
-                    Name = itemName,  
-                    Folder = folderId, 
-                    InvType = invType, 
-                    AssetType = assetType 
+            InventoryItemBase itemToStore
+                = new InventoryItemBase(itemId, ownerId)
+                {
+                    CreatorIdentification = creatorId.ToString(),
+                    AssetID = assetId,
+                    Name = itemName,
+                    Folder = folderId,
+                    InvType = invType,
+                    AssetType = assetType
                 };
 
             Assert.That(xis.AddItem(itemToStore), Is.True);
@@ -139,8 +138,7 @@ namespace OpenSim.Services.InventoryService.Tests
 
             Assert.That(xis.UpdateItem(itemToStore), Is.True);
 
-            InventoryItemBase itemRetrieved = new InventoryItemBase(itemId);
-            itemRetrieved = xis.GetItem(itemRetrieved);
+            InventoryItemBase itemRetrieved = xis.GetItem(UUID.Zero, itemId);
 
             Assert.That(itemRetrieved, Is.Not.Null);
             Assert.That(itemRetrieved.Name, Is.EqualTo(itemName2));
@@ -151,7 +149,7 @@ namespace OpenSim.Services.InventoryService.Tests
             UUID folderId2 = TestHelpers.ParseTail(0x70);
             int invType2 = (int)InventoryType.CallingCard;
             int assetType2 = (int)AssetType.CallingCard;
-            string itemName3 = "item3"; 
+            string itemName3 = "item3";
 
             itemToStore.CreatorIdentification = creatorId2.ToString();
             itemToStore.Owner = ownerId2;
@@ -162,7 +160,7 @@ namespace OpenSim.Services.InventoryService.Tests
 
             Assert.That(xis.UpdateItem(itemToStore), Is.True);
 
-            itemRetrieved = xis.GetItem(itemRetrieved);
+            itemRetrieved = xis.GetItem(itemRetrieved.Owner, itemRetrieved.ID);
 
             Assert.That(itemRetrieved, Is.Not.Null);
             Assert.That(itemRetrieved.CreatorId, Is.EqualTo(creatorId));
@@ -174,4 +172,4 @@ namespace OpenSim.Services.InventoryService.Tests
             Assert.That(itemRetrieved.Name, Is.EqualTo(itemName3));
         }
     }
-}
\ No newline at end of file
+}