From 2bb4b45626322c3789fc56545c64f2f9aacdb6fb Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Fri, 14 Nov 2008 20:06:44 +0000 Subject: [PATCH] * Move test scene construction infrastructure methods to a separate class for future common use --- .../ClientStack/LindenUDP/LLUDPServer.cs | 2 +- .../LindenUDP/Tests/BasicCircuitTests.cs | 2 +- OpenSim/Region/Environment/Scenes/Scene.cs | 2 +- .../Scenes/Tests/SceneObjectTests.cs | 46 +---------- .../Scenes/Tests/SceneTestUtils.cs | 78 +++++++++++++++++++ 5 files changed, 85 insertions(+), 45 deletions(-) create mode 100644 OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 9470f1f736..b6aa961205 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs @@ -373,7 +373,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // TODO : Actually only handle those states that we have control over, re-throw everything else, // TODO: implement cases as we encounter them. - //m_log.Error("[[CLIENT]: ]: Connection Error! - " + e.ToString()); + //m_log.Error("[CLIENT]: Connection Error! - " + e.ToString()); switch (e.SocketErrorCode) { case SocketError.AlreadyInProgress: diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index 1d610242e3..b2cf14cb19 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs @@ -288,6 +288,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); - } + } } } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 71acc9f919..f6060184fa 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -2695,7 +2695,7 @@ namespace OpenSim.Region.Environment.Scenes } /// - /// + /// Deregister this scene from receiving incoming region events /// public void UnRegisterRegionWithComms() { diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs index c306433142..52447a760c 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs @@ -26,7 +26,6 @@ */ using System; -using Nini.Config; using NUnit.Framework; using NUnit.Framework.SyntaxHelpers; using OpenMetaverse; @@ -54,43 +53,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests // I don't care, just leave log4net off } } - - /// - /// Set up a test scene - /// - private TestScene SetupScene() - { - RegionInfo regInfo = new RegionInfo(1000, 1000, null, null); - regInfo.RegionName = "Unit test region"; - AgentCircuitManager acm = new AgentCircuitManager(); - //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null); - CommunicationsManager cm = null; - //SceneCommunicationService scs = new SceneCommunicationService(cm); - SceneCommunicationService scs = null; - StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); - IConfigSource configSource = new IniConfigSource(); - - return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); - } - - /// - /// Add a test object - /// - /// - /// - private SceneObjectPart AddSceneObject(Scene scene) - { - SceneObjectGroup sceneObject = new SceneObjectGroup(); - SceneObjectPart part - = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); - //part.UpdatePrimFlags(false, false, true); - part.ObjectFlags |= (uint)PrimFlags.Phantom; - sceneObject.SetRootPart(part); - - scene.AddNewSceneObject(sceneObject, false); - - return part; - } /// /// Test adding an object to a scene. @@ -98,8 +60,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests [Test] public void TestAddSceneObject() { - Scene scene = SetupScene(); - SceneObjectPart part = AddSceneObject(scene); + Scene scene = SceneTestUtils.SetupScene(); + SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); //System.Console.WriteLine("retrievedPart : {0}", retrievedPart); @@ -112,8 +74,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests /// public void TestRemoveSceneObject() { - TestScene scene = SetupScene();; - SceneObjectPart part = AddSceneObject(scene); + TestScene scene = SceneTestUtils.SetupScene(); + SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); scene.DeleteSceneObject(part.ParentGroup, false); SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs new file mode 100644 index 0000000000..c20dacf1b7 --- /dev/null +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneTestUtils.cs @@ -0,0 +1,78 @@ +/* + * 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 OpenSim 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 Nini.Config; +using OpenMetaverse; +using OpenSim.Framework; +using OpenSim.Framework.Communications; +using OpenSim.Region.Environment.Scenes; + +namespace OpenSim.Region.Environment.Scenes.Tests +{ + /// + /// Utilities for constructing and performing operations upon scenes. + /// + public class SceneTestUtils + { + /// + /// Set up a test scene + /// + public static TestScene SetupScene() + { + RegionInfo regInfo = new RegionInfo(1000, 1000, null, null); + regInfo.RegionName = "Unit test region"; + AgentCircuitManager acm = new AgentCircuitManager(); + //CommunicationsManager cm = new CommunicationsManager(null, null, null, false, null); + CommunicationsManager cm = null; + //SceneCommunicationService scs = new SceneCommunicationService(cm); + SceneCommunicationService scs = null; + StorageManager sm = new OpenSim.Region.Environment.StorageManager("OpenSim.Data.Null.dll", "", ""); + IConfigSource configSource = new IniConfigSource(); + + return new TestScene(regInfo, acm, cm, scs, null, sm, null, null, false, false, false, configSource, null); + } + + /// + /// Add a test object + /// + /// + /// + public static SceneObjectPart AddSceneObject(Scene scene) + { + SceneObjectGroup sceneObject = new SceneObjectGroup(); + SceneObjectPart part + = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero); + //part.UpdatePrimFlags(false, false, true); + part.ObjectFlags |= (uint)PrimFlags.Phantom; + sceneObject.SetRootPart(part); + + scene.AddNewSceneObject(sceneObject, false); + + return part; + } + } +}