diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs index dc3b717..c27bc1a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectCopyTests.cs | |||
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
87 | 87 | ||
88 | // 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. |
89 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 89 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
90 | sogd.Enabled = false; | 90 | sogd.Enabled = false; |
91 | 91 | ||
92 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); | 92 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); |
93 | uint soLocalId = so.LocalId; | 93 | uint soLocalId = so.LocalId; |
@@ -119,11 +119,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
119 | 119 | ||
120 | // Check that object is still there. | 120 | // Check that object is still there. |
121 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 121 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
122 | Assert.That(retrievedPart2, Is.Not.Null); | 122 | Assert.That(retrievedPart2, Is.Not.Null); |
123 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 123 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
124 | 124 | ||
125 | // Check that we have a copy in inventory | 125 | // Check that we have a copy in inventory |
126 | InventoryItemBase item | 126 | InventoryItemBase item |
127 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); | 127 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); |
128 | Assert.That(item, Is.Not.Null); | 128 | Assert.That(item, Is.Not.Null); |
129 | } | 129 | } |
@@ -145,7 +145,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
145 | 145 | ||
146 | // 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. |
147 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 147 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
148 | sogd.Enabled = false; | 148 | sogd.Enabled = false; |
149 | 149 | ||
150 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); | 150 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", ua.PrincipalID); |
151 | uint soLocalId = so.LocalId; | 151 | uint soLocalId = so.LocalId; |
@@ -168,11 +168,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
168 | 168 | ||
169 | // Check that object is still there. | 169 | // Check that object is still there. |
170 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 170 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
171 | Assert.That(retrievedPart2, Is.Not.Null); | 171 | Assert.That(retrievedPart2, Is.Not.Null); |
172 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 172 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
173 | 173 | ||
174 | // Check that we do not have a copy in inventory | 174 | // Check that we do not have a copy in inventory |
175 | InventoryItemBase item | 175 | InventoryItemBase item |
176 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); | 176 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Lost And Found/so1"); |
177 | Assert.That(item, Is.Null); | 177 | Assert.That(item, Is.Null); |
178 | } | 178 | } |
@@ -194,7 +194,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
194 | 194 | ||
195 | // 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. |
196 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 196 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
197 | sogd.Enabled = false; | 197 | sogd.Enabled = false; |
198 | 198 | ||
199 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); | 199 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); |
200 | uint soLocalId = so.LocalId; | 200 | uint soLocalId = so.LocalId; |
@@ -219,11 +219,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
219 | 219 | ||
220 | // Check that object is still there. | 220 | // Check that object is still there. |
221 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 221 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
222 | Assert.That(retrievedPart2, Is.Not.Null); | 222 | Assert.That(retrievedPart2, Is.Not.Null); |
223 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 223 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
224 | 224 | ||
225 | // Check that we have a copy in inventory | 225 | // Check that we have a copy in inventory |
226 | InventoryItemBase item | 226 | InventoryItemBase item |
227 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 227 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
228 | Assert.That(item, Is.Not.Null); | 228 | Assert.That(item, Is.Not.Null); |
229 | } | 229 | } |
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
245 | 245 | ||
246 | // 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. |
247 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 247 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
248 | sogd.Enabled = false; | 248 | sogd.Enabled = false; |
249 | 249 | ||
250 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); | 250 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", TestHelpers.ParseTail(0x2)); |
251 | uint soLocalId = so.LocalId; | 251 | uint soLocalId = so.LocalId; |
@@ -272,11 +272,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
272 | sogd.InventoryDeQueueAndDelete(); | 272 | sogd.InventoryDeQueueAndDelete(); |
273 | // Check that object is still there. | 273 | // Check that object is still there. |
274 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 274 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
275 | Assert.That(retrievedPart2, Is.Not.Null); | 275 | Assert.That(retrievedPart2, Is.Not.Null); |
276 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 276 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
277 | 277 | ||
278 | // Check that we have a copy in inventory | 278 | // Check that we have a copy in inventory |
279 | InventoryItemBase item | 279 | InventoryItemBase item |
280 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 280 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
281 | Assert.That(item, Is.Null); | 281 | Assert.That(item, Is.Null); |
282 | } | 282 | } |
@@ -303,11 +303,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
303 | sogd.InventoryDeQueueAndDelete(); | 303 | sogd.InventoryDeQueueAndDelete(); |
304 | // Check that object is still there. | 304 | // Check that object is still there. |
305 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 305 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
306 | Assert.That(retrievedPart2, Is.Not.Null); | 306 | Assert.That(retrievedPart2, Is.Not.Null); |
307 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 307 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
308 | 308 | ||
309 | // Check that we have a copy in inventory | 309 | // Check that we have a copy in inventory |
310 | InventoryItemBase item | 310 | InventoryItemBase item |
311 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 311 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
312 | Assert.That(item, Is.Null); | 312 | Assert.That(item, Is.Null); |
313 | } | 313 | } |
@@ -334,11 +334,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
334 | sogd.InventoryDeQueueAndDelete(); | 334 | sogd.InventoryDeQueueAndDelete(); |
335 | // Check that object is still there. | 335 | // Check that object is still there. |
336 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); | 336 | SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId); |
337 | Assert.That(retrievedPart2, Is.Not.Null); | 337 | Assert.That(retrievedPart2, Is.Not.Null); |
338 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); | 338 | Assert.That(client.ReceivedKills.Count, Is.EqualTo(0)); |
339 | 339 | ||
340 | // Check that we have a copy in inventory | 340 | // Check that we have a copy in inventory |
341 | InventoryItemBase item | 341 | InventoryItemBase item |
342 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); | 342 | = UserInventoryHelpers.GetInventoryItem(scene.InventoryService, ua.PrincipalID, "Objects/so1"); |
343 | Assert.That(item, Is.Null); | 343 | Assert.That(item, Is.Null); |
344 | } | 344 | } |