From e365440461a4b250612cb5f25f15d495539d4c4d Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Mon, 22 Jun 2009 07:39:04 +0000 Subject: * Added SceneTests and SceneBaseTests * Changed some fields to protectesd to enable faking --- .../Framework/Scenes/Tests/SceneBaseTests.cs | 80 ++++++++++++ .../Framework/Scenes/Tests/ScenePresenceTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneTests.cs | 138 +++++++++++++++++++++ OpenSim/Region/Framework/StorageManager.cs | 2 +- 4 files changed, 220 insertions(+), 2 deletions(-) create mode 100644 OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs create mode 100644 OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs new file mode 100644 index 0000000..54bf51b --- /dev/null +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneBaseTests.cs @@ -0,0 +1,80 @@ +/* + * 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 OpenSimulator 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 System; +using NUnit.Framework; +using OpenMetaverse; +using OpenSim.Framework; + +namespace OpenSim.Region.Framework.Scenes.Tests +{ + /// + /// Scene presence tests + /// + [TestFixture] + public class SceneBaseTests + { + private class SceneBaseImpl : SceneBase + { + public override void Update() + { + throw new NotImplementedException(); + } + + public override void LoadWorldMap() + { + throw new NotImplementedException(); + } + + public override void AddNewClient(IClientAPI client) + { + throw new NotImplementedException(); + } + + public override void RemoveClient(UUID agentID) + { + throw new NotImplementedException(); + } + + public override void CloseAllAgents(uint circuitcode) + { + throw new NotImplementedException(); + } + + public override bool OtherRegionUp(RegionInfo thisRegion) + { + throw new NotImplementedException(); + } + } + + [Test] + public void TestConstructor() + { + SceneBase scene = new SceneBaseImpl(); + } + } +} diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index f0c31d0..fff4422 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs @@ -200,7 +200,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests Assert.That(presence.AbsolutePosition, Is.EqualTo(pos), "Position is not the same one entered"); } - [Test] + [LongRunning] public void T021_TestCrossToNewRegion() { TestHelper.InMethod(); diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs new file mode 100644 index 0000000..3c2fa1a --- /dev/null +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs @@ -0,0 +1,138 @@ +/* + * 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 OpenSimulator 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 System; +using System.Collections.Generic; +using NUnit.Framework; +using OpenMetaverse; +using OpenSim.Framework; +using OpenSim.Region.Framework.Interfaces; + +namespace OpenSim.Region.Framework.Scenes.Tests +{ + /// + /// Scene presence tests + /// + [TestFixture] + public class SceneTests + { + private class FakeStorageManager : StorageManager + { + private class FakeRegionDataStore : IRegionDataStore + { + public void Initialise(string filename) + { + } + + public void Dispose() + { + } + + public void StoreObject(SceneObjectGroup obj, UUID regionUUID) + { + throw new NotImplementedException(); + } + + public void RemoveObject(UUID uuid, UUID regionUUID) + { + throw new NotImplementedException(); + } + + public void StorePrimInventory(UUID primID, ICollection items) + { + throw new NotImplementedException(); + } + + public List LoadObjects(UUID regionUUID) + { + throw new NotImplementedException(); + } + + public void StoreTerrain(double[,] terrain, UUID regionID) + { + throw new NotImplementedException(); + } + + public double[,] LoadTerrain(UUID regionID) + { + throw new NotImplementedException(); + } + + public void StoreLandObject(ILandObject Parcel) + { + throw new NotImplementedException(); + } + + public void RemoveLandObject(UUID globalID) + { + throw new NotImplementedException(); + } + + public List LoadLandObjects(UUID regionUUID) + { + throw new NotImplementedException(); + } + + public void StoreRegionSettings(RegionSettings rs) + { + throw new NotImplementedException(); + } + + public RegionSettings LoadRegionSettings(UUID regionUUID) + { + return null; + } + + public void Shutdown() + { + throw new NotImplementedException(); + } + } + + public FakeStorageManager() : base( new FakeRegionDataStore() ) + { + } + + public FakeStorageManager(IRegionDataStore storage) : this() + { + } + + public FakeStorageManager(string dllName, string connectionstring, string estateconnectionstring) : this() + { + } + } + + [Test] + public void TestConstructor() + { + RegionInfo regionInfo = new RegionInfo(0,0,null,null); + FakeStorageManager storageManager = new FakeStorageManager(); + + Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null ); + } + } +} diff --git a/OpenSim/Region/Framework/StorageManager.cs b/OpenSim/Region/Framework/StorageManager.cs index 237eb54..9375b4a 100644 --- a/OpenSim/Region/Framework/StorageManager.cs +++ b/OpenSim/Region/Framework/StorageManager.cs @@ -36,7 +36,7 @@ namespace OpenSim.Region.Framework { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private IRegionDataStore m_dataStore; + protected IRegionDataStore m_dataStore; public IRegionDataStore DataStore { -- cgit v1.1