diff options
author | Justin Clarke Casey | 2009-03-12 18:13:51 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-03-12 18:13:51 +0000 |
commit | a02c3caa0d65af384b9f3e5afe233a2c8de60d48 (patch) | |
tree | 35bbdf45f983a0bf60328fac7b70ad9cc9320ea7 /OpenSim/Region | |
parent | - renaming OpenSim.ini.example to OpenSim.ini.example.preview as (diff) | |
download | opensim-SC-a02c3caa0d65af384b9f3e5afe233a2c8de60d48.zip opensim-SC-a02c3caa0d65af384b9f3e5afe233a2c8de60d48.tar.gz opensim-SC-a02c3caa0d65af384b9f3e5afe233a2c8de60d48.tar.bz2 opensim-SC-a02c3caa0d65af384b9f3e5afe233a2c8de60d48.tar.xz |
* Move SceneObject tests into their proper namespace
* Add some more debug code to narrow down where the tests are freezing
Diffstat (limited to 'OpenSim/Region')
3 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index b5a2d13..7aafaee 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.IO; | 29 | using System.IO; |
30 | using System.Reflection; | ||
30 | using System.Threading; | 31 | using System.Threading; |
31 | using log4net.Config; | 32 | using log4net.Config; |
32 | using NUnit.Framework; | 33 | using NUnit.Framework; |
@@ -164,6 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
164 | Assert.That(gotObject2File, Is.True, "No object2 file in archive"); | 165 | Assert.That(gotObject2File, Is.True, "No object2 file in archive"); |
165 | 166 | ||
166 | // TODO: Test presence of more files and contents of files. | 167 | // TODO: Test presence of more files and contents of files. |
168 | // Temporary | ||
169 | Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); | ||
167 | } | 170 | } |
168 | 171 | ||
169 | /// <summary> | 172 | /// <summary> |
@@ -302,6 +305,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
302 | Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge"); | 305 | Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge"); |
303 | Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2GroupPosition), "object2 group position not equal after merge"); | 306 | Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2GroupPosition), "object2 group position not equal after merge"); |
304 | } | 307 | } |
308 | |||
309 | // Temporary | ||
310 | Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); | ||
305 | } | 311 | } |
306 | } | 312 | } |
307 | } | 313 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index c984c7d..caee3a5 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -37,13 +37,13 @@ using OpenSim.Region.Framework.Scenes; | |||
37 | using OpenSim.Tests.Common.Mock; | 37 | using OpenSim.Tests.Common.Mock; |
38 | using OpenSim.Tests.Common.Setup; | 38 | using OpenSim.Tests.Common.Setup; |
39 | 39 | ||
40 | namespace OpenSim.Region.CoreModules.Scenes.Tests | 40 | namespace OpenSim.Region.Framework.Scenes.Tests |
41 | { | 41 | { |
42 | /// <summary> | 42 | /// <summary> |
43 | /// Basic scene object tests (create, read and delete but not update). | 43 | /// Basic scene object tests (create, read and delete but not update). |
44 | /// </summary> | 44 | /// </summary> |
45 | [TestFixture] | 45 | [TestFixture] |
46 | public class SceneObjectTests | 46 | public class SceneObjectBasicTests |
47 | { | 47 | { |
48 | /// <summary> | 48 | /// <summary> |
49 | /// Test adding an object to a scene. | 49 | /// Test adding an object to a scene. |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index b5dbb38..003fef2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | |||
@@ -39,7 +39,7 @@ using OpenSim.Tests.Common.Setup; | |||
39 | using log4net; | 39 | using log4net; |
40 | using System.Reflection; | 40 | using System.Reflection; |
41 | 41 | ||
42 | namespace OpenSim.Region.CoreModules.Scenes.Tests | 42 | namespace OpenSim.Region.Framework.Scenes.Tests |
43 | { | 43 | { |
44 | /// <summary> | 44 | /// <summary> |
45 | /// Linking tests | 45 | /// Linking tests |