From 35f719ae2f9e58cfd46a6c0082238c500a3454f3 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Tue, 24 Aug 2010 17:04:54 +0100
Subject: [PATCH] refactor TestMoveTaskInventoryItemNoParent()

---
 .../Scenes/Tests/TaskInventoryTests.cs        | 75 +++++++++++--------
 1 file changed, 44 insertions(+), 31 deletions(-)

diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index f848e80816..ed2f324fb9 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -44,6 +44,7 @@ using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
 using OpenSim.Region.CoreModules.World.Serialiser;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
@@ -53,6 +54,42 @@ namespace OpenSim.Region.Framework.Tests
     [TestFixture]
     public class TaskInventoryTests
     {
+        protected UserAccount CreateUser(Scene scene)
+        {
+            string userFirstName = "Jock";
+            string userLastName = "Stirrup";
+            string userPassword = "troll";
+            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");            
+            return UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);            
+        }
+        
+        protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId)
+        {
+            string part1Name = "part1";
+            UUID part1Id = UUID.Parse("10000000-0000-0000-0000-000000000000");
+            SceneObjectPart part1
+                = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                    { Name = part1Name, UUID = part1Id };
+            return new SceneObjectGroup(part1);            
+        }
+        
+        protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part)
+        {
+            AssetNotecard nc = new AssetNotecard("Hello World!");
+            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
+            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");            
+            AssetBase ncAsset 
+                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
+            scene.AssetService.Store(ncAsset);
+            TaskInventoryItem ncItem 
+                = new TaskInventoryItem 
+                    { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid, 
+                      Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard };
+            part.Inventory.AddInventoryItem(ncItem, true); 
+            
+            return ncItem;
+        }
+        
         /// <summary>
         /// Test MoveTaskInventoryItem where the item has no parent folder assigned.
         /// </summary>
@@ -64,40 +101,16 @@ namespace OpenSim.Region.Framework.Tests
 //            log4net.Config.XmlConfigurator.Configure();
             
             Scene scene = SceneSetupHelpers.SetupScene("inventory");
-            
-            // Create user
-            string userFirstName = "Jock";
-            string userLastName = "Stirrup";
-            string userPassword = "troll";
-            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");            
-            UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);            
-            
-            // Create scene object
-            string part1Name = "part1";  
-            UUID part1Id = UUID.Parse("10000000-0000-0000-0000-000000000000");
-            SceneObjectPart part1
-                = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
-                    { Name = part1Name, UUID = part1Id };
-            SceneObjectGroup so = new SceneObjectGroup(part1);
-            
-            // Create scene object inventory item
-            AssetNotecard nc = new AssetNotecard("Hello World!");
-            UUID ncAssetUuid = new UUID("00000000-0000-0000-1000-000000000000");
-            UUID ncItemUuid = new UUID("00000000-0000-0000-1100-000000000000");            
-            AssetBase ncAsset 
-                = AssetHelpers.CreateAsset(ncAssetUuid, AssetType.Notecard, nc.AssetData, UUID.Zero);
-            scene.AssetService.Store(ncAsset);
-            TaskInventoryItem ncItem 
-                = new TaskInventoryItem 
-                    { Name = "ncItem", AssetID = ncAssetUuid, ItemID = ncItemUuid, 
-                      Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard };
-            part1.Inventory.AddInventoryItem(ncItem, true);           
+            UserAccount user1 = CreateUser(scene);
+            SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
+            SceneObjectPart sop1 = sog1.RootPart;
+            TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);
             
             // Perform test
-            scene.MoveTaskInventoryItem(userId, UUID.Zero, part1, ncItemUuid);
-            
+            scene.MoveTaskInventoryItem(user1.PrincipalID, UUID.Zero, sop1, sopItem1.ItemID);
+                
             InventoryItemBase ncUserItem
-                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userId, "Notecards/ncItem");            
+                = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, user1.PrincipalID, "Notecards/ncItem");            
             Assert.That(ncUserItem, Is.Not.Null, "Notecards/ncItem was not found");
         }
     }