* Move SceneObject tests into their proper namespace

* Add some more debug code to narrow down where the tests are freezing
0.6.5-rc1
Justin Clarke Casey 2009-03-12 18:13:51 +00:00
parent e80e0887f2
commit a02c3caa0d
4 changed files with 12 additions and 3 deletions

View File

@ -27,6 +27,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection;
using System.Threading; using System.Threading;
using log4net.Config; using log4net.Config;
using NUnit.Framework; using NUnit.Framework;
@ -164,6 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
Assert.That(gotObject2File, Is.True, "No object2 file in archive"); Assert.That(gotObject2File, Is.True, "No object2 file in archive");
// TODO: Test presence of more files and contents of files. // TODO: Test presence of more files and contents of files.
// Temporary
Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
} }
/// <summary> /// <summary>
@ -302,6 +305,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge"); Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge");
Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2GroupPosition), "object2 group position not equal after merge"); Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2GroupPosition), "object2 group position not equal after merge");
} }
// Temporary
Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
} }
} }
} }

View File

@ -37,13 +37,13 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup; using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.CoreModules.Scenes.Tests namespace OpenSim.Region.Framework.Scenes.Tests
{ {
/// <summary> /// <summary>
/// Basic scene object tests (create, read and delete but not update). /// Basic scene object tests (create, read and delete but not update).
/// </summary> /// </summary>
[TestFixture] [TestFixture]
public class SceneObjectTests public class SceneObjectBasicTests
{ {
/// <summary> /// <summary>
/// Test adding an object to a scene. /// Test adding an object to a scene.

View File

@ -39,7 +39,7 @@ using OpenSim.Tests.Common.Setup;
using log4net; using log4net;
using System.Reflection; using System.Reflection;
namespace OpenSim.Region.CoreModules.Scenes.Tests namespace OpenSim.Region.Framework.Scenes.Tests
{ {
/// <summary> /// <summary>
/// Linking tests /// Linking tests

View File

@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
using System;
using System.Net; using System.Net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
@ -66,6 +67,8 @@ namespace OpenSim.Tests.Common.Setup
/// <returns></returns> /// <returns></returns>
public static TestScene SetupScene(string name, UUID id, uint x, uint y, CommunicationsManager cm) public static TestScene SetupScene(string name, UUID id, uint x, uint y, CommunicationsManager cm)
{ {
Console.WriteLine("Setting up test scene {0}", name);
RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
regInfo.RegionName = name; regInfo.RegionName = name;
regInfo.RegionID = id; regInfo.RegionID = id;