OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* refactor: move scene setup code into common test code assembly

0.6.3-post-fixes
Justin Clarke Casey 2009-01-23 17:32:38 +00:00
parent 227e88a6f4
commit ee3c61247e
6 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Environment/Scenes/Tests/EntityManagerTests.cs
View File

@ -36,18 +36,16 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.Environment.Scenes.Tests
{
/// <summary>
/// Scene oriented tests
/// </summary>
[TestFixture]
public class EntityManagerTests
{
static public Random random;
SceneObjectGroup found;
Scene scene = SceneTestUtils.SetupScene();
Scene scene = SceneSetupHelpers.SetupScene();
[Test]
public void T010_AddObjects()

39
OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
View File

@ -35,6 +35,7 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.Environment.Scenes.Tests
{
@ -50,8 +51,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
[Test]
public void TestAddSceneObject()
{
Scene scene = SceneTestUtils.SetupScene();
SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
Scene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
//System.Console.WriteLine("retrievedPart : {0}", retrievedPart);
@ -65,8 +66,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
[Test]
public void TestDeleteSceneObject()
{
TestScene scene = SceneTestUtils.SetupScene();
SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
TestScene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
scene.DeleteSceneObject(part.ParentGroup, false);
SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
@ -81,15 +82,15 @@ namespace OpenSim.Region.Environment.Scenes.Tests
{
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
TestScene scene = SceneTestUtils.SetupScene();
TestScene scene = SceneSetupHelpers.SetupScene();
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
sogd.Enabled = false;
SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
scene.DeRezObject(client, part.LocalId, UUID.Zero, DeRezAction.Delete, UUID.Zero);
SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
@ -105,10 +106,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
{
bool debugtest = false;
Scene scene = SceneTestUtils.SetupScene();
SceneObjectPart part1 = SceneTestUtils.AddSceneObject(scene);
Scene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part1 = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectGroup grp1 = part1.ParentGroup;
SceneObjectPart part2 = SceneTestUtils.AddSceneObject(scene);
SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectGroup grp2 = part2.ParentGroup;
@ -178,14 +179,14 @@ namespace OpenSim.Region.Environment.Scenes.Tests
{
bool debugtest = false;
Scene scene = SceneTestUtils.SetupScene();
SceneObjectPart part1 = SceneTestUtils.AddSceneObject(scene);
Scene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part1 = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectGroup grp1 = part1.ParentGroup;
SceneObjectPart part2 = SceneTestUtils.AddSceneObject(scene);
SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectGroup grp2 = part2.ParentGroup;
SceneObjectPart part3 = SceneTestUtils.AddSceneObject(scene);
SceneObjectPart part3 = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectGroup grp3 = part3.ParentGroup;
SceneObjectPart part4 = SceneTestUtils.AddSceneObject(scene);
SceneObjectPart part4 = SceneSetupHelpers.AddSceneObject(scene);
SceneObjectGroup grp4 = part4.ParentGroup;
@ -310,21 +311,21 @@ namespace OpenSim.Region.Environment.Scenes.Tests
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
string myObjectName = "Fred";
TestScene scene = SceneTestUtils.SetupScene();
SceneObjectPart part = SceneTestUtils.AddSceneObject(scene, myObjectName);
TestScene scene = SceneSetupHelpers.SetupScene();
SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene, myObjectName);
Assert.That(
scene.CommsManager.UserAdminService.AddUser(
"Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
Is.EqualTo(agentId));
IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
IClientAPI client = SceneSetupHelpers.AddRootAgent(scene, agentId);
CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
Assert.That(userInfo, Is.Not.Null);
Assert.That(userInfo.RootFolder, Is.Not.Null);
SceneTestUtils.DeleteSceneObjectAsync(scene, part, DeRezAction.Take, userInfo.RootFolder.ID, client);
SceneSetupHelpers.DeleteSceneObjectAsync(scene, part, DeRezAction.Take, userInfo.RootFolder.ID, client);
// Check that we now have the taken part in our inventory
Assert.That(myObjectName, Is.EqualTo(userInfo.RootFolder.FindItemByPath(myObjectName).Name));

7
OpenSim/Region/Environment/Scenes/Tests/ScenePresenceTests.cs
View File

@ -31,6 +31,7 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.Environment.Scenes.Tests
{
@ -46,7 +47,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
[Test]
public void TestAddRootAgent()
{
Scene scene = SceneTestUtils.SetupScene();
Scene scene = SceneSetupHelpers.SetupScene();
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
string firstName = "testfirstname";
@ -77,10 +78,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
[Test]
public void TestRemoveRootAgent()
{
Scene scene = SceneTestUtils.SetupScene();
Scene scene = SceneSetupHelpers.SetupScene();
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
SceneTestUtils.AddRootAgent(scene, agentId);
SceneSetupHelpers.AddRootAgent(scene, agentId);
scene.RemoveClient(agentId);

7
OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
View File

@ -35,6 +35,7 @@ using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.Environment.Modules.Communications.REST;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Region.Environment.Scenes.Tests
{
@ -61,21 +62,21 @@ namespace OpenSim.Region.Environment.Scenes.Tests
IRegionModule interregionComms = new RESTInterregionComms();
// TODO: Clean this up
Scene sceneA = SceneTestUtils.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
interregionComms.Initialise(sceneA, new IniConfigSource());
sceneA.AddModule(interregionComms.Name, interregionComms);
sceneA.SetModuleInterfaces();
sceneA.RegisterRegionWithGrid();
// TODO: Clean this up
Scene sceneB = SceneTestUtils.SetupScene("sceneB", sceneBId, 1010, 1010, cm);
Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm);
interregionComms.Initialise(sceneB, new IniConfigSource());
sceneB.AddModule(interregionComms.Name, interregionComms);
sceneB.SetModuleInterfaces();
sceneB.RegisterRegionWithGrid();
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
TestClient client = SceneTestUtils.AddRootAgent(sceneA, agentId);
TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId);
ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>();

6
OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs → OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -39,12 +39,12 @@ using OpenSim.Region.Environment.Modules.Agent.Capabilities;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Tests.Common.Mock;
namespace OpenSim.Region.Environment.Scenes.Tests
namespace OpenSim.Tests.Common.Setup
{
/// <summary>
/// Utilities for constructing and performing operations upon scenes.
/// Helpers for setting up scenes.
/// </summary>
public class SceneTestUtils
public class SceneSetupHelpers
{
/// <summary>
/// Set up a test scene

1
prebuild.xml
View File

@ -2473,6 +2473,7 @@
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Environment"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Files>
<Match pattern="*.cs" recurse="true"/>