diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs index 0b196c1..c27bc1a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs | |||
@@ -42,6 +42,7 @@ using OpenSim.Tests.Common; | |||
42 | 42 | ||
43 | namespace OpenSim.Region.Framework.Scenes.Tests | 43 | namespace OpenSim.Region.Framework.Scenes.Tests |
44 | { | 44 | { |
45 | /* | ||
45 | /// <summary> | 46 | /// <summary> |
46 | /// Test copying of scene objects. | 47 | /// Test copying of scene objects. |
47 | /// </summary> | 48 | /// </summary> |
@@ -86,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
86 | 87 | ||
87 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 88 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
88 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 89 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
89 | sogd.Enabled = false; | 90 | sogd.Enabled = false; |
90 | 91 | ||
91 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); | 92 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); |
92 | uint soLocalId = so.LocalId; | 93 | uint soLocalId = so.LocalId; |
@@ -118,11 +119,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
118 | 119 | ||
119 | // Check that object is still there. | 120 | // Check that object is still there. |
120 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 121 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
121 | Assert.That(retrievedPart2, Is.Not.Null); | 122 | Assert.That(retrievedPart2, Is.Not.Null); |
122 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 123 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
123 | 124 | ||
124 | // Check that we have a copy in inventory | 125 | // Check that we have a copy in inventory |
125 | InventoryItemBase item | 126 | InventoryItemBase item |
126 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); | 127 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); |
127 | Assert.That(item, Is.Not.Null); | 128 | Assert.That(item, Is.Not.Null); |
128 | } | 129 | } |
@@ -144,7 +145,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
144 | 145 | ||
145 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 146 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
146 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 147 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
147 | sogd.Enabled = false; | 148 | sogd.Enabled = false; |
148 | 149 | ||
149 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); | 150 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); |
150 | uint soLocalId = so.LocalId; | 151 | uint soLocalId = so.LocalId; |
@@ -167,11 +168,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
167 | 168 | ||
168 | // Check that object is still there. | 169 | // Check that object is still there. |
169 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 170 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
170 | Assert.That(retrievedPart2, Is.Not.Null); | 171 | Assert.That(retrievedPart2, Is.Not.Null); |
171 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 172 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
172 | 173 | ||
173 | // Check that we do not have a copy in inventory | 174 | // Check that we do not have a copy in inventory |
174 | InventoryItemBase item | 175 | InventoryItemBase item |
175 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); | 176 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); |
176 | Assert.That(item, Is.Null); | 177 | Assert.That(item, Is.Null); |
177 | } | 178 | } |
@@ -193,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
193 | 194 | ||
194 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 195 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
195 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 196 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
196 | sogd.Enabled = false; | 197 | sogd.Enabled = false; |
197 | 198 | ||
198 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); | 199 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); |
199 | uint soLocalId = so.LocalId; | 200 | uint soLocalId = so.LocalId; |
@@ -218,11 +219,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
218 | 219 | ||
219 | // Check that object is still there. | 220 | // Check that object is still there. |
220 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 221 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
221 | Assert.That(retrievedPart2, Is.Not.Null); | 222 | Assert.That(retrievedPart2, Is.Not.Null); |
222 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 223 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
223 | 224 | ||
224 | // Check that we have a copy in inventory | 225 | // Check that we have a copy in inventory |
225 | InventoryItemBase item | 226 | InventoryItemBase item |
226 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 227 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
227 | Assert.That(item, Is.Not.Null); | 228 | Assert.That(item, Is.Not.Null); |
228 | } | 229 | } |
@@ -244,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
244 | 245 | ||
245 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 246 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
246 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 247 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
247 | sogd.Enabled = false; | 248 | sogd.Enabled = false; |
248 | 249 | ||
249 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); | 250 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); |
250 | uint soLocalId = so.LocalId; | 251 | uint soLocalId = so.LocalId; |
@@ -271,11 +272,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
271 | sogd.InventoryDeQueueAndDelete(); | 272 | sogd.InventoryDeQueueAndDelete(); |
272 | // Check that object is still there. | 273 | // Check that object is still there. |
273 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 274 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
274 | Assert.That(retrievedPart2, Is.Not.Null); | 275 | Assert.That(retrievedPart2, Is.Not.Null); |
275 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 276 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
276 | 277 | ||
277 | // Check that we have a copy in inventory | 278 | // Check that we have a copy in inventory |
278 | InventoryItemBase item | 279 | InventoryItemBase item |
279 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 280 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
280 | Assert.That(item, Is.Null); | 281 | Assert.That(item, Is.Null); |
281 | } | 282 | } |
@@ -302,11 +303,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
302 | sogd.InventoryDeQueueAndDelete(); | 303 | sogd.InventoryDeQueueAndDelete(); |
303 | // Check that object is still there. | 304 | // Check that object is still there. |
304 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 305 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
305 | Assert.That(retrievedPart2, Is.Not.Null); | 306 | Assert.That(retrievedPart2, Is.Not.Null); |
306 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 307 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
307 | 308 | ||
308 | // Check that we have a copy in inventory | 309 | // Check that we have a copy in inventory |
309 | InventoryItemBase item | 310 | InventoryItemBase item |
310 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 311 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
311 | Assert.That(item, Is.Null); | 312 | Assert.That(item, Is.Null); |
312 | } | 313 | } |
@@ -333,14 +334,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
333 | sogd.InventoryDeQueueAndDelete(); | 334 | sogd.InventoryDeQueueAndDelete(); |
334 | // Check that object is still there. | 335 | // Check that object is still there. |
335 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 336 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
336 | Assert.That(retrievedPart2, Is.Not.Null); | 337 | Assert.That(retrievedPart2, Is.Not.Null); |
337 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 338 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
338 | 339 | ||
339 | // Check that we have a copy in inventory | 340 | // Check that we have a copy in inventory |
340 | InventoryItemBase item | 341 | InventoryItemBase item |
341 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 342 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
342 | Assert.That(item, Is.Null); | 343 | Assert.That(item, Is.Null); |
343 | } | 344 | } |
344 | } | 345 | } |
345 | } | 346 | } |
347 | */ | ||
346 | } \ No newline at end of file | 348 | } \ No newline at end of file |