From bda1a4be4567181df6c18ce6e059ca8982bc5fa1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Aug 2011 00:26:37 +0100
Subject: rename test SceneSetupHelpers -> SceneHelpers for consistency
---
.../Asset/Tests/FlotsamAssetCacheTests.cs | 4 +-
.../Tests/AvatarFactoryModuleTests.cs | 6 +-
.../Archiver/Tests/InventoryArchiveTestCase.cs | 10 +-
.../Archiver/Tests/InventoryArchiverTests.cs | 8 +-
.../Avatar/Inventory/Archiver/Tests/PathTests.cs | 22 +-
.../Tests/InventoryAccessModuleTests.cs | 10 +-
.../World/Archiver/Tests/ArchiverTests.cs | 8 +-
.../World/Land/Tests/PrimCountModuleTests.cs | 32 +-
.../World/Media/Moap/Tests/MoapTests.cs | 8 +-
.../World/Serialiser/Tests/SerialiserTests.cs | 4 +-
.../Framework/Scenes/Tests/AttachmentTests.cs | 14 +-
.../Framework/Scenes/Tests/EntityManagerTests.cs | 2 +-
.../Framework/Scenes/Tests/SceneGraphTests.cs | 2 +-
.../Scenes/Tests/SceneObjectBasicTests.cs | 14 +-
.../Scenes/Tests/SceneObjectDeRezTests.cs | 12 +-
.../Scenes/Tests/SceneObjectLinkingTests.cs | 20 +-
.../Scenes/Tests/SceneObjectResizeTests.cs | 8 +-
.../Scenes/Tests/SceneObjectStatusTests.cs | 2 +-
.../Scenes/Tests/SceneObjectUserGroupTests.cs | 6 +-
.../Framework/Scenes/Tests/ScenePresenceTests.cs | 20 +-
.../Region/Framework/Scenes/Tests/SceneTests.cs | 2 +-
.../Scenes/Tests/StandaloneTeleportTests.cs | 10 +-
.../Framework/Scenes/Tests/TaskInventoryTests.cs | 12 +-
.../Framework/Scenes/Tests/UserInventoryTests.cs | 4 +-
.../Framework/Scenes/Tests/UuidGathererTests.cs | 2 +-
.../Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | 4 +-
.../World/NPC/Tests/NPCModuleTests.cs | 12 +-
.../ScriptEngine/Shared/Tests/LSL_ApiTest.cs | 4 +-
OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 483 +++++++++++++++++++++
OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs | 483 ---------------------
.../Tests/Common/Helpers/TaskInventoryHelpers.cs | 2 +-
31 files changed, 615 insertions(+), 615 deletions(-)
create mode 100644 OpenSim/Tests/Common/Helpers/SceneHelpers.cs
delete mode 100644 OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
index 63b0c31..1662f19 100644
--- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
+++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
@@ -65,8 +65,8 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
config.Configs["AssetCache"].Set("MemoryCacheEnabled", "true");
m_cache = new FlotsamAssetCache();
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, config, m_cache);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, config, m_cache);
}
[Test]
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
index 07de908..c05f5ab 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
@@ -50,9 +50,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
UUID userId = TestHelper.ParseTail(0x1);
AvatarFactoryModule afm = new AvatarFactoryModule();
- TestScene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, afm);
- TestClient tc = SceneSetupHelpers.AddClient(scene, userId);
+ TestScene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, afm);
+ TestClient tc = SceneHelpers.AddClient(scene, userId);
byte[] visualParams = new byte[AvatarAppearance.VISUALPARAM_COUNT];
for (byte i = 0; i < visualParams.Length; i++)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index aadeedb..19ef571 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -100,8 +100,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// log4net.Config.XmlConfigurator.Configure();
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, archiverModule);
UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
@@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// Create scene object asset
UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
- SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, ownerId, "Ray Gun Object", 0x50);
+ SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "Ray Gun Object", 0x50);
UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
@@ -127,10 +127,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
scene.AddInventoryItem(item1);
// Create coalesced objects asset
- SceneObjectGroup cobj1 = SceneSetupHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object1", 0x120);
+ SceneObjectGroup cobj1 = SceneHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object1", 0x120);
cobj1.AbsolutePosition = new Vector3(15, 30, 45);
- SceneObjectGroup cobj2 = SceneSetupHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object2", 0x140);
+ SceneObjectGroup cobj2 = SceneHelpers.CreateSceneObject(1, m_uaLL1.PrincipalID, "Object2", 0x140);
cobj2.AbsolutePosition = new Vector3(25, 50, 75);
CoalescedSceneObjects coa = new CoalescedSceneObjects(m_uaLL1.PrincipalID, cobj1, cobj2);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index ae3ab21..3616ae2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -61,8 +61,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
SerialiserModule serialiserModule = new SerialiserModule();
m_archiverModule = new InventoryArchiverModule();
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule);
}
[Test]
@@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// Create asset
UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
- SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);
+ SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);
UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
@@ -236,7 +236,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
// Create asset
UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
- SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);
+ SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50);
UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
index 127d5f8..1d3e5d0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
@@ -62,8 +62,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, archiverModule);
// Create user
string userFirstName = "Jock";
@@ -179,9 +179,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
// Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+ SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood");
UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
@@ -222,8 +222,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
SerialiserModule serialiserModule = new SerialiserModule();
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password");
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream);
@@ -247,8 +247,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
InventoryArchiverModule archiverModule = new InventoryArchiverModule();
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, archiverModule);
// Create user
string userFirstName = "Jock";
@@ -326,7 +326,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
@@ -393,7 +393,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
string folder1ExistingName = "a";
@@ -444,7 +444,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
string folder1ExistingName = "a";
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index 733ad25..90b6481 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -65,8 +65,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
config.AddConfig("Modules");
config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule");
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, config, m_iam);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, config, m_iam);
// Create user
string userFirstName = "Jock";
@@ -86,10 +86,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
// log4net.Config.XmlConfigurator.Configure();
// Create asset
- SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20);
+ SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "Object1", 0x20);
object1.AbsolutePosition = new Vector3(15, 30, 45);
- SceneObjectGroup object2 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40);
+ SceneObjectGroup object2 = SceneHelpers.CreateSceneObject(1, m_userId, "Object2", 0x40);
object2.AbsolutePosition = new Vector3(25, 50, 75);
CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2);
@@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
// log4net.Config.XmlConfigurator.Configure();
// Create asset
- SceneObjectGroup object1 = SceneSetupHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40);
+ SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, m_userId, "My Little Dog Object", 0x40);
UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index 6ba3459..645113f 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -68,8 +68,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
SerialiserModule serialiserModule = new SerialiserModule();
TerrainModule terrainModule = new TerrainModule();
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, m_archiverModule, serialiserModule, terrainModule);
}
private void LoadCompleted(Guid requestId, string errorMessage)
@@ -524,8 +524,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
SerialiserModule serialiserModule = new SerialiserModule();
TerrainModule terrainModule = new TerrainModule();
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, archiverModule, serialiserModule, terrainModule);
m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index a3aa38d..fecbf67 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -64,8 +64,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
{
m_pcm = new PrimCountModule();
LandManagementModule lmm = new LandManagementModule();
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
int xParcelDivider = (int)Constants.RegionSize - 1;
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
Assert.That(pc.Owner, Is.EqualTo(3));
@@ -124,7 +124,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Simulator, Is.EqualTo(3));
// Add a second object and retest
- SceneObjectGroup sog2 = SceneSetupHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+ SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
m_scene.AddNewSceneObject(sog2, false);
Assert.That(pc.Owner, Is.EqualTo(5));
@@ -148,7 +148,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, 0, m_userId, UUID.Zero, Quaternion.Identity);
@@ -172,9 +172,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
- SceneObjectGroup sog2 = SceneSetupHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+ SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
m_scene.AddNewSceneObject(sog2, false);
// Move the first scene object to the eastern strip parcel
@@ -235,8 +235,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- m_scene.AddNewSceneObject(SceneSetupHelpers.CreateSceneObject(1, m_userId, "a", 0x1), false);
- SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
+ m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1), false);
+ SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
m_scene.AddNewSceneObject(sogToDelete, false);
m_scene.DeleteSceneObject(sogToDelete, false);
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
sog.GroupID = m_groupId;
m_scene.AddNewSceneObject(sog, false);
@@ -291,11 +291,11 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- SceneObjectGroup sogToKeep = SceneSetupHelpers.CreateSceneObject(1, m_userId, "a", 0x1);
+ SceneObjectGroup sogToKeep = SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1);
sogToKeep.GroupID = m_groupId;
m_scene.AddNewSceneObject(sogToKeep, false);
- SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
+ SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
m_scene.AddNewSceneObject(sogToDelete, false);
m_scene.DeleteSceneObject(sogToDelete, false);
@@ -318,7 +318,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
Assert.That(pc.Owner, Is.EqualTo(0));
@@ -339,8 +339,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
IPrimCounts pc = m_lo.PrimCounts;
- m_scene.AddNewSceneObject(SceneSetupHelpers.CreateSceneObject(1, m_otherUserId, "a", 0x1), false);
- SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, "b", 0x10);
+ m_scene.AddNewSceneObject(SceneHelpers.CreateSceneObject(1, m_otherUserId, "a", 0x1), false);
+ SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_otherUserId, "b", 0x10);
m_scene.AddNewSceneObject(sogToDelete, false);
m_scene.DeleteSceneObject(sogToDelete, false);
@@ -363,7 +363,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
TestHelper.InMethod();
IPrimCounts pc = m_lo.PrimCounts;
- SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
m_pcm.TaintPrimCount();
diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
index d5b7082..fe09739 100644
--- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
+++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
public void SetUp()
{
m_module = new MoapModule();
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, m_module);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, m_module);
}
[Test]
@@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- SceneObjectPart part = SceneSetupHelpers.AddSceneObject(m_scene);
+ SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
MediaEntry me = new MediaEntry();
m_module.SetMediaEntry(part, 1, me);
@@ -88,7 +88,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
string homeUrl = "opensimulator.org";
- SceneObjectPart part = SceneSetupHelpers.AddSceneObject(m_scene);
+ SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
MediaEntry me = new MediaEntry() { HomeURL = homeUrl };
m_module.SetMediaEntry(part, 1, me);
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 4f752ab..93e38f8 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -236,8 +236,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
public void Init()
{
m_serialiserModule = new SerialiserModule();
- m_scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule);
+ m_scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, m_serialiserModule);
}
[Test]
diff --git a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
index 5586c65..85197db 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
@@ -64,14 +64,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
- scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
+ scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
+ scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
interregionComms.Initialise(new IniConfigSource());
interregionComms.PostInitialise();
- SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
- SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
+ SceneHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
+ SceneHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
agent1 = UUID.Random();
random = new Random();
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
region1 = scene.RegionInfo.RegionHandle;
region2 = scene2.RegionInfo.RegionHandle;
- SceneSetupHelpers.AddClient(scene, agent1);
+ SceneHelpers.AddClient(scene, agent1);
}
[Test]
@@ -126,8 +126,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
presence2.AddAttachment(sog2);
ISharedRegionModule serialiser = new SerialiserModule();
- SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), serialiser);
- SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), serialiser);
+ SceneHelpers.SetupSceneModules(scene, new IniConfigSource(), serialiser);
+ SceneHelpers.SetupSceneModules(scene2, new IniConfigSource(), serialiser);
Assert.That(presence.HasAttachments(), Is.False, "Presence has attachments before cross");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index f69a4b4..ebf595a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -45,7 +45,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
static public Random random;
SceneObjectGroup found;
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
[Test]
public void T010_AddObjects()
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index 895f2bb..b7ff1b1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -44,7 +44,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestDuplicateObject()
{
TestHelper.InMethod();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");
string part1Name = "part1";
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 260d1c0..8b4771b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
string objName = "obj1";
UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
string obj1Name = "Alfred";
string obj2Name = "Betty";
@@ -112,8 +112,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- TestScene scene = SceneSetupHelpers.SetupScene();
- SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+ TestScene scene = SceneHelpers.SetupScene();
+ SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
scene.DeleteSceneObject(part.ParentGroup, false);
SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
@@ -131,15 +131,15 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.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 = SceneSetupHelpers.AddSceneObject(scene);
+ SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
- IClientAPI client = SceneSetupHelpers.AddClient(scene, agentId);
+ IClientAPI client = SceneHelpers.AddClient(scene, agentId);
scene.DeRezObjects(client, new System.Collections.Generic.List<uint>() { part.LocalId }, UUID.Zero, DeRezAction.Delete, UUID.Zero);
SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 1b8c100..d201510 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -61,12 +61,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.SetupScene();
IConfigSource configSource = new IniConfigSource();
IConfig config = configSource.AddConfig("Startup");
config.Set("serverside_object_permissions", true);
- SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
- TestClient client = SceneSetupHelpers.AddClient(scene, userId);
+ SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+ TestClient client = SceneHelpers.AddClient(scene, userId);
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
@@ -100,12 +100,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.SetupScene();
IConfigSource configSource = new IniConfigSource();
IConfig config = configSource.AddConfig("Startup");
config.Set("serverside_object_permissions", true);
- SceneSetupHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
- TestClient client = SceneSetupHelpers.AddClient(scene, userId);
+ SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+ TestClient client = SceneHelpers.AddClient(scene, userId);
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index cb1d531..b09144d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -54,10 +54,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests
bool debugtest = false;
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneObjectPart part1 = SceneSetupHelpers.AddSceneObject(scene);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneObjectPart part1 = SceneHelpers.AddSceneObject(scene);
SceneObjectGroup grp1 = part1.ParentGroup;
- SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
+ SceneObjectPart part2 = SceneHelpers.AddSceneObject(scene);
SceneObjectGroup grp2 = part2.ParentGroup;
grp1.AbsolutePosition = new Vector3(10, 10, 10);
@@ -136,14 +136,14 @@ namespace OpenSim.Region.Framework.Scenes.Tests
bool debugtest = false;
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneObjectPart part1 = SceneSetupHelpers.AddSceneObject(scene);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneObjectPart part1 = SceneHelpers.AddSceneObject(scene);
SceneObjectGroup grp1 = part1.ParentGroup;
- SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
+ SceneObjectPart part2 = SceneHelpers.AddSceneObject(scene);
SceneObjectGroup grp2 = part2.ParentGroup;
- SceneObjectPart part3 = SceneSetupHelpers.AddSceneObject(scene);
+ SceneObjectPart part3 = SceneHelpers.AddSceneObject(scene);
SceneObjectGroup grp3 = part3.ParentGroup;
- SceneObjectPart part4 = SceneSetupHelpers.AddSceneObject(scene);
+ SceneObjectPart part4 = SceneHelpers.AddSceneObject(scene);
SceneObjectGroup grp4 = part4.ParentGroup;
grp1.AbsolutePosition = new Vector3(10, 10, 10);
@@ -269,7 +269,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.SetupScene();
string rootPartName = "rootpart";
UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
@@ -308,7 +308,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.SetupScene();
string rootPartName = "rootpart";
UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index c4047ee..8630476 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -52,8 +52,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneObjectGroup g1 = SceneSetupHelpers.AddSceneObject(scene).ParentGroup;
+ Scene scene = SceneHelpers.SetupScene();
+ SceneObjectGroup g1 = SceneHelpers.AddSceneObject(scene).ParentGroup;
g1.GroupResize(new Vector3(2, 3, 4));
@@ -75,9 +75,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
- SceneObjectGroup g1 = SceneSetupHelpers.CreateSceneObject(2, UUID.Zero);
+ SceneObjectGroup g1 = SceneHelpers.CreateSceneObject(2, UUID.Zero);
g1.RootPart.Scale = new Vector3(2, 3, 4);
g1.Parts[1].Scale = new Vector3(5, 6, 7);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index c0fca5d..c2adb2a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
TestHelper.InMethod();
// Scene scene = SceneSetupHelpers.SetupScene();
- SceneObjectGroup so = SceneSetupHelpers.CreateSceneObject(1, UUID.Zero);
+ SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, UUID.Zero);
SceneObjectPart rootPart = so.RootPart;
Assert.That(rootPart.Flags, Is.EqualTo(PrimFlags.None));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index 8425d37..e0ab1c8 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.SetupScene();
IConfigSource configSource = new IniConfigSource();
IConfig startupConfig = configSource.AddConfig("Startup");
@@ -69,13 +69,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests
groupsConfig.Set("Module", "GroupsModule");
groupsConfig.Set("DebugEnabled", true);
- SceneSetupHelpers.SetupSceneModules(
+ SceneHelpers.SetupSceneModules(
scene, configSource, new object[]
{ new PermissionsModule(),
new GroupsModule(),
new MockGroupsServicesConnector() });
- TestClient client = SceneSetupHelpers.AddClient(scene, userId);
+ TestClient client = SceneHelpers.AddClient(scene, userId);
IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index a37b338..8af1b38 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -66,16 +66,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
- scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
- scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000);
+ scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
+ scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
+ scene3 = SceneHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000);
ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
interregionComms.Initialise(new IniConfigSource());
interregionComms.PostInitialise();
- SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
- SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
- SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms);
+ SceneHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
+ SceneHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
+ SceneHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms);
agent1 = UUID.Random();
agent2 = UUID.Random();
@@ -203,16 +203,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
- TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
- TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
+ TestScene myScene1 = SceneHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000);
+ TestScene myScene2 = SceneHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000);
IConfigSource configSource = new IniConfigSource();
configSource.AddConfig("Modules").Set("EntityTransferModule", "BasicEntityTransferModule");
EntityTransferModule etm = new EntityTransferModule();
- SceneSetupHelpers.SetupSceneModules(myScene1, configSource, etm);
+ SceneHelpers.SetupSceneModules(myScene1, configSource, etm);
- SceneSetupHelpers.AddClient(myScene1, agent1Id);
+ SceneHelpers.AddClient(myScene1, agent1Id);
ScenePresence childPresence = myScene2.GetScenePresence(agent1);
// TODO: Need to do a fair amount of work to allow synchronous establishment of child agents
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 13d93f9..8ffb22e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
{
TestHelper.InMethod();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
scene.Update();
Assert.That(scene.Frame, Is.EqualTo(1));
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index 4074f5d..a3848a7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -116,16 +116,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests
ISharedRegionModule interregionComms = new LocalSimulationConnectorModule();
- Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010);
- SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
+ Scene sceneB = SceneHelpers.SetupScene("sceneB", sceneBId, 1010, 1010);
+ SceneHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
sceneB.RegisterRegionWithGrid();
- Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000);
- SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
+ Scene sceneA = SceneHelpers.SetupScene("sceneA", sceneAId, 1000, 1000);
+ SceneHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
sceneA.RegisterRegionWithGrid();
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
- TestClient client = SceneSetupHelpers.AddClient(sceneA, agentId);
+ TestClient client = SceneHelpers.AddClient(sceneA, agentId);
ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index f4e14d4..a61832a 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -58,9 +58,9 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
- SceneObjectGroup sog1 = SceneSetupHelpers.CreateSceneObject(1, user1.PrincipalID);
+ SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart;
// Create an object embedded inside the first
@@ -101,9 +101,9 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
- SceneObjectGroup sog1 = SceneSetupHelpers.CreateSceneObject(1, user1.PrincipalID);
+ SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart;
TaskInventoryItem sopItem1 = TaskInventoryHelpers.AddNotecard(scene, sop1);
@@ -128,9 +128,9 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
- SceneObjectGroup sog1 = SceneSetupHelpers.CreateSceneObject(1, user1.PrincipalID);
+ SceneObjectGroup sog1 = SceneHelpers.CreateSceneObject(1, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart;
TaskInventoryItem sopItem1 = TaskInventoryHelpers.AddNotecard(scene, sop1);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index abca792..f6e2827 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, 1001);
UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, 1002);
InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "item1", user1.PrincipalID);
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, 1001);
UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, 1002);
InventoryFolderBase folder1
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 4da8df1..b0ea497 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void Init()
{
// FIXME: We don't need a full scene here - it would be enough to set up the asset service.
- Scene scene = SceneSetupHelpers.SetupScene();
+ Scene scene = SceneHelpers.SetupScene();
m_assetService = scene.AssetService;
m_uuidGatherer = new UuidGatherer(m_assetService);
}
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
index ee52a39..1e56a08 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
@@ -50,13 +50,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
TestHelper.InMethod();
// log4net.Config.XmlConfigurator.Configure();
- TestScene scene = SceneSetupHelpers.SetupScene();
+ TestScene scene = SceneHelpers.SetupScene();
IConfigSource configSource = new IniConfigSource();
IConfig config = configSource.AddConfig("Groups");
config.Set("Enabled", true);
config.Set("Module", "GroupsModule");
config.Set("DebugEnabled", true);
- SceneSetupHelpers.SetupSceneModules(
+ SceneHelpers.SetupSceneModules(
scene, configSource, new object[] { new MockGroupsServicesConnector() });
}
}
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
index c9dddba..c0053c9 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
@@ -57,9 +57,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
config.Configs["NPC"].Set("Enabled", "true");
AvatarFactoryModule afm = new AvatarFactoryModule();
- TestScene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, config, afm, new NPCModule());
- TestClient originalClient = SceneSetupHelpers.AddClient(scene, TestHelper.ParseTail(0x1));
+ TestScene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, config, afm, new NPCModule());
+ TestClient originalClient = SceneHelpers.AddClient(scene, TestHelper.ParseTail(0x1));
// ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
// 8 is the index of the first baked texture in AvatarAppearance
@@ -94,9 +94,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
config.AddConfig("NPC");
config.Configs["NPC"].Set("Enabled", "true");
- TestScene scene = SceneSetupHelpers.SetupScene();
- SceneSetupHelpers.SetupSceneModules(scene, config, new NPCModule());
- TestClient originalClient = SceneSetupHelpers.AddClient(scene, TestHelper.ParseTail(0x1));
+ TestScene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, config, new NPCModule());
+ TestClient originalClient = SceneHelpers.AddClient(scene, TestHelper.ParseTail(0x1));
// ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
Vector3 startPos = new Vector3(128, 128, 30);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 80b60a4..3f37ec7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -57,8 +57,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
IConfig config = initConfigSource.AddConfig("XEngine");
config.Set("Enabled", "true");
- Scene scene = SceneSetupHelpers.SetupScene();
- SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+ Scene scene = SceneHelpers.SetupScene();
+ SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
XEngine.XEngine engine = new XEngine.XEngine();
engine.Initialise(initConfigSource);
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
new file mode 100644
index 0000000..55b638b
--- /dev/null
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -0,0 +1,483 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Net;
+using System.Collections.Generic;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Physics.Manager;
+using OpenSim.Region.Framework;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.CoreModules.Avatar.Gods;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Tests.Common
+{
+ /// <summary>
+ /// Helpers for setting up scenes.
+ /// </summary>
+ public class SceneHelpers
+ {
+ /// <summary>
+ /// Set up a test scene
+ /// </summary>
+ /// <remarks>
+ /// Automatically starts service threads, as would the normal runtime.
+ /// </remarks>
+ /// <returns></returns>
+ public static TestScene SetupScene()
+ {
+ return SetupScene("Unit test region", UUID.Random(), 1000, 1000);
+ }
+
+ /// <summary>
+ /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions
+ /// or a different, to get a brand new scene with new shared region modules.
+ /// </summary>
+ /// <param name="name">Name of the region</param>
+ /// <param name="id">ID of the region</param>
+ /// <param name="x">X co-ordinate of the region</param>
+ /// <param name="y">Y co-ordinate of the region</param>
+ /// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
+ /// <returns></returns>
+ public static TestScene SetupScene(string name, UUID id, uint x, uint y)
+ {
+ Console.WriteLine("Setting up test scene {0}", name);
+
+ // We must set up a console otherwise setup of some modules may fail
+ MainConsole.Instance = new MockConsole("TEST PROMPT");
+
+ RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
+ regInfo.RegionName = name;
+ regInfo.RegionID = id;
+
+ AgentCircuitManager acm = new AgentCircuitManager();
+ SceneCommunicationService scs = new SceneCommunicationService();
+
+ ISimulationDataService simDataService = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
+ IEstateDataService estateDataService = null;
+ IConfigSource configSource = new IniConfigSource();
+
+ TestScene testScene = new TestScene(
+ regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null);
+
+ IRegionModule godsModule = new GodsModule();
+ godsModule.Initialise(testScene, new IniConfigSource());
+ testScene.AddModule(godsModule.Name, godsModule);
+
+ LocalAssetServicesConnector assetService = StartAssetService(testScene);
+ StartAuthenticationService(testScene);
+ LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
+ StartGridService(testScene);
+ LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
+ LocalPresenceServicesConnector presenceService = StartPresenceService(testScene);
+
+ inventoryService.PostInitialise();
+ assetService.PostInitialise();
+ userAccountService.PostInitialise();
+ presenceService.PostInitialise();
+
+ testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
+ testScene.SetModuleInterfaces();
+
+ testScene.LandChannel = new TestLandChannel(testScene);
+ testScene.LoadWorldMap();
+
+ PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
+ physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
+ testScene.PhysicsScene
+ = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
+
+ testScene.RegionInfo.EstateSettings = new EstateSettings();
+ testScene.LoginsDisabled = false;
+
+ return testScene;
+ }
+
+ private static LocalAssetServicesConnector StartAssetService(Scene testScene)
+ {
+ LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
+ IConfigSource config = new IniConfigSource();
+
+ config.AddConfig("Modules");
+ config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
+ config.AddConfig("AssetService");
+ config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+ config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+
+ assetService.Initialise(config);
+ assetService.AddRegion(testScene);
+ assetService.RegionLoaded(testScene);
+ testScene.AddRegionModule(assetService.Name, assetService);
+
+ return assetService;
+ }
+
+ private static void StartAuthenticationService(Scene testScene)
+ {
+ ISharedRegionModule service = new LocalAuthenticationServicesConnector();
+ IConfigSource config = new IniConfigSource();
+
+ config.AddConfig("Modules");
+ config.AddConfig("AuthenticationService");
+ config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector");
+ config.Configs["AuthenticationService"].Set(
+ "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
+ config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
+
+ service.Initialise(config);
+ service.AddRegion(testScene);
+ service.RegionLoaded(testScene);
+ testScene.AddRegionModule(service.Name, service);
+ //m_authenticationService = service;
+ }
+
+ private static LocalInventoryServicesConnector StartInventoryService(Scene testScene)
+ {
+ LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
+
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Modules");
+ config.AddConfig("InventoryService");
+ config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
+ config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
+ config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+
+ inventoryService.Initialise(config);
+ inventoryService.AddRegion(testScene);
+ inventoryService.RegionLoaded(testScene);
+ testScene.AddRegionModule(inventoryService.Name, inventoryService);
+
+ return inventoryService;
+ }
+
+ private static LocalGridServicesConnector StartGridService(Scene testScene)
+ {
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Modules");
+ config.AddConfig("GridService");
+ config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
+ config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
+ config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+
+ LocalGridServicesConnector gridService = new LocalGridServicesConnector();
+ gridService.Initialise(config);
+ gridService.AddRegion(testScene);
+ gridService.RegionLoaded(testScene);
+
+ return gridService;
+ }
+
+ /// <summary>
+ /// Start a user account service
+ /// </summary>
+ /// <param name="testScene"></param>
+ /// <returns></returns>
+ private static LocalUserAccountServicesConnector StartUserAccountService(Scene testScene)
+ {
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Modules");
+ config.AddConfig("UserAccountService");
+ config.Configs["Modules"].Set("UserAccountServices", "LocalUserAccountServicesConnector");
+ config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
+ config.Configs["UserAccountService"].Set(
+ "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
+
+ LocalUserAccountServicesConnector userAccountService = new LocalUserAccountServicesConnector();
+ userAccountService.Initialise(config);
+
+ userAccountService.AddRegion(testScene);
+ userAccountService.RegionLoaded(testScene);
+ testScene.AddRegionModule(userAccountService.Name, userAccountService);
+
+ return userAccountService;
+ }
+
+ /// <summary>
+ /// Start a presence service
+ /// </summary>
+ /// <param name="testScene"></param>
+ private static LocalPresenceServicesConnector StartPresenceService(Scene testScene)
+ {
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Modules");
+ config.AddConfig("PresenceService");
+ config.Configs["Modules"].Set("PresenceServices", "LocalPresenceServicesConnector");
+ config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
+ config.Configs["PresenceService"].Set(
+ "LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService");
+
+ LocalPresenceServicesConnector presenceService = new LocalPresenceServicesConnector();
+ presenceService.Initialise(config);
+
+ presenceService.AddRegion(testScene);
+ presenceService.RegionLoaded(testScene);
+ testScene.AddRegionModule(presenceService.Name, presenceService);
+
+ return presenceService;
+ }
+
+ /// <summary>
+ /// Setup modules for a scene using their default settings.
+ /// </summary>
+ /// <param name="scene"></param>
+ /// <param name="modules"></param>
+ public static void SetupSceneModules(Scene scene, params object[] modules)
+ {
+ SetupSceneModules(scene, new IniConfigSource(), modules);
+ }
+
+ /// <summary>
+ /// Setup modules for a scene.
+ /// </summary>
+ /// <param name="scene"></param>
+ /// <param name="config"></param>
+ /// <param name="modules"></param>
+ public static void SetupSceneModules(Scene scene, IConfigSource config, params object[] modules)
+ {
+ List<IRegionModuleBase> newModules = new List<IRegionModuleBase>();
+ foreach (object module in modules)
+ {
+ if (module is IRegionModule)
+ {
+ IRegionModule m = (IRegionModule)module;
+ m.Initialise(scene, config);
+ scene.AddModule(m.Name, m);
+ m.PostInitialise();
+ }
+ else if (module is IRegionModuleBase)
+ {
+ // for the new system, everything has to be initialised first,
+ // shared modules have to be post-initialised, then all get an AddRegion with the scene
+ IRegionModuleBase m = (IRegionModuleBase)module;
+ m.Initialise(config);
+ newModules.Add(m);
+ }
+ }
+
+ foreach (IRegionModuleBase module in newModules)
+ {
+ if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise();
+ }
+
+ foreach (IRegionModuleBase module in newModules)
+ {
+ module.AddRegion(scene);
+ scene.AddRegionModule(module.Name, module);
+ }
+
+ // RegionLoaded is fired after all modules have been appropriately added to all scenes
+ foreach (IRegionModuleBase module in newModules)
+ module.RegionLoaded(scene);
+
+ scene.SetModuleInterfaces();
+ }
+
+ /// <summary>
+ /// Generate some standard agent connection data.
+ /// </summary>
+ /// <param name="agentId"></param>
+ /// <returns></returns>
+ public static AgentCircuitData GenerateAgentData(UUID agentId)
+ {
+ string firstName = "testfirstname";
+
+ AgentCircuitData agentData = new AgentCircuitData();
+ agentData.AgentID = agentId;
+ agentData.firstname = firstName;
+ agentData.lastname = "testlastname";
+ agentData.SessionID = UUID.Zero;
+ agentData.SecureSessionID = UUID.Zero;
+ agentData.circuitcode = 123;
+ agentData.BaseFolder = UUID.Zero;
+ agentData.InventoryFolder = UUID.Zero;
+ agentData.startpos = Vector3.Zero;
+ agentData.CapsPath = "http://wibble.com";
+
+ return agentData;
+ }
+
+ /// <summary>
+ /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
+ /// </summary>
+ /// <param name="scene"></param>
+ /// <param name="agentId"></param>
+ /// <returns></returns>
+ public static TestClient AddClient(Scene scene, UUID agentId)
+ {
+ return AddClient(scene, GenerateAgentData(agentId));
+ }
+
+ /// <summary>
+ /// Add a root agent.
+ /// </summary>
+ /// <remarks>
+ /// This function
+ ///
+ /// 1) Tells the scene that an agent is coming. Normally, the login service (local if standalone, from the
+ /// userserver if grid) would give initial login data back to the client and separately tell the scene that the
+ /// agent was coming.
+ ///
+ /// 2) Connects the agent with the scene
+ ///
+ /// This function performs actions equivalent with notifying the scene that an agent is
+ /// coming and then actually connecting the agent to the scene. The one step missed out is the very first
+ /// </remarks>
+ /// <param name="scene"></param>
+ /// <param name="agentData"></param>
+ /// <returns></returns>
+ public static TestClient AddClient(Scene scene, AgentCircuitData agentData)
+ {
+ string reason;
+
+ // We emulate the proper login sequence here by doing things in four stages
+
+ // Stage 0: log the presence
+ scene.PresenceService.LoginAgent(agentData.AgentID.ToString(), agentData.SessionID, agentData.SecureSessionID);
+
+ // Stage 1: simulate login by telling the scene to expect a new user connection
+ if (!scene.NewUserConnection(agentData, (uint)TeleportFlags.ViaLogin, out reason))
+ Console.WriteLine("NewUserConnection failed: " + reason);
+
+ // Stage 2: add the new client as a child agent to the scene
+ TestClient client = new TestClient(agentData, scene);
+ scene.AddNewClient(client);
+
+ // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent.
+ ScenePresence scp = scene.GetScenePresence(agentData.AgentID);
+ scp.CompleteMovement(client);
+ //scp.MakeRootAgent(new Vector3(90, 90, 90), true);
+
+ return client;
+ }
+
+ /// <summary>
+ /// Add a test object
+ /// </summary>
+ /// <param name="scene"></param>
+ /// <returns></returns>
+ public static SceneObjectPart AddSceneObject(Scene scene)
+ {
+ return AddSceneObject(scene, "Test Object");
+ }
+
+ /// <summary>
+ /// Add a test object
+ /// </summary>
+ /// <param name="scene"></param>
+ /// <param name="name"></param>
+ /// <returns></returns>
+ public static SceneObjectPart AddSceneObject(Scene scene, string name)
+ {
+ SceneObjectPart part = CreateSceneObjectPart(name, UUID.Random(), UUID.Zero);
+
+ //part.UpdatePrimFlags(false, false, true);
+ //part.ObjectFlags |= (uint)PrimFlags.Phantom;
+
+ scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+
+ return part;
+ }
+
+ /// <summary>
+ /// Create a scene object part.
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="id"></param>
+ /// <param name="ownerId"></param>
+ /// <returns></returns>
+ public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId)
+ {
+ return new SceneObjectPart(
+ ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
+ { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };
+ }
+
+ /// <summary>
+ /// Create a scene object but do not add it to the scene.
+ /// </summary>
+ /// <remarks>
+ /// UUID always starts at 00000000-0000-0000-0000-000000000001
+ /// </remarks>
+ /// <param name="parts">The number of parts that should be in the scene object</param>
+ /// <param name="ownerId"></param>
+ /// <returns></returns>
+ public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
+ {
+ return CreateSceneObject(parts, ownerId, "", 0x1);
+ }
+
+ /// <summary>
+ /// Create a scene object but do not add it to the scene.
+ /// </summary>
+ /// <param name="parts">
+ /// The number of parts that should be in the scene object
+ /// </param>
+ /// <param name="ownerId"></param>
+ /// <param name="partNamePrefix">
+ /// The prefix to be given to part names. This will be suffixed with "Part<part no>"
+ /// (e.g. mynamePart0 for the root part)
+ /// </param>
+ /// <param name="uuidTail">
+ /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}"
+ /// will be given to the root part, and incremented for each part thereafter.
+ /// </param>
+ /// <returns></returns>
+ public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, string partNamePrefix, int uuidTail)
+ {
+ string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail);
+
+ SceneObjectGroup sog
+ = new SceneObjectGroup(
+ CreateSceneObjectPart(string.Format("{0}Part0", partNamePrefix), new UUID(rawSogId), ownerId));
+
+ if (parts > 1)
+ for (int i = 1; i < parts; i++)
+ sog.AddPart(
+ CreateSceneObjectPart(
+ string.Format("{0}Part{1}", partNamePrefix, i),
+ new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i)),
+ ownerId));
+
+ return sog;
+ }
+ }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
deleted file mode 100644
index 70621d5..0000000
--- a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
+++ /dev/null
@@ -1,483 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Net;
-using System.Collections.Generic;
-using Nini.Config;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Console;
-using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Physics.Manager;
-using OpenSim.Region.Framework;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Region.CoreModules.Avatar.Gods;
-using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
-using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication;
-using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory;
-using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
-using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
-using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence;
-using OpenSim.Services.Interfaces;
-using OpenSim.Tests.Common.Mock;
-
-namespace OpenSim.Tests.Common
-{
- /// <summary>
- /// Helpers for setting up scenes.
- /// </summary>
- public class SceneSetupHelpers
- {
- /// <summary>
- /// Set up a test scene
- /// </summary>
- /// <remarks>
- /// Automatically starts service threads, as would the normal runtime.
- /// </remarks>
- /// <returns></returns>
- public static TestScene SetupScene()
- {
- return SetupScene("Unit test region", UUID.Random(), 1000, 1000);
- }
-
- /// <summary>
- /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions
- /// or a different, to get a brand new scene with new shared region modules.
- /// </summary>
- /// <param name="name">Name of the region</param>
- /// <param name="id">ID of the region</param>
- /// <param name="x">X co-ordinate of the region</param>
- /// <param name="y">Y co-ordinate of the region</param>
- /// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
- /// <returns></returns>
- public static TestScene SetupScene(string name, UUID id, uint x, uint y)
- {
- Console.WriteLine("Setting up test scene {0}", name);
-
- // We must set up a console otherwise setup of some modules may fail
- MainConsole.Instance = new MockConsole("TEST PROMPT");
-
- RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
- regInfo.RegionName = name;
- regInfo.RegionID = id;
-
- AgentCircuitManager acm = new AgentCircuitManager();
- SceneCommunicationService scs = new SceneCommunicationService();
-
- ISimulationDataService simDataService = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
- IEstateDataService estateDataService = null;
- IConfigSource configSource = new IniConfigSource();
-
- TestScene testScene = new TestScene(
- regInfo, acm, scs, simDataService, estateDataService, null, false, false, false, configSource, null);
-
- IRegionModule godsModule = new GodsModule();
- godsModule.Initialise(testScene, new IniConfigSource());
- testScene.AddModule(godsModule.Name, godsModule);
-
- LocalAssetServicesConnector assetService = StartAssetService(testScene);
- StartAuthenticationService(testScene);
- LocalInventoryServicesConnector inventoryService = StartInventoryService(testScene);
- StartGridService(testScene);
- LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);
- LocalPresenceServicesConnector presenceService = StartPresenceService(testScene);
-
- inventoryService.PostInitialise();
- assetService.PostInitialise();
- userAccountService.PostInitialise();
- presenceService.PostInitialise();
-
- testScene.RegionInfo.EstateSettings.EstateOwner = UUID.Random();
- testScene.SetModuleInterfaces();
-
- testScene.LandChannel = new TestLandChannel(testScene);
- testScene.LoadWorldMap();
-
- PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
- physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
- testScene.PhysicsScene
- = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
-
- testScene.RegionInfo.EstateSettings = new EstateSettings();
- testScene.LoginsDisabled = false;
-
- return testScene;
- }
-
- private static LocalAssetServicesConnector StartAssetService(Scene testScene)
- {
- LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
- IConfigSource config = new IniConfigSource();
-
- config.AddConfig("Modules");
- config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
- config.AddConfig("AssetService");
- config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
- config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
-
- assetService.Initialise(config);
- assetService.AddRegion(testScene);
- assetService.RegionLoaded(testScene);
- testScene.AddRegionModule(assetService.Name, assetService);
-
- return assetService;
- }
-
- private static void StartAuthenticationService(Scene testScene)
- {
- ISharedRegionModule service = new LocalAuthenticationServicesConnector();
- IConfigSource config = new IniConfigSource();
-
- config.AddConfig("Modules");
- config.AddConfig("AuthenticationService");
- config.Configs["Modules"].Set("AuthenticationServices", "LocalAuthenticationServicesConnector");
- config.Configs["AuthenticationService"].Set(
- "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
- config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
-
- service.Initialise(config);
- service.AddRegion(testScene);
- service.RegionLoaded(testScene);
- testScene.AddRegionModule(service.Name, service);
- //m_authenticationService = service;
- }
-
- private static LocalInventoryServicesConnector StartInventoryService(Scene testScene)
- {
- LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
-
- IConfigSource config = new IniConfigSource();
- config.AddConfig("Modules");
- config.AddConfig("InventoryService");
- config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
- config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
- config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
-
- inventoryService.Initialise(config);
- inventoryService.AddRegion(testScene);
- inventoryService.RegionLoaded(testScene);
- testScene.AddRegionModule(inventoryService.Name, inventoryService);
-
- return inventoryService;
- }
-
- private static LocalGridServicesConnector StartGridService(Scene testScene)
- {
- IConfigSource config = new IniConfigSource();
- config.AddConfig("Modules");
- config.AddConfig("GridService");
- config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
- config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
- config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
-
- LocalGridServicesConnector gridService = new LocalGridServicesConnector();
- gridService.Initialise(config);
- gridService.AddRegion(testScene);
- gridService.RegionLoaded(testScene);
-
- return gridService;
- }
-
- /// <summary>
- /// Start a user account service
- /// </summary>
- /// <param name="testScene"></param>
- /// <returns></returns>
- private static LocalUserAccountServicesConnector StartUserAccountService(Scene testScene)
- {
- IConfigSource config = new IniConfigSource();
- config.AddConfig("Modules");
- config.AddConfig("UserAccountService");
- config.Configs["Modules"].Set("UserAccountServices", "LocalUserAccountServicesConnector");
- config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
- config.Configs["UserAccountService"].Set(
- "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
-
- LocalUserAccountServicesConnector userAccountService = new LocalUserAccountServicesConnector();
- userAccountService.Initialise(config);
-
- userAccountService.AddRegion(testScene);
- userAccountService.RegionLoaded(testScene);
- testScene.AddRegionModule(userAccountService.Name, userAccountService);
-
- return userAccountService;
- }
-
- /// <summary>
- /// Start a presence service
- /// </summary>
- /// <param name="testScene"></param>
- private static LocalPresenceServicesConnector StartPresenceService(Scene testScene)
- {
- IConfigSource config = new IniConfigSource();
- config.AddConfig("Modules");
- config.AddConfig("PresenceService");
- config.Configs["Modules"].Set("PresenceServices", "LocalPresenceServicesConnector");
- config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
- config.Configs["PresenceService"].Set(
- "LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService");
-
- LocalPresenceServicesConnector presenceService = new LocalPresenceServicesConnector();
- presenceService.Initialise(config);
-
- presenceService.AddRegion(testScene);
- presenceService.RegionLoaded(testScene);
- testScene.AddRegionModule(presenceService.Name, presenceService);
-
- return presenceService;
- }
-
- /// <summary>
- /// Setup modules for a scene using their default settings.
- /// </summary>
- /// <param name="scene"></param>
- /// <param name="modules"></param>
- public static void SetupSceneModules(Scene scene, params object[] modules)
- {
- SetupSceneModules(scene, new IniConfigSource(), modules);
- }
-
- /// <summary>
- /// Setup modules for a scene.
- /// </summary>
- /// <param name="scene"></param>
- /// <param name="config"></param>
- /// <param name="modules"></param>
- public static void SetupSceneModules(Scene scene, IConfigSource config, params object[] modules)
- {
- List<IRegionModuleBase> newModules = new List<IRegionModuleBase>();
- foreach (object module in modules)
- {
- if (module is IRegionModule)
- {
- IRegionModule m = (IRegionModule)module;
- m.Initialise(scene, config);
- scene.AddModule(m.Name, m);
- m.PostInitialise();
- }
- else if (module is IRegionModuleBase)
- {
- // for the new system, everything has to be initialised first,
- // shared modules have to be post-initialised, then all get an AddRegion with the scene
- IRegionModuleBase m = (IRegionModuleBase)module;
- m.Initialise(config);
- newModules.Add(m);
- }
- }
-
- foreach (IRegionModuleBase module in newModules)
- {
- if (module is ISharedRegionModule) ((ISharedRegionModule)module).PostInitialise();
- }
-
- foreach (IRegionModuleBase module in newModules)
- {
- module.AddRegion(scene);
- scene.AddRegionModule(module.Name, module);
- }
-
- // RegionLoaded is fired after all modules have been appropriately added to all scenes
- foreach (IRegionModuleBase module in newModules)
- module.RegionLoaded(scene);
-
- scene.SetModuleInterfaces();
- }
-
- /// <summary>
- /// Generate some standard agent connection data.
- /// </summary>
- /// <param name="agentId"></param>
- /// <returns></returns>
- public static AgentCircuitData GenerateAgentData(UUID agentId)
- {
- string firstName = "testfirstname";
-
- AgentCircuitData agentData = new AgentCircuitData();
- agentData.AgentID = agentId;
- agentData.firstname = firstName;
- agentData.lastname = "testlastname";
- agentData.SessionID = UUID.Zero;
- agentData.SecureSessionID = UUID.Zero;
- agentData.circuitcode = 123;
- agentData.BaseFolder = UUID.Zero;
- agentData.InventoryFolder = UUID.Zero;
- agentData.startpos = Vector3.Zero;
- agentData.CapsPath = "http://wibble.com";
-
- return agentData;
- }
-
- /// <summary>
- /// Add a root agent where the details of the agent connection (apart from the id) are unimportant for the test
- /// </summary>
- /// <param name="scene"></param>
- /// <param name="agentId"></param>
- /// <returns></returns>
- public static TestClient AddClient(Scene scene, UUID agentId)
- {
- return AddClient(scene, GenerateAgentData(agentId));
- }
-
- /// <summary>
- /// Add a root agent.
- /// </summary>
- /// <remarks>
- /// This function
- ///
- /// 1) Tells the scene that an agent is coming. Normally, the login service (local if standalone, from the
- /// userserver if grid) would give initial login data back to the client and separately tell the scene that the
- /// agent was coming.
- ///
- /// 2) Connects the agent with the scene
- ///
- /// This function performs actions equivalent with notifying the scene that an agent is
- /// coming and then actually connecting the agent to the scene. The one step missed out is the very first
- /// </remarks>
- /// <param name="scene"></param>
- /// <param name="agentData"></param>
- /// <returns></returns>
- public static TestClient AddClient(Scene scene, AgentCircuitData agentData)
- {
- string reason;
-
- // We emulate the proper login sequence here by doing things in four stages
-
- // Stage 0: log the presence
- scene.PresenceService.LoginAgent(agentData.AgentID.ToString(), agentData.SessionID, agentData.SecureSessionID);
-
- // Stage 1: simulate login by telling the scene to expect a new user connection
- if (!scene.NewUserConnection(agentData, (uint)TeleportFlags.ViaLogin, out reason))
- Console.WriteLine("NewUserConnection failed: " + reason);
-
- // Stage 2: add the new client as a child agent to the scene
- TestClient client = new TestClient(agentData, scene);
- scene.AddNewClient(client);
-
- // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent.
- ScenePresence scp = scene.GetScenePresence(agentData.AgentID);
- scp.CompleteMovement(client);
- //scp.MakeRootAgent(new Vector3(90, 90, 90), true);
-
- return client;
- }
-
- /// <summary>
- /// Add a test object
- /// </summary>
- /// <param name="scene"></param>
- /// <returns></returns>
- public static SceneObjectPart AddSceneObject(Scene scene)
- {
- return AddSceneObject(scene, "Test Object");
- }
-
- /// <summary>
- /// Add a test object
- /// </summary>
- /// <param name="scene"></param>
- /// <param name="name"></param>
- /// <returns></returns>
- public static SceneObjectPart AddSceneObject(Scene scene, string name)
- {
- SceneObjectPart part = CreateSceneObjectPart(name, UUID.Random(), UUID.Zero);
-
- //part.UpdatePrimFlags(false, false, true);
- //part.ObjectFlags |= (uint)PrimFlags.Phantom;
-
- scene.AddNewSceneObject(new SceneObjectGroup(part), false);
-
- return part;
- }
-
- /// <summary>
- /// Create a scene object part.
- /// </summary>
- /// <param name="name"></param>
- /// <param name="id"></param>
- /// <param name="ownerId"></param>
- /// <returns></returns>
- public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId)
- {
- return new SceneObjectPart(
- ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
- { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) };
- }
-
- /// <summary>
- /// Create a scene object but do not add it to the scene.
- /// </summary>
- /// <remarks>
- /// UUID always starts at 00000000-0000-0000-0000-000000000001
- /// </remarks>
- /// <param name="parts">The number of parts that should be in the scene object</param>
- /// <param name="ownerId"></param>
- /// <returns></returns>
- public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId)
- {
- return CreateSceneObject(parts, ownerId, "", 0x1);
- }
-
- /// <summary>
- /// Create a scene object but do not add it to the scene.
- /// </summary>
- /// <param name="parts">
- /// The number of parts that should be in the scene object
- /// </param>
- /// <param name="ownerId"></param>
- /// <param name="partNamePrefix">
- /// The prefix to be given to part names. This will be suffixed with "Part<part no>"
- /// (e.g. mynamePart0 for the root part)
- /// </param>
- /// <param name="uuidTail">
- /// The hexadecimal last part of the UUID for parts created. A UUID of the form "00000000-0000-0000-0000-{0:XD12}"
- /// will be given to the root part, and incremented for each part thereafter.
- /// </param>
- /// <returns></returns>
- public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, string partNamePrefix, int uuidTail)
- {
- string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail);
-
- SceneObjectGroup sog
- = new SceneObjectGroup(
- CreateSceneObjectPart(string.Format("{0}Part0", partNamePrefix), new UUID(rawSogId), ownerId));
-
- if (parts > 1)
- for (int i = 1; i < parts; i++)
- sog.AddPart(
- CreateSceneObjectPart(
- string.Format("{0}Part{1}", partNamePrefix, i),
- new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i)),
- ownerId));
-
- return sog;
- }
- }
-}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
index 5215c34..a8f0d59 100644
--- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Tests.Common
/// <param name="id"></param>
public static TaskInventoryItem AddSceneObject(Scene scene, SceneObjectPart sop, string itemName, UUID id)
{
- SceneObjectGroup taskSceneObject = SceneSetupHelpers.CreateSceneObject(1, UUID.Zero);
+ SceneObjectGroup taskSceneObject = SceneHelpers.CreateSceneObject(1, UUID.Zero);
AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(0x10, taskSceneObject);
scene.AssetService.Store(taskSceneObjectAsset);
TaskInventoryItem taskSceneObjectItem
--
cgit v1.1