diff options
author | Justin Clark-Casey (justincc) | 2010-12-15 00:14:43 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-12-15 00:14:43 +0000 |
commit | 6b135ee371a0a78e299357b1c7086c2949059991 (patch) | |
tree | 4e9dafffa173bdd034ae93569f633d633eaf1637 | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-6b135ee371a0a78e299357b1c7086c2949059991.zip opensim-SC-6b135ee371a0a78e299357b1c7086c2949059991.tar.gz opensim-SC-6b135ee371a0a78e299357b1c7086c2949059991.tar.bz2 opensim-SC-6b135ee371a0a78e299357b1c7086c2949059991.tar.xz |
fix mistake in last change of local.include
Diffstat (limited to '')
-rw-r--r-- | .nant/local.include | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/.nant/local.include b/.nant/local.include index 03dc1b9..b11c1e5 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -315,7 +315,7 @@ | |||
315 | </exec> | 315 | </exec> |
316 | 316 | ||
317 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests"> | 317 | <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.optionalmodules.tests"> |
318 | <arg value="./bin/OpenSim.Region.Optional.Tests.dll" /> | 318 | <arg value="./bin/OpenSim.Region.OptionalModules.Tests.dll" /> |
319 | <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" /> | 319 | <arg value="-xml=test-results/OpenSim.Region.OptionalModules.Tests.dll-Results.xml" /> |
320 | </exec> | 320 | </exec> |
321 | 321 | ||
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index b3b99f4..39116b6 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |||
@@ -43,13 +43,14 @@ using OpenSim.Tests.Common.Setup; | |||
43 | namespace OpenSim.Region.Framework.Scenes.Tests | 43 | namespace OpenSim.Region.Framework.Scenes.Tests |
44 | { | 44 | { |
45 | /// <summary> | 45 | /// <summary> |
46 | /// Tests manipulation of scene objects by users. | 46 | /// Tests derez of scene objects by users. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// | 48 | /// <remarks> |
49 | /// This is at a level above the SceneObjectBasicTests, which act on the scene directly. | 49 | /// This is at a level above the SceneObjectBasicTests, which act on the scene directly. |
50 | /// FIXME: These tests are very incomplete - they only test for a few conditions. | 50 | /// TODO: These tests are very incomplete - they only test for a few conditions. |
51 | /// </remarks> | ||
51 | [TestFixture] | 52 | [TestFixture] |
52 | public class SceneObjectUserTests | 53 | public class SceneObjectDeRezTests |
53 | { | 54 | { |
54 | /// <summary> | 55 | /// <summary> |
55 | /// Test deleting an object from a scene. | 56 | /// Test deleting an object from a scene. |
@@ -122,6 +123,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
122 | scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero); | 123 | scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero); |
123 | sogd.InventoryDeQueueAndDelete(); | 124 | sogd.InventoryDeQueueAndDelete(); |
124 | 125 | ||
126 | // Object should still be in the scene. | ||
125 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 127 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
126 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); | 128 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); |
127 | } | 129 | } |