factor out common test setup code in PCM tests
parent
f001aab8aa
commit
eaa37d15f2
|
@ -44,6 +44,26 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
|
||||||
[TestFixture]
|
[TestFixture]
|
||||||
public class PrimCountModuleTests
|
public class PrimCountModuleTests
|
||||||
{
|
{
|
||||||
|
protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000");
|
||||||
|
protected UUID m_dummyUserId = new UUID("99999999-9999-9999-9999-999999999999");
|
||||||
|
protected TestScene m_scene;
|
||||||
|
protected PrimCountModule m_pcm;
|
||||||
|
protected ILandObject m_lo;
|
||||||
|
|
||||||
|
[SetUp]
|
||||||
|
public void SetUp()
|
||||||
|
{
|
||||||
|
m_pcm = new PrimCountModule();
|
||||||
|
LandManagementModule lmm = new LandManagementModule();
|
||||||
|
m_scene = SceneSetupHelpers.SetupScene();
|
||||||
|
SceneSetupHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
|
||||||
|
|
||||||
|
m_lo = new LandObject(m_userId, false, m_scene);
|
||||||
|
m_lo.SetLandBitmap(m_lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
|
||||||
|
lmm.AddLandObject(m_lo);
|
||||||
|
//scene.loadAllLandObjectsFromStorage(scene.RegionInfo.originRegionID);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Test count after a parcel owner owned object is added.
|
/// Test count after a parcel owner owned object is added.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -51,47 +71,35 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
|
||||||
public void TestAddOwnerObject()
|
public void TestAddOwnerObject()
|
||||||
{
|
{
|
||||||
TestHelper.InMethod();
|
TestHelper.InMethod();
|
||||||
// log4net.Config.XmlConfigurator.Configure();
|
// log4net.Config.XmlConfigurator.Configure();
|
||||||
|
|
||||||
PrimCountModule pcm = new PrimCountModule();
|
|
||||||
LandManagementModule lmm = new LandManagementModule();
|
|
||||||
Scene scene = SceneSetupHelpers.SetupScene();
|
|
||||||
SceneSetupHelpers.SetupSceneModules(scene, lmm, pcm);
|
|
||||||
|
|
||||||
UUID userId = new UUID("00000000-0000-0000-0000-100000000000");
|
|
||||||
UUID dummyUserId = new UUID("99999999-9999-9999-9999-999999999999");
|
|
||||||
ILandObject lo = new LandObject(userId, false, scene);
|
|
||||||
lo.SetLandBitmap(lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
|
|
||||||
lmm.AddLandObject(lo);
|
|
||||||
//scene.loadAllLandObjectsFromStorage(scene.RegionInfo.originRegionID);
|
|
||||||
|
|
||||||
Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetOwnerCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetGroupCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetOthersCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, userId), Is.EqualTo(0));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_userId), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_dummyUserId), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetSimulatorCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
|
|
||||||
SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, userId, 0x01);
|
SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x01);
|
||||||
scene.AddNewSceneObject(sog, false);
|
m_scene.AddNewSceneObject(sog, false);
|
||||||
|
|
||||||
Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(3));
|
Assert.That(m_pcm.GetOwnerCount(m_lo.LandData.GlobalID), Is.EqualTo(3));
|
||||||
Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetGroupCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetOthersCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, userId), Is.EqualTo(3));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_userId), Is.EqualTo(3));
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_dummyUserId), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(3));
|
Assert.That(m_pcm.GetSimulatorCount(m_lo.LandData.GlobalID), Is.EqualTo(3));
|
||||||
|
|
||||||
// Add a second object and retest
|
// Add a second object and retest
|
||||||
SceneObjectGroup sog2 = SceneSetupHelpers.CreateSceneObject(2, userId, 0x10);
|
SceneObjectGroup sog2 = SceneSetupHelpers.CreateSceneObject(2, m_userId, 0x10);
|
||||||
scene.AddNewSceneObject(sog2, false);
|
m_scene.AddNewSceneObject(sog2, false);
|
||||||
|
|
||||||
Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(5));
|
Assert.That(m_pcm.GetOwnerCount(m_lo.LandData.GlobalID), Is.EqualTo(5));
|
||||||
Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetGroupCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
Assert.That(m_pcm.GetOthersCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, userId), Is.EqualTo(5));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_userId), Is.EqualTo(5));
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_dummyUserId), Is.EqualTo(0));
|
||||||
Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(5));
|
Assert.That(m_pcm.GetSimulatorCount(m_lo.LandData.GlobalID), Is.EqualTo(5));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -103,29 +111,17 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
|
||||||
TestHelper.InMethod();
|
TestHelper.InMethod();
|
||||||
// log4net.Config.XmlConfigurator.Configure();
|
// log4net.Config.XmlConfigurator.Configure();
|
||||||
|
|
||||||
PrimCountModule pcm = new PrimCountModule();
|
m_scene.AddNewSceneObject(SceneSetupHelpers.CreateSceneObject(1, m_userId, 0x1), false);
|
||||||
LandManagementModule lmm = new LandManagementModule();
|
SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x10);
|
||||||
Scene scene = SceneSetupHelpers.SetupScene();
|
m_scene.AddNewSceneObject(sogToDelete, false);
|
||||||
SceneSetupHelpers.SetupSceneModules(scene, lmm, pcm);
|
m_scene.DeleteSceneObject(sogToDelete, false);
|
||||||
|
|
||||||
UUID userId = new UUID("00000000-0000-0000-0000-000000000010");
|
Assert.That(m_pcm.GetOwnerCount(m_lo.LandData.GlobalID), Is.EqualTo(1));
|
||||||
UUID dummyUserId = new UUID("99999999-9999-9999-9999-999999999999");
|
Assert.That(m_pcm.GetGroupCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
ILandObject lo = new LandObject(userId, false, scene);
|
Assert.That(m_pcm.GetOthersCount(m_lo.LandData.GlobalID), Is.EqualTo(0));
|
||||||
lo.SetLandBitmap(lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_userId), Is.EqualTo(1));
|
||||||
lmm.AddLandObject(lo);
|
Assert.That(m_pcm.GetUserCount(m_lo.LandData.GlobalID, m_dummyUserId), Is.EqualTo(0));
|
||||||
//scene.loadAllLandObjectsFromStorage(scene.RegionInfo.originRegionID);
|
Assert.That(m_pcm.GetSimulatorCount(m_lo.LandData.GlobalID), Is.EqualTo(1));
|
||||||
|
|
||||||
scene.AddNewSceneObject(SceneSetupHelpers.CreateSceneObject(1, userId, 0x1), false);
|
|
||||||
SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, userId, 0x10);
|
|
||||||
scene.AddNewSceneObject(sogToDelete, false);
|
|
||||||
scene.DeleteSceneObject(sogToDelete, false);
|
|
||||||
|
|
||||||
Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(1));
|
|
||||||
Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
|
||||||
Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0));
|
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, userId), Is.EqualTo(1));
|
|
||||||
Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0));
|
|
||||||
Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(1));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue