Reduce coupling in regression test task inventory creation methods to make them usable in tests with no scene present

1 files changed, 18 insertions, 18 deletions

diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
index b4bd50b..a15127e 100644
--- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Add a notecard item to the given part.
         /// </summary>
-        /// <param name="scene"></param>
+        /// <param name="assetService"></param>
         /// <param name="part"></param>
         /// <param name="itemName"></param>
         /// <param name="itemIDFrag">UUID or UUID stem</param>
@@ -51,16 +51,16 @@ namespace OpenSim.Tests.Common
         /// <param name="text">The tex to put in the notecard.</param>
         /// <returns>The item that was added</returns>
         public static TaskInventoryItem AddNotecard(
-            Scene scene, SceneObjectPart part, string itemName, string itemIDStem, string assetIDStem, string text)
+            IAssetService assetService, SceneObjectPart part, string itemName, string itemIDStem, string assetIDStem, string text)
         {
             return AddNotecard(
-                scene, part, itemName, TestHelpers.ParseStem(itemIDStem), TestHelpers.ParseStem(assetIDStem), text);
+                assetService, part, itemName, TestHelpers.ParseStem(itemIDStem), TestHelpers.ParseStem(assetIDStem), text);
         }
 
         /// <summary>
         /// Add a notecard item to the given part.
         /// </summary>
-        /// <param name="scene"></param>
+        /// <param name="assetService"></param>
         /// <param name="part"></param>
         /// <param name="itemName"></param>
         /// <param name="itemID"></param>
@@ -68,7 +68,7 @@ namespace OpenSim.Tests.Common
         /// <param name="text">The tex to put in the notecard.</param>
         /// <returns>The item that was added</returns>
         public static TaskInventoryItem AddNotecard(
-            Scene scene, SceneObjectPart part, string itemName, UUID itemID, UUID assetID, string text)
+            IAssetService assetService, SceneObjectPart part, string itemName, UUID itemID, UUID assetID, string text)
         {
             AssetNotecard nc = new AssetNotecard();
             nc.BodyText = text;
@@ -76,7 +76,7 @@ namespace OpenSim.Tests.Common
 
             AssetBase ncAsset
                 = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero);
-            scene.AssetService.Store(ncAsset);
+            assetService.Store(ncAsset);
 
             TaskInventoryItem ncItem 
                 = new TaskInventoryItem 
@@ -94,12 +94,12 @@ namespace OpenSim.Tests.Common
         /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these
         /// functions more than once in a test.
         /// </remarks>
-        /// <param name="scene"></param>
+        /// <param name="assetService"></param>
         /// <param name="part"></param>
         /// <returns>The item that was added</returns>
-        public static TaskInventoryItem AddScript(Scene scene, SceneObjectPart part)
+        public static TaskInventoryItem AddScript(IAssetService assetService, SceneObjectPart part)
         {
-            return AddScript(scene, part, "scriptItem", "default { state_entry() { llSay(0, \"Hello World\"); } }");
+            return AddScript(assetService, part, "scriptItem", "default { state_entry() { llSay(0, \"Hello World\"); } }");
         }
 
         /// <summary>
@@ -109,15 +109,15 @@ namespace OpenSim.Tests.Common
         /// TODO: Accept input for item and asset IDs so that we have completely replicatable regression tests rather
         /// than a random component.
         /// </remarks>
-        /// <param name="scene"></param>
+        /// <param name="assetService"></param>
         /// <param name="part"></param>
         /// <param name="scriptName">Name of the script to add</param>
         /// <param name="scriptSource">LSL script source</param>
         /// <returns>The item that was added</returns>
         public static TaskInventoryItem AddScript(
-            Scene scene, SceneObjectPart part, string scriptName, string scriptSource)
+            IAssetService assetService, SceneObjectPart part, string scriptName, string scriptSource)
         {
-            return AddScript(scene, part, UUID.Random(), UUID.Random(), scriptName, scriptSource);
+            return AddScript(assetService, part, UUID.Random(), UUID.Random(), scriptName, scriptSource);
         }
                 
         /// <summary>
@@ -127,7 +127,7 @@ namespace OpenSim.Tests.Common
         /// TODO: Accept input for item and asset IDs so that we have completely replicatable regression tests rather
         /// than a random component.
         /// </remarks>
-        /// <param name="scene"></param>
+        /// <param name="assetService"></param>
         /// <param name="part"></param>
         /// <param name="itemId">Item UUID for the script</param>
         /// <param name="assetId">Asset UUID for the script</param>
@@ -135,7 +135,7 @@ namespace OpenSim.Tests.Common
         /// <param name="scriptSource">LSL script source</param>
         /// <returns>The item that was added</returns>
         public static TaskInventoryItem AddScript(
-            Scene scene, SceneObjectPart part, UUID itemId, UUID assetId, string scriptName, string scriptSource)
+            IAssetService assetService, SceneObjectPart part, UUID itemId, UUID assetId, string scriptName, string scriptSource)
         {
             AssetScriptText ast = new AssetScriptText();
             ast.Source = scriptSource;
@@ -143,7 +143,7 @@ namespace OpenSim.Tests.Common
 
             AssetBase asset
                 = AssetHelpers.CreateAsset(assetId, AssetType.LSLText, ast.AssetData, UUID.Zero);
-            scene.AssetService.Store(asset);
+            assetService.Store(asset);
             TaskInventoryItem item
                 = new TaskInventoryItem 
             { Name = scriptName, AssetID = assetId, ItemID = itemId,
@@ -162,17 +162,17 @@ namespace OpenSim.Tests.Common
         /// functions more than once in a test.
         /// </remarks>
         ///
-        /// <param name="scene"></param>
+        /// <param name="assetService"></param>
         /// <param name="sop"></param>
         /// <param name="itemName"></param>
         /// <param name="id"></param>
         /// <param name="userId"></param>
         public static TaskInventoryItem AddSceneObject(
-            Scene scene, SceneObjectPart sop, string itemName, UUID id, UUID userId)
+            IAssetService assetService, SceneObjectPart sop, string itemName, UUID id, UUID userId)
         {
             SceneObjectGroup taskSceneObject = SceneHelpers.CreateSceneObject(1, UUID.Zero);
             AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(0x10, taskSceneObject);
-            scene.AssetService.Store(taskSceneObjectAsset);
+            assetService.Store(taskSceneObjectAsset);
             TaskInventoryItem taskSceneObjectItem
                 = new TaskInventoryItem
                     { Name = itemName,