From 953b7f491798e97b7b36808e716975b22d80114b Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 6 Sep 2010 23:00:24 +0100 Subject: Add test to check persistence of newly added pre-linked objects Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead. --- .../Region/Framework/Scenes/Tests/BorderTests.cs | 17 ++++--- .../Framework/Scenes/Tests/EntityManagerTests.cs | 2 - .../Scenes/Tests/SceneObjectLinkingTests.cs | 53 +++++++++++++++++++++- .../Framework/Scenes/Tests/ScenePresenceTests.cs | 5 +- 4 files changed, 63 insertions(+), 14 deletions(-) (limited to 'OpenSim/Region/Framework/Scenes/Tests') diff --git a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs index e140cd5..3a0dd00 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs @@ -28,20 +28,21 @@ using System; using System.Collections.Generic; using System.Text; +using NUnit.Framework; using OpenMetaverse; using OpenSim.Region.Framework.Scenes; - -using NUnit.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] public class BorderTests { - [Test] public void TestCross() { + TestHelper.InMethod(); + List testborders = new List(); Border NorthBorder = new Border(); @@ -75,8 +76,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests position = new Vector3(200,280,21); Assert.That(NorthBorder.TestCross(position)); - - // Test automatic border crossing // by setting the border crossing aabb to be the whole region position = new Vector3(25,25,21); // safely within one 256m region @@ -95,12 +94,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests WestBorder.BorderLine = new Vector3(0, 256, 255); // automatic border cross in the region Assert.That(WestBorder.TestCross(position)); - } [Test] public void TestCrossSquare512() { + TestHelper.InMethod(); + List testborders = new List(); Border NorthBorder = new Border(); @@ -174,12 +174,13 @@ namespace OpenSim.Region.Framework.Scenes.Tests Assert.That(!b.TestCross(position)); } - } [Test] public void TestCrossRectangle512x256() { + TestHelper.InMethod(); + List testborders = new List(); Border NorthBorder = new Border(); @@ -258,6 +259,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests [Test] public void TestCrossOdd512x512w256hole() { + TestHelper.InMethod(); + List testborders = new List(); // 512____ // | | diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index 3e2a2af..b3c3e22 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs @@ -53,7 +53,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests public void T010_AddObjects() { TestHelper.InMethod(); - // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); random = new Random(); SceneObjectGroup found; @@ -89,7 +88,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests public void T011_ThreadAddRemoveTest() { TestHelper.InMethod(); - // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); // This test adds and removes with mutiple threads, attempting to break the // uuid and localid dictionary coherence. diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 0b7608d..bfed204 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs @@ -26,13 +26,13 @@ */ using System; +using System.Collections.Generic; using System.Reflection; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; using OpenSim.Framework; using OpenSim.Framework.Communications; - using OpenSim.Region.Framework.Scenes; using OpenSim.Tests.Common; using OpenSim.Tests.Common.Mock; @@ -260,5 +260,54 @@ namespace OpenSim.Region.Framework.Scenes.Tests && (part4.RotationOffset.W - compareQuaternion.W < 0.00003), "Badness 3"); } + + /// + /// Test that a new scene object which is already linked is correctly persisted to the persistence layer. + /// + [Test] + public void TestNewSceneObjectLinkPersistence() + { + TestHelper.InMethod(); + log4net.Config.XmlConfigurator.Configure(); + + TestScene scene = SceneSetupHelpers.SetupScene(); + + string rootPartName = "rootpart"; + UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001"); + string linkPartName = "linkpart"; + UUID linkPartUuid = new UUID("00000000-0000-0000-0001-000000000000"); + + SceneObjectPart rootPart + = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) + { Name = rootPartName, UUID = rootPartUuid }; + SceneObjectPart linkPart + = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) + { Name = linkPartName, UUID = linkPartUuid }; + + SceneObjectGroup sog = new SceneObjectGroup(rootPart); + sog.AddPart(linkPart); + scene.AddNewSceneObject(sog, true); + + // In a test, we have to crank the backup handle manually. Normally this would be done by the timer invoked + // scene backup thread. + scene.Backup(true); + + List storedObjects = scene.StorageManager.DataStore.LoadObjects(scene.RegionInfo.RegionID); + Assert.That(storedObjects.Count, Is.EqualTo(1)); + Assert.That(storedObjects[0].Children.Count, Is.EqualTo(2)); + Assert.That(storedObjects[0].RootPart.UUID, Is.EqualTo(rootPartUuid)); + // TODO: assertion for child prim + } + + /// + /// Test that a delink is correctly persisted to the database + /// +// [Test] +// public void TestDelinkPersistence() +// { +// TestHelper.InMethod(); +// +// Scene scene = SceneSetupHelpers.SetupScene(); +// } } -} +} \ No newline at end of file diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index e39a362..ab5968c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs @@ -173,6 +173,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests Assert.That(neighbours.Count, Is.EqualTo(2)); } + public void fixNullPresence() { string firstName = "testfirstname"; @@ -389,8 +390,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests public static string GetRandomCapsObjectPath() { - TestHelper.InMethod(); - UUID caps = UUID.Random(); string capsPath = caps.ToString(); capsPath = capsPath.Remove(capsPath.Length - 4, 4); @@ -429,4 +428,4 @@ namespace OpenSim.Region.Framework.Scenes.Tests return name.ToString(); } } -} +} \ No newline at end of file -- cgit v1.1