diff options
author | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
---|---|---|
committer | David Walter Seikel | 2016-11-03 21:44:39 +1000 |
commit | 134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch) | |
tree | 216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs | |
parent | More changing to production grid. Double oops. (diff) | |
download | opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2 opensim-SC_OLD-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz |
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs | 121 |
1 files changed, 90 insertions, 31 deletions
diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs index 0a2b30a..3a3b33a 100644 --- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs | |||
@@ -43,21 +43,40 @@ namespace OpenSim.Tests.Common | |||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Add a notecard item to the given part. | 44 | /// Add a notecard item to the given part. |
45 | /// </summary> | 45 | /// </summary> |
46 | /// <param name="scene"></param> | 46 | /// <param name="assetService"></param> |
47 | /// <param name="part"></param> | ||
48 | /// <param name="itemName"></param> | ||
49 | /// <param name="itemIDFrag">UUID or UUID stem</param> | ||
50 | /// <param name="assetIDFrag">UUID or UUID stem</param> | ||
51 | /// <param name="text">The tex to put in the notecard.</param> | ||
52 | /// <returns>The item that was added</returns> | ||
53 | public static TaskInventoryItem AddNotecard( | ||
54 | IAssetService assetService, SceneObjectPart part, string itemName, string itemIDStem, string assetIDStem, string text) | ||
55 | { | ||
56 | return AddNotecard( | ||
57 | assetService, part, itemName, TestHelpers.ParseStem(itemIDStem), TestHelpers.ParseStem(assetIDStem), text); | ||
58 | } | ||
59 | |||
60 | /// <summary> | ||
61 | /// Add a notecard item to the given part. | ||
62 | /// </summary> | ||
63 | /// <param name="assetService"></param> | ||
47 | /// <param name="part"></param> | 64 | /// <param name="part"></param> |
48 | /// <param name="itemName"></param> | 65 | /// <param name="itemName"></param> |
49 | /// <param name="itemID"></param> | 66 | /// <param name="itemID"></param> |
50 | /// <param name="assetID"></param> | 67 | /// <param name="assetID"></param> |
68 | /// <param name="text">The tex to put in the notecard.</param> | ||
51 | /// <returns>The item that was added</returns> | 69 | /// <returns>The item that was added</returns> |
52 | public static TaskInventoryItem AddNotecard(Scene scene, SceneObjectPart part, string itemName, UUID itemID, UUID assetID) | 70 | public static TaskInventoryItem AddNotecard( |
71 | IAssetService assetService, SceneObjectPart part, string itemName, UUID itemID, UUID assetID, string text) | ||
53 | { | 72 | { |
54 | AssetNotecard nc = new AssetNotecard(); | 73 | AssetNotecard nc = new AssetNotecard(); |
55 | nc.BodyText = "Hello World!"; | 74 | nc.BodyText = text; |
56 | nc.Encode(); | 75 | nc.Encode(); |
57 | 76 | ||
58 | AssetBase ncAsset | 77 | AssetBase ncAsset |
59 | = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero); | 78 | = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero); |
60 | scene.AssetService.Store(ncAsset); | 79 | assetService.Store(ncAsset); |
61 | 80 | ||
62 | TaskInventoryItem ncItem | 81 | TaskInventoryItem ncItem |
63 | = new TaskInventoryItem | 82 | = new TaskInventoryItem |
@@ -75,44 +94,62 @@ namespace OpenSim.Tests.Common | |||
75 | /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these | 94 | /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these |
76 | /// functions more than once in a test. | 95 | /// functions more than once in a test. |
77 | /// </remarks> | 96 | /// </remarks> |
78 | /// <param name="scene"></param> | 97 | /// <param name="assetService"></param> |
79 | /// <param name="part"></param> | 98 | /// <param name="part"></param> |
80 | /// <returns>The item that was added</returns> | 99 | /// <returns>The item that was added</returns> |
81 | public static TaskInventoryItem AddScript(Scene scene, SceneObjectPart part) | 100 | public static TaskInventoryItem AddScript(IAssetService assetService, SceneObjectPart part) |
82 | { | 101 | { |
83 | return AddScript(scene, part, "scriptItem", "default { state_entry() { llSay(0, \"Hello World\"); } }"); | 102 | return AddScript(assetService, part, "scriptItem", "default { state_entry() { llSay(0, \"Hello World\"); } }"); |
84 | } | 103 | } |
85 | 104 | ||
86 | /// <summary> | 105 | /// <summary> |
87 | /// Add a simple script to the given part. | 106 | /// Add a simple script to the given part. |
88 | /// </summary> | 107 | /// </summary> |
89 | /// <remarks> | 108 | /// <remarks> |
90 | /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these | 109 | /// TODO: Accept input for item and asset IDs so that we have completely replicatable regression tests rather |
91 | /// functions more than once in a test. | 110 | /// than a random component. |
111 | /// </remarks> | ||
112 | /// <param name="assetService"></param> | ||
113 | /// <param name="part"></param> | ||
114 | /// <param name="scriptName">Name of the script to add</param> | ||
115 | /// <param name="scriptSource">LSL script source</param> | ||
116 | /// <returns>The item that was added</returns> | ||
117 | public static TaskInventoryItem AddScript( | ||
118 | IAssetService assetService, SceneObjectPart part, string scriptName, string scriptSource) | ||
119 | { | ||
120 | return AddScript(assetService, part, UUID.Random(), UUID.Random(), scriptName, scriptSource); | ||
121 | } | ||
122 | |||
123 | /// <summary> | ||
124 | /// Add a simple script to the given part. | ||
125 | /// </summary> | ||
126 | /// <remarks> | ||
127 | /// TODO: Accept input for item and asset IDs so that we have completely replicatable regression tests rather | ||
128 | /// than a random component. | ||
92 | /// </remarks> | 129 | /// </remarks> |
93 | /// <param name="scene"></param> | 130 | /// <param name="assetService"></param> |
94 | /// <param name="part"></param> | 131 | /// <param name="part"></param> |
132 | /// <param name="itemId">Item UUID for the script</param> | ||
133 | /// <param name="assetId">Asset UUID for the script</param> | ||
95 | /// <param name="scriptName">Name of the script to add</param> | 134 | /// <param name="scriptName">Name of the script to add</param> |
96 | /// <param name="scriptSource">LSL script source</param> | 135 | /// <param name="scriptSource">LSL script source</param> |
97 | /// <returns>The item that was added</returns> | 136 | /// <returns>The item that was added</returns> |
98 | public static TaskInventoryItem AddScript( | 137 | public static TaskInventoryItem AddScript( |
99 | Scene scene, SceneObjectPart part, string scriptName, string scriptSource) | 138 | IAssetService assetService, SceneObjectPart part, UUID itemId, UUID assetId, string scriptName, string scriptSource) |
100 | { | 139 | { |
101 | AssetScriptText ast = new AssetScriptText(); | 140 | AssetScriptText ast = new AssetScriptText(); |
102 | ast.Source = scriptSource; | 141 | ast.Source = scriptSource; |
103 | ast.Encode(); | 142 | ast.Encode(); |
104 | 143 | ||
105 | UUID assetUuid = new UUID("00000000-0000-0000-1000-000000000000"); | ||
106 | UUID itemUuid = new UUID("00000000-0000-0000-1100-000000000000"); | ||
107 | AssetBase asset | 144 | AssetBase asset |
108 | = AssetHelpers.CreateAsset(assetUuid, AssetType.LSLText, ast.AssetData, UUID.Zero); | 145 | = AssetHelpers.CreateAsset(assetId, AssetType.LSLText, ast.AssetData, UUID.Zero); |
109 | scene.AssetService.Store(asset); | 146 | assetService.Store(asset); |
110 | TaskInventoryItem item | 147 | TaskInventoryItem item |
111 | = new TaskInventoryItem | 148 | = new TaskInventoryItem |
112 | { Name = scriptName, AssetID = assetUuid, ItemID = itemUuid, | 149 | { Name = scriptName, AssetID = assetId, ItemID = itemId, |
113 | Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL }; | 150 | Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL }; |
114 | part.Inventory.AddInventoryItem(item, true); | 151 | part.Inventory.AddInventoryItem(item, true); |
115 | 152 | ||
116 | return item; | 153 | return item; |
117 | } | 154 | } |
118 | 155 | ||
@@ -124,28 +161,50 @@ namespace OpenSim.Tests.Common | |||
124 | /// functions more than once in a test. | 161 | /// functions more than once in a test. |
125 | /// </remarks> | 162 | /// </remarks> |
126 | /// | 163 | /// |
127 | /// <param name="scene"></param> | 164 | /// <param name="assetService"></param> |
128 | /// <param name="sop"></param> | 165 | /// <param name="sop"></param> |
129 | /// <param name="itemName"></param> | 166 | /// <param name="itemName"></param> |
130 | /// <param name="id"></param> | 167 | /// <param name="itemId"></param> |
131 | /// <param name="userId"></param> | 168 | /// <param name="soToAdd"></param> |
169 | /// <param name="soAssetId"></param> | ||
132 | public static TaskInventoryItem AddSceneObject( | 170 | public static TaskInventoryItem AddSceneObject( |
133 | Scene scene, SceneObjectPart sop, string itemName, UUID id, UUID userId) | 171 | IAssetService assetService, SceneObjectPart sop, string itemName, UUID itemId, SceneObjectGroup soToAdd, UUID soAssetId) |
134 | { | 172 | { |
135 | SceneObjectGroup taskSceneObject = SceneHelpers.CreateSceneObject(1, UUID.Zero); | 173 | AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(soAssetId, soToAdd); |
136 | AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(0x10, taskSceneObject); | 174 | assetService.Store(taskSceneObjectAsset); |
137 | scene.AssetService.Store(taskSceneObjectAsset); | ||
138 | TaskInventoryItem taskSceneObjectItem | 175 | TaskInventoryItem taskSceneObjectItem |
139 | = new TaskInventoryItem | 176 | = new TaskInventoryItem |
140 | { Name = itemName, | 177 | { Name = itemName, |
141 | AssetID = taskSceneObjectAsset.FullID, | 178 | AssetID = taskSceneObjectAsset.FullID, |
142 | ItemID = id, | 179 | ItemID = itemId, |
143 | OwnerID = userId, | 180 | OwnerID = soToAdd.OwnerID, |
144 | Type = (int)AssetType.Object, | 181 | Type = (int)AssetType.Object, |
145 | InvType = (int)InventoryType.Object }; | 182 | InvType = (int)InventoryType.Object }; |
146 | sop.Inventory.AddInventoryItem(taskSceneObjectItem, true); | 183 | sop.Inventory.AddInventoryItem(taskSceneObjectItem, true); |
147 | 184 | ||
148 | return taskSceneObjectItem; | 185 | return taskSceneObjectItem; |
149 | } | 186 | } |
187 | |||
188 | /// <summary> | ||
189 | /// Add a scene object item to the given part. | ||
190 | /// </summary> | ||
191 | /// <remarks> | ||
192 | /// TODO: Accept input for item and asset IDs to avoid mysterious script failures that try to use any of these | ||
193 | /// functions more than once in a test. | ||
194 | /// </remarks> | ||
195 | /// | ||
196 | /// <param name="assetService"></param> | ||
197 | /// <param name="sop"></param> | ||
198 | /// <param name="itemName"></param> | ||
199 | /// <param name="id"></param> | ||
200 | /// <param name="userId"></param> | ||
201 | public static TaskInventoryItem AddSceneObject( | ||
202 | IAssetService assetService, SceneObjectPart sop, string itemName, UUID itemId, UUID userId) | ||
203 | { | ||
204 | SceneObjectGroup taskSceneObject = SceneHelpers.CreateSceneObject(1, userId); | ||
205 | |||
206 | return TaskInventoryHelpers.AddSceneObject( | ||
207 | assetService, sop, itemName, itemId, taskSceneObject, TestHelpers.ParseTail(0x10)); | ||
208 | } | ||
150 | } | 209 | } |
151 | } \ No newline at end of file | 210 | } \ No newline at end of file |