From 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb Mon Sep 17 00:00:00 2001
From: onefang
Date: Sun, 19 May 2019 21:24:15 +1000
Subject: Dump OpenSim 0.9.0.1 into it's own branch.
---
.../World/Land/Tests/LandManagementModuleTests.cs | 40 ++--
.../World/Land/Tests/PrimCountModuleTests.cs | 224 ++++++++++-----------
2 files changed, 132 insertions(+), 132 deletions(-)
(limited to 'OpenSim/Region/CoreModules/World/Land/Tests')
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
index 4ed67f3..d6a3ded 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/LandManagementModuleTests.cs
@@ -45,14 +45,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
UUID userId = TestHelpers.ParseTail(0x1);
LandManagementModule lmm = new LandManagementModule();
- Scene scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(scene, lmm);
-
+ Scene scene = new SceneHelpers().SetupScene();
+ SceneHelpers.SetupSceneModules(scene, lmm);
+
ILandObject lo = new LandObject(userId, false, scene);
lo.LandData.Name = "lo1";
lo.SetLandBitmap(
lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
- lo = lmm.AddLandObject(lo);
+ lo = lmm.AddLandObject(lo);
// TODO: Should add asserts to check that land object was added properly.
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
{
ILandObject loAtCoord = lmm.GetLandObject(0, 0);
Assert.That(loAtCoord.LandData.LocalID, Is.EqualTo(lo.LandData.LocalID));
- Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
+ Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(lo.LandData.GlobalID));
}
{
@@ -88,8 +88,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
SceneHelpers sh = new SceneHelpers();
LandManagementModule lmm = new LandManagementModule();
- Scene scene = sh.SetupScene();
- SceneHelpers.SetupSceneModules(scene, lmm);
+ Scene scene = sh.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, lmm);
scene.loadAllLandObjectsFromStorage(scene.RegionInfo.RegionID);
@@ -115,8 +115,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
SceneHelpers sh = new SceneHelpers();
LandManagementModule lmm = new LandManagementModule();
- Scene scene = sh.SetupScene();
- SceneHelpers.SetupSceneModules(scene, lmm);
+ Scene scene = sh.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, lmm);
ILandObject originalLo1 = new LandObject(userId, false, scene);
originalLo1.LandData.Name = "lo1";
@@ -149,8 +149,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
SceneHelpers sh = new SceneHelpers();
LandManagementModule lmm = new LandManagementModule();
- Scene scene = sh.SetupScene();
- SceneHelpers.SetupSceneModules(scene, lmm);
+ Scene scene = sh.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, lmm);
ILandObject originalLo1 = new LandObject(userId, false, scene);
originalLo1.LandData.Name = "lo1";
@@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(loAtCoord1.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
Assert.That(loAtCoord1.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
- ILandObject loAtCoord2
+ ILandObject loAtCoord2
= lmm.GetLandObject((int)Constants.RegionSize - 1, (((int)Constants.RegionSize / 4) * 3) - 1);
Assert.That(loAtCoord2.LandData.Name, Is.EqualTo(originalLo2.LandData.Name));
Assert.That(loAtCoord2.LandData.GlobalID, Is.EqualTo(originalLo2.LandData.GlobalID));
@@ -198,8 +198,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
SceneHelpers sh = new SceneHelpers();
LandManagementModule lmm = new LandManagementModule();
- Scene scene = sh.SetupScene();
- SceneHelpers.SetupSceneModules(scene, lmm);
+ Scene scene = sh.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, lmm);
ILandObject originalLo1 = new LandObject(userId, false, scene);
originalLo1.LandData.Name = "lo1";
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
{
ILandObject loAtCoord = lmm.GetLandObject(0, 0);
Assert.That(loAtCoord.LandData.Name, Is.EqualTo(originalLo1.LandData.Name));
- Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
+ Assert.That(loAtCoord.LandData.GlobalID, Is.EqualTo(originalLo1.LandData.GlobalID));
}
{
@@ -239,21 +239,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
UUID userId = TestHelpers.ParseTail(0x1);
LandManagementModule lmm = new LandManagementModule();
- Scene scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(scene, lmm);
-
+ Scene scene = new SceneHelpers().SetupScene();
+ SceneHelpers.SetupSceneModules(scene, lmm);
+
ILandObject lo = new LandObject(userId, false, scene);
lo.LandData.Name = "lo1";
lo.SetLandBitmap(
lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
- lo = lmm.AddLandObject(lo);
+ lo = lmm.AddLandObject(lo);
lmm.Subdivide(0, 0, LandManagementModule.LandUnit, LandManagementModule.LandUnit, userId);
{
ILandObject loAtCoord = lmm.GetLandObject(0, 0);
Assert.That(loAtCoord.LandData.LocalID, Is.Not.EqualTo(lo.LandData.LocalID));
- Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));
+ Assert.That(loAtCoord.LandData.GlobalID, Is.Not.EqualTo(lo.LandData.GlobalID));
}
{
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 949acb6..a349aa1 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -43,21 +43,21 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
public class PrimCountModuleTests : OpenSimTestCase
{
protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000");
- protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");
- protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");
+ protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");
+ protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");
protected TestScene m_scene;
protected PrimCountModule m_pcm;
-
+
///
/// A parcel that covers the entire sim except for a 1 unit wide strip on the eastern side.
///
protected ILandObject m_lo;
-
+
///
/// A parcel that covers just the eastern strip of the sim.
///
- protected ILandObject m_lo2;
-
+ protected ILandObject m_lo2;
+
[SetUp]
public override void SetUp()
{
@@ -65,24 +65,24 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
m_pcm = new PrimCountModule();
LandManagementModule lmm = new LandManagementModule();
- m_scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
-
+ m_scene = new SceneHelpers().SetupScene();
+ SceneHelpers.SetupSceneModules(m_scene, lmm, m_pcm);
+
int xParcelDivider = (int)Constants.RegionSize - 1;
-
+
ILandObject lo = new LandObject(m_userId, false, m_scene);
lo.LandData.Name = "m_lo";
lo.SetLandBitmap(
lo.GetSquareLandBitmap(0, 0, xParcelDivider, (int)Constants.RegionSize));
- m_lo = lmm.AddLandObject(lo);
-
+ m_lo = lmm.AddLandObject(lo);
+
ILandObject lo2 = new LandObject(m_userId, false, m_scene);
lo2.SetLandBitmap(
lo2.GetSquareLandBitmap(xParcelDivider, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
lo2.LandData.Name = "m_lo2";
m_lo2 = lmm.AddLandObject(lo2);
- }
-
+ }
+
///
/// Test that counts before we do anything are correct.
///
@@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
public void TestInitialCounts()
{
IPrimCounts pc = m_lo.PrimCounts;
-
+
Assert.That(pc.Owner, Is.EqualTo(0));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -98,9 +98,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(0));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(0));
- }
-
+ Assert.That(pc.Simulator, Is.EqualTo(0));
+ }
+
///
/// Test count after a parcel owner owned object is added.
///
@@ -108,13 +108,13 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
public void TestAddOwnerObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- IPrimCounts pc = m_lo.PrimCounts;
-
- SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+// log4net.Config.XmlConfigurator.Configure();
+
+ IPrimCounts pc = m_lo.PrimCounts;
+
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
-
+
Assert.That(pc.Owner, Is.EqualTo(3));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -122,12 +122,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(3));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(3));
-
+ Assert.That(pc.Simulator, Is.EqualTo(3));
+
// Add a second object and retest
- SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
- m_scene.AddNewSceneObject(sog2, false);
-
+ SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+ m_scene.AddNewSceneObject(sog2, false);
+
Assert.That(pc.Owner, Is.EqualTo(5));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(5));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(5));
+ Assert.That(pc.Simulator, Is.EqualTo(5));
}
-
+
///
/// Test count after a parcel owner owned copied object is added.
///
@@ -145,14 +145,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
public void TestCopyOwnerObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
+// log4net.Config.XmlConfigurator.Configure();
+
IPrimCounts pc = m_lo.PrimCounts;
-
- SceneObjectGroup sog = SceneHelpers.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);
-
+ m_scene.SceneGraph.DuplicateObject(sog.LocalId, Vector3.Zero, m_userId, UUID.Zero, Quaternion.Identity, false);
+
Assert.That(pc.Owner, Is.EqualTo(6));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -160,9 +160,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(6));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(6));
- }
-
+ Assert.That(pc.Simulator, Is.EqualTo(6));
+ }
+
///
/// Test that parcel counts update correctly when an object is moved between parcels, where that movement
/// is not done directly by the user/
@@ -171,18 +171,18 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
public void TestMoveOwnerObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+// log4net.Config.XmlConfigurator.Configure();
+
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
- SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
- m_scene.AddNewSceneObject(sog2, false);
-
- // Move the first scene object to the eastern strip parcel
+ SceneObjectGroup sog2 = SceneHelpers.CreateSceneObject(2, m_userId, "b", 0x10);
+ m_scene.AddNewSceneObject(sog2, false);
+
+ // Move the first scene object to the eastern strip parcel
sog.AbsolutePosition = new Vector3(254, 2, 2);
-
- IPrimCounts pclo1 = m_lo.PrimCounts;
-
+
+ IPrimCounts pclo1 = m_lo.PrimCounts;
+
Assert.That(pclo1.Owner, Is.EqualTo(2));
Assert.That(pclo1.Group, Is.EqualTo(0));
Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -190,10 +190,10 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pclo1.Selected, Is.EqualTo(0));
Assert.That(pclo1.Users[m_userId], Is.EqualTo(2));
Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pclo1.Simulator, Is.EqualTo(5));
-
- IPrimCounts pclo2 = m_lo2.PrimCounts;
-
+ Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
+ IPrimCounts pclo2 = m_lo2.PrimCounts;
+
Assert.That(pclo2.Owner, Is.EqualTo(3));
Assert.That(pclo2.Group, Is.EqualTo(0));
Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -201,11 +201,11 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pclo2.Selected, Is.EqualTo(0));
Assert.That(pclo2.Users[m_userId], Is.EqualTo(3));
Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pclo2.Simulator, Is.EqualTo(5));
-
+ Assert.That(pclo2.Simulator, Is.EqualTo(5));
+
// Now move it back again
- sog.AbsolutePosition = new Vector3(2, 2, 2);
-
+ sog.AbsolutePosition = new Vector3(2, 2, 2);
+
Assert.That(pclo1.Owner, Is.EqualTo(5));
Assert.That(pclo1.Group, Is.EqualTo(0));
Assert.That(pclo1.Others, Is.EqualTo(0));
@@ -213,8 +213,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pclo1.Selected, Is.EqualTo(0));
Assert.That(pclo1.Users[m_userId], Is.EqualTo(5));
Assert.That(pclo1.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pclo1.Simulator, Is.EqualTo(5));
-
+ Assert.That(pclo1.Simulator, Is.EqualTo(5));
+
Assert.That(pclo2.Owner, Is.EqualTo(0));
Assert.That(pclo2.Group, Is.EqualTo(0));
Assert.That(pclo2.Others, Is.EqualTo(0));
@@ -222,9 +222,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pclo2.Selected, Is.EqualTo(0));
Assert.That(pclo2.Users[m_userId], Is.EqualTo(0));
Assert.That(pclo2.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pclo2.Simulator, Is.EqualTo(5));
+ Assert.That(pclo2.Simulator, Is.EqualTo(5));
}
-
+
///
/// Test count after a parcel owner owned object is removed.
///
@@ -233,14 +233,14 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
-
+
IPrimCounts pc = m_lo.PrimCounts;
-
+
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.AddNewSceneObject(sogToDelete, false);
m_scene.DeleteSceneObject(sogToDelete, false);
-
+
Assert.That(pc.Owner, Is.EqualTo(1));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -248,37 +248,37 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(1));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(1));
- }
-
+ Assert.That(pc.Simulator, Is.EqualTo(1));
+ }
+
[Test]
public void TestAddGroupObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
+// log4net.Config.XmlConfigurator.Configure();
+
m_lo.DeedToGroup(m_groupId);
-
- IPrimCounts pc = m_lo.PrimCounts;
-
- SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
+
+ IPrimCounts pc = m_lo.PrimCounts;
+
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
sog.GroupID = m_groupId;
m_scene.AddNewSceneObject(sog, false);
-
+
Assert.That(pc.Owner, Is.EqualTo(0));
Assert.That(pc.Group, Is.EqualTo(3));
Assert.That(pc.Others, Is.EqualTo(0));
Assert.That(pc.Total, Is.EqualTo(3));
Assert.That(pc.Selected, Is.EqualTo(0));
-
+
// Is this desired behaviour? Not totally sure.
Assert.That(pc.Users[m_userId], Is.EqualTo(0));
Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
-
- Assert.That(pc.Simulator, Is.EqualTo(3));
+
+ Assert.That(pc.Simulator, Is.EqualTo(3));
}
-
+
///
/// Test count after a parcel owner owned object is removed.
///
@@ -287,19 +287,19 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
-
+
m_lo.DeedToGroup(m_groupId);
-
+
IPrimCounts pc = m_lo.PrimCounts;
-
+
SceneObjectGroup sogToKeep = SceneHelpers.CreateSceneObject(1, m_userId, "a", 0x1);
- sogToKeep.GroupID = m_groupId;
+ sogToKeep.GroupID = m_groupId;
m_scene.AddNewSceneObject(sogToKeep, false);
-
+
SceneObjectGroup sogToDelete = SceneHelpers.CreateSceneObject(3, m_userId, "b", 0x10);
- m_scene.AddNewSceneObject(sogToDelete, false);
+ m_scene.AddNewSceneObject(sogToDelete, false);
m_scene.DeleteSceneObject(sogToDelete, false);
-
+
Assert.That(pc.Owner, Is.EqualTo(0));
Assert.That(pc.Group, Is.EqualTo(1));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -308,20 +308,20 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Users[m_userId], Is.EqualTo(1));
Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(1));
- }
-
- [Test]
+ Assert.That(pc.Simulator, Is.EqualTo(1));
+ }
+
+ [Test]
public void TestAddOthersObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
-
- IPrimCounts pc = m_lo.PrimCounts;
-
- SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
+// log4net.Config.XmlConfigurator.Configure();
+
+ IPrimCounts pc = m_lo.PrimCounts;
+
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_otherUserId, "a", 0x01);
m_scene.AddNewSceneObject(sog, false);
-
+
Assert.That(pc.Owner, Is.EqualTo(0));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(3));
@@ -329,22 +329,22 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(0));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
- Assert.That(pc.Simulator, Is.EqualTo(3));
+ Assert.That(pc.Simulator, Is.EqualTo(3));
}
-
+
[Test]
public void TestRemoveOthersObject()
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
-
+
IPrimCounts pc = m_lo.PrimCounts;
-
+
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.AddNewSceneObject(sogToDelete, false);
m_scene.DeleteSceneObject(sogToDelete, false);
-
+
Assert.That(pc.Owner, Is.EqualTo(0));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(1));
@@ -352,9 +352,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(0));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(1));
- Assert.That(pc.Simulator, Is.EqualTo(1));
- }
-
+ Assert.That(pc.Simulator, Is.EqualTo(1));
+ }
+
///
/// Test the count is correct after is has been tainted.
///
@@ -363,12 +363,12 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
{
TestHelpers.InMethod();
IPrimCounts pc = m_lo.PrimCounts;
-
- SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
- m_scene.AddNewSceneObject(sog, false);
-
+
+ SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
+ m_scene.AddNewSceneObject(sog, false);
+
m_pcm.TaintPrimCount();
-
+
Assert.That(pc.Owner, Is.EqualTo(3));
Assert.That(pc.Group, Is.EqualTo(0));
Assert.That(pc.Others, Is.EqualTo(0));
@@ -376,7 +376,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
Assert.That(pc.Selected, Is.EqualTo(0));
Assert.That(pc.Users[m_userId], Is.EqualTo(3));
Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
- Assert.That(pc.Simulator, Is.EqualTo(3));
+ Assert.That(pc.Simulator, Is.EqualTo(3));
}
}
}
\ No newline at end of file
--
cgit v1.1