From 641c636790f3e4421e089a44e6b00fed338726eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 16:43:16 +0100
Subject: minor: Simplify test setup in SceneObjectDeRezTests since permissions
module doesn't need different configuration anymore
---
.../Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 52ad538..bde15cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -59,15 +59,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestDeRezSceneObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- IConfigSource configSource = new IniConfigSource();
- IConfig config = configSource.AddConfig("Startup");
- config.Set("serverside_object_permissions", true);
- SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
@@ -97,8 +93,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
///
/// Test deleting an object from a scene where the deleter is not the owner
///
- ///
+ ///
/// This test assumes that the deleter is not a god.
+ ///
[Test]
public void TestDeRezSceneObjectNotOwner()
{
@@ -109,10 +106,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- IConfigSource configSource = new IniConfigSource();
- IConfig config = configSource.AddConfig("Startup");
- config.Set("serverside_object_permissions", true);
- SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
--
cgit v1.1
From 2cb2f1d7e30fa583a9f43ddd6b420deb8e9b56bd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:02:19 +0100
Subject: Fix issue where objects removed via llDie() would not disappear for
users looking in from neighbouring sims.
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
---
.../Scenes/Tests/SceneObjectDeRezTests.cs | 78 +++++++++++++++++++++-
.../Scenes/Tests/ScenePresenceCrossingTests.cs | 4 +-
.../Scenes/Tests/ScenePresenceTeleportTests.cs | 14 ++--
3 files changed, 84 insertions(+), 12 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index bde15cd..f738ff1 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -33,7 +33,9 @@ using NUnit.Framework;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
+using OpenSim.Region.CoreModules.Framework.EntityTransfer;
using OpenSim.Region.CoreModules.Framework.InventoryAccess;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
using OpenSim.Region.CoreModules.World.Permissions;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
@@ -52,6 +54,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[TestFixture]
public class SceneObjectDeRezTests : OpenSimTestCase
{
+ [TestFixtureSetUp]
+ public void FixtureInit()
+ {
+ // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread.
+ // This facility was added after the original async delete tests were written, so it may be possible now
+ // to not bother explicitly disabling their async (since everything will be running sync).
+ Util.FireAndForgetMethod = FireAndForgetMethod.RegressionTest;
+ }
+
+ [TestFixtureTearDown]
+ public void TearDown()
+ {
+ // We must set this back afterwards, otherwise later tests will fail since they're expecting multiple
+ // threads. Possibly, later tests should be rewritten so none of them require async stuff (which regression
+ // tests really shouldn't).
+ Util.FireAndForgetMethod = Util.DefaultFireAndForgetMethod;
+ }
+
///
/// Test deleting an object from a scene.
///
@@ -63,7 +83,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
@@ -87,7 +107,59 @@ namespace OpenSim.Region.Framework.Scenes.Tests
sogd.InventoryDeQueueAndDelete();
SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
- Assert.That(retrievedPart2, Is.Null);
+ Assert.That(retrievedPart2, Is.Null);
+ }
+
+ ///
+ /// Test that child and root agents correctly receive KillObject notifications.
+ ///
+ [Test]
+ public void TestDeRezSceneObjectToAgents()
+ {
+ TestHelpers.InMethod();
+// TestHelpers.EnableLogging();
+
+ SceneHelpers sh = new SceneHelpers();
+ TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000);
+ TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1000, 999);
+
+ // We need this so that the creation of the root client for userB in sceneB can trigger the creation of a child client in sceneA
+ LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule();
+ EntityTransferModule etmB = new EntityTransferModule();
+ IConfigSource config = new IniConfigSource();
+ IConfig modulesConfig = config.AddConfig("Modules");
+ modulesConfig.Set("EntityTransferModule", etmB.Name);
+ modulesConfig.Set("SimulationServices", lscm.Name);
+ SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
+ SceneHelpers.SetupSceneModules(sceneB, config, etmB);
+
+ // We need this for derez
+ SceneHelpers.SetupSceneModules(sceneA, new PermissionsModule());
+
+ UserAccount uaA = UserAccountHelpers.CreateUserWithInventory(sceneA, "Andy", "AAA", 0x1, "");
+ UserAccount uaB = UserAccountHelpers.CreateUserWithInventory(sceneA, "Brian", "BBB", 0x2, "");
+
+ TestClient clientA = (TestClient)SceneHelpers.AddScenePresence(sceneA, uaA).ControllingClient;
+
+ // This is the more long-winded route we have to take to get a child client created for userB in sceneA
+ // rather than just calling AddScenePresence() as for userA
+ AgentCircuitData acd = SceneHelpers.GenerateAgentData(uaB);
+ TestClient clientB = new TestClient(acd, sceneB);
+ List childClientsB = new List();
+ EntityTransferHelpers.SetUpInformClientOfNeighbour(clientB, childClientsB);
+
+ SceneHelpers.AddScenePresence(sceneB, clientB, acd);
+
+ SceneObjectGroup so = SceneHelpers.AddSceneObject(sceneA);
+ uint soLocalId = so.LocalId;
+
+ sceneA.DeleteSceneObject(so, false);
+
+ Assert.That(clientA.ReceivedKills.Count, Is.EqualTo(1));
+ Assert.That(clientA.ReceivedKills[0], Is.EqualTo(soLocalId));
+
+ Assert.That(childClientsB[0].ReceivedKills.Count, Is.EqualTo(1));
+ Assert.That(childClientsB[0].ReceivedKills[0], Is.EqualTo(soLocalId));
}
///
@@ -106,7 +178,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
index 8775949..5a72239 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCrossingTests.cs
@@ -95,11 +95,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB);
AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
- TestClient tc = new TestClient(acd, sceneA, sh.SceneManager);
+ TestClient tc = new TestClient(acd, sceneA);
List destinationTestClients = new List();
EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients);
- ScenePresence originalSp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager);
+ ScenePresence originalSp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
originalSp.AbsolutePosition = new Vector3(128, 32, 10);
// originalSp.Flying = true;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
index de4458d..297c66b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 teleportPosition = new Vector3(10, 11, 12);
Vector3 teleportLookAt = new Vector3(20, 21, 22);
- ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+ ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
sp.AbsolutePosition = new Vector3(30, 31, 32);
List destinationTestClients = new List();
@@ -224,7 +224,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 teleportPosition = new Vector3(10, 11, 12);
Vector3 teleportLookAt = new Vector3(20, 21, 22);
- ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+ ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
sp.AbsolutePosition = preTeleportPosition;
// Make sceneB return false on query access
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 teleportPosition = new Vector3(10, 11, 12);
Vector3 teleportLookAt = new Vector3(20, 21, 22);
- ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+ ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
sp.AbsolutePosition = preTeleportPosition;
// Make sceneB refuse CreateAgent
@@ -389,7 +389,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 teleportPosition = new Vector3(10, 11, 12);
Vector3 teleportLookAt = new Vector3(20, 21, 22);
- ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId, sh.SceneManager);
+ ScenePresence sp = SceneHelpers.AddScenePresence(sceneA, userId);
sp.AbsolutePosition = preTeleportPosition;
sceneA.RequestTeleportLocation(
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestSameSimulatorNeighbouringRegions()
{
TestHelpers.InMethod();
- TestHelpers.EnableLogging();
+// TestHelpers.EnableLogging();
UUID userId = TestHelpers.ParseTail(0x1);
@@ -458,11 +458,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
Vector3 teleportLookAt = new Vector3(20, 21, 22);
AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
- TestClient tc = new TestClient(acd, sceneA, sh.SceneManager);
+ TestClient tc = new TestClient(acd, sceneA);
List destinationTestClients = new List();
EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients);
- ScenePresence beforeSceneASp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager);
+ ScenePresence beforeSceneASp = SceneHelpers.AddScenePresence(sceneA, tc, acd);
beforeSceneASp.AbsolutePosition = new Vector3(30, 31, 32);
Assert.That(beforeSceneASp, Is.Not.Null);
--
cgit v1.1
From b4a6f2195d6d1a3a5f91715f7badf4cc983f7689 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 18:53:34 +0100
Subject: Only send one kill object to the deleter when they derez an object
rather than two.
Extend regression test to check this.
---
.../Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Tests')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index f738ff1..d670dad 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -84,30 +84,31 @@ namespace OpenSim.Region.Framework.Scenes.Tests
TestScene scene = new SceneHelpers().SetupScene();
SceneHelpers.SetupSceneModules(scene, new PermissionsModule());
- IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
+ TestClient client = (TestClient)SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// 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
- = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero);
- part.Name = "obj1";
- scene.AddNewSceneObject(new SceneObjectGroup(part), false);
+
+ SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "so1", userId);
+ uint soLocalId = so.LocalId;
List localIds = new List();
- localIds.Add(part.LocalId);
+ localIds.Add(so.LocalId);
scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero);
// Check that object isn't deleted until we crank the sogd handle.
- SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+ SceneObjectPart retrievedPart = scene.GetSceneObjectPart(so.LocalId);
Assert.That(retrievedPart, Is.Not.Null);
Assert.That(retrievedPart.ParentGroup.IsDeleted, Is.False);
sogd.InventoryDeQueueAndDelete();
- SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
+ SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(so.LocalId);
Assert.That(retrievedPart2, Is.Null);
+
+ Assert.That(client.ReceivedKills.Count, Is.EqualTo(1));
+ Assert.That(client.ReceivedKills[0], Is.EqualTo(soLocalId));
}
///
--
cgit v1.1