From 22d4c52ffc374e167cb674e0e20815615d8a6927 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Sat, 24 Nov 2012 03:15:24 +0000 Subject: [PATCH] Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests --- .../Handlers/GetTexture/Tests/GetTextureHandlerTests.cs | 2 +- OpenSim/Data/Tests/AssetTests.cs | 2 +- OpenSim/Data/Tests/BasicDataServiceTest.cs | 3 ++- OpenSim/Data/Tests/PropertyCompareConstraint.cs | 3 ++- OpenSim/Data/Tests/PropertyScrambler.cs | 3 ++- .../Framework/Serialization/Tests/LandDataSerializerTests.cs | 2 +- .../Serialization/Tests/RegionSettingsSerializerTests.cs | 2 +- OpenSim/Framework/Servers/Tests/OSHttpTests.cs | 3 ++- OpenSim/Framework/Servers/Tests/VersionInfoTests.cs | 3 ++- OpenSim/Framework/Tests/AgentCircuitDataTest.cs | 5 +++-- OpenSim/Framework/Tests/AnimationTests.cs | 2 +- OpenSim/Framework/Tests/AssetBaseTest.cs | 3 ++- OpenSim/Framework/Tests/CacheTests.cs | 3 ++- OpenSim/Framework/Tests/LocationTest.cs | 3 ++- OpenSim/Framework/Tests/MundaneFrameworkTests.cs | 3 ++- OpenSim/Framework/Tests/PrimeNumberHelperTests.cs | 3 ++- OpenSim/Framework/Tests/UtilTest.cs | 2 +- .../Linden/Caps/EventQueue/Tests/EventQueueTests.cs | 2 +- .../ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs | 2 +- .../ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs | 2 +- .../Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | 2 +- .../Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs | 2 +- .../CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs | 2 +- .../InventoryAccess/Tests/InventoryAccessModuleTests.cs | 2 +- .../Presence/Tests/PresenceConnectorsTests.cs | 3 +-- .../CoreModules/World/Land/Tests/PrimCountModuleTests.cs | 2 +- .../Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs | 2 +- .../CoreModules/World/Serialiser/Tests/SerialiserTests.cs | 2 +- .../Region/CoreModules/World/Terrain/Tests/TerrainTest.cs | 3 ++- OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs | 2 +- .../Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs | 2 +- .../Framework/Scenes/Tests/ScenePresenceAnimationTests.cs | 2 +- .../Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs | 2 +- .../Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs | 2 +- .../Framework/Scenes/Tests/ScenePresenceTeleportTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs | 2 +- .../Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | 2 +- .../Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 2 +- OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs | 3 ++- .../Shared/CodeTools/Tests/CSCodeGeneratorTest.cs | 2 +- .../ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs | 2 +- .../ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs | 2 +- .../Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs | 2 +- .../ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs | 2 +- .../ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs | 2 +- .../ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs | 2 +- .../Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs | 2 +- .../Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs | 2 +- .../ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs | 2 +- OpenSim/Tests/ConfigurationLoaderTest.cs | 3 ++- OpenSim/Tests/Performance/NPCPerformanceTests.cs | 2 +- OpenSim/Tests/Performance/ObjectPerformanceTests.cs | 2 +- OpenSim/Tests/Performance/ScriptPerformanceTests.cs | 2 +- prebuild.xml | 4 +++- 66 files changed, 83 insertions(+), 68 deletions(-) diff --git a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs index 761e4e7564..d4d6d10d83 100644 --- a/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs +++ b/OpenSim/Capabilities/Handlers/GetTexture/Tests/GetTextureHandlerTests.cs @@ -42,7 +42,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Capabilities.Handlers.GetTexture.Tests { [TestFixture] - public class GetTextureHandlerTests + public class GetTextureHandlerTests : OpenSimTestCase { [Test] public void TestTextureNotFound() diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index 1174e2f302..8cb2ee083d 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs @@ -49,7 +49,7 @@ using OpenSim.Data.SQLite; namespace OpenSim.Data.Tests { [TestFixture(Description = "Asset store tests (SQLite)")] - public class SQLiteAssetTests : AssetTests + public class SQLiteAssetTests : AssetTests { } diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs index 7d85f0c8eb..d8019ba9b4 100644 --- a/OpenSim/Data/Tests/BasicDataServiceTest.cs +++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs @@ -33,6 +33,7 @@ using NUnit.Framework; using NUnit.Framework.Constraints; using OpenMetaverse; using OpenSim.Framework; +using OpenSim.Tests.Common; using log4net; using System.Data; using System.Data.Common; @@ -45,7 +46,7 @@ namespace OpenSim.Data.Tests /// /// /// - public class BasicDataServiceTest + public class BasicDataServiceTest : OpenSimTestCase where TConn : DbConnection, new() where TService : class, new() { diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs index 6c79bda9ec..b99525a74a 100644 --- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs +++ b/OpenSim/Data/Tests/PropertyCompareConstraint.cs @@ -36,6 +36,7 @@ using NUnit.Framework; using NUnit.Framework.Constraints; using OpenMetaverse; using OpenSim.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Data.Tests { @@ -254,7 +255,7 @@ namespace OpenSim.Data.Tests } [TestFixture] - public class PropertyCompareConstraintTest + public class PropertyCompareConstraintTest : OpenSimTestCase { public class HasInt { diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index c5d40c2373..e0f5862b93 100644 --- a/OpenSim/Data/Tests/PropertyScrambler.cs +++ b/OpenSim/Data/Tests/PropertyScrambler.cs @@ -34,6 +34,7 @@ using System.Text; using NUnit.Framework; using OpenMetaverse; using OpenSim.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Data.Tests { @@ -158,7 +159,7 @@ namespace OpenSim.Data.Tests } [TestFixture] - public class PropertyScramblerTests + public class PropertyScramblerTests : OpenSimTestCase { [Test] public void TestScramble() diff --git a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs index 8b9756b11d..ea100ee71c 100644 --- a/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs +++ b/OpenSim/Framework/Serialization/Tests/LandDataSerializerTests.cs @@ -37,7 +37,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Framework.Serialization.Tests { [TestFixture] - public class LandDataSerializerTest + public class LandDataSerializerTest : OpenSimTestCase { private LandData land; private LandData landWithParcelAccessList; diff --git a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs index 09b6f6ddad..142726bbe7 100644 --- a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs +++ b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs @@ -37,7 +37,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Framework.Serialization.Tests { [TestFixture] - public class RegionSettingsSerializerTests + public class RegionSettingsSerializerTests : OpenSimTestCase { private string m_serializedRs = @" diff --git a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs index dc4eb8f4bf..3412e0f2f7 100644 --- a/OpenSim/Framework/Servers/Tests/OSHttpTests.cs +++ b/OpenSim/Framework/Servers/Tests/OSHttpTests.cs @@ -35,11 +35,12 @@ using HttpServer; using HttpServer.FormDecoders; using NUnit.Framework; using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Servers.Tests { [TestFixture] - public class OSHttpTests + public class OSHttpTests : OpenSimTestCase { // we need an IHttpClientContext for our tests public class TestHttpClientContext: IHttpClientContext diff --git a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs index 49e5061316..480f2bb41d 100644 --- a/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs +++ b/OpenSim/Framework/Servers/Tests/VersionInfoTests.cs @@ -29,11 +29,12 @@ using System; using System.Collections.Generic; using System.Text; using NUnit.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Servers.Tests { [TestFixture] - public class VersionInfoTests + public class VersionInfoTests : OpenSimTestCase { [Test] public void TestVersionLength() diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs index 0dce414772..95e9439019 100644 --- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs +++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs @@ -24,16 +24,17 @@ * (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.Collections.Generic; using OpenMetaverse; using OpenMetaverse.StructuredData; using NUnit.Framework; - +using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class AgentCircuitDataTest + public class AgentCircuitDataTest : OpenSimTestCase { private UUID AgentId; private AvatarAppearance AvAppearance; diff --git a/OpenSim/Framework/Tests/AnimationTests.cs b/OpenSim/Framework/Tests/AnimationTests.cs index 967a35562c..f3be81bed3 100644 --- a/OpenSim/Framework/Tests/AnimationTests.cs +++ b/OpenSim/Framework/Tests/AnimationTests.cs @@ -38,7 +38,7 @@ using Animation = OpenSim.Framework.Animation; namespace OpenSim.Framework.Tests { [TestFixture] - public class AnimationTests + public class AnimationTests : OpenSimTestCase { private Animation anim1 = null; private Animation anim2 = null; diff --git a/OpenSim/Framework/Tests/AssetBaseTest.cs b/OpenSim/Framework/Tests/AssetBaseTest.cs index 6db1aa0c1c..25d2393dd2 100644 --- a/OpenSim/Framework/Tests/AssetBaseTest.cs +++ b/OpenSim/Framework/Tests/AssetBaseTest.cs @@ -30,11 +30,12 @@ using System.Collections.Generic; using System.Text; using NUnit.Framework; using OpenMetaverse; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class AssetBaseTest + public class AssetBaseTest : OpenSimTestCase { [Test] public void TestContainsReferences() diff --git a/OpenSim/Framework/Tests/CacheTests.cs b/OpenSim/Framework/Tests/CacheTests.cs index c3613e6410..c709860a85 100644 --- a/OpenSim/Framework/Tests/CacheTests.cs +++ b/OpenSim/Framework/Tests/CacheTests.cs @@ -28,11 +28,12 @@ using System; using NUnit.Framework; using OpenMetaverse; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class CacheTests + public class CacheTests : OpenSimTestCase { private Cache cache; private UUID cacheItemUUID; diff --git a/OpenSim/Framework/Tests/LocationTest.cs b/OpenSim/Framework/Tests/LocationTest.cs index 2707afa066..a56ecb4049 100644 --- a/OpenSim/Framework/Tests/LocationTest.cs +++ b/OpenSim/Framework/Tests/LocationTest.cs @@ -26,11 +26,12 @@ */ using NUnit.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class LocationTest + public class LocationTest : OpenSimTestCase { [Test] public void locationRegionHandleRegionHandle() diff --git a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs index 672847dfed..47fe59921a 100644 --- a/OpenSim/Framework/Tests/MundaneFrameworkTests.cs +++ b/OpenSim/Framework/Tests/MundaneFrameworkTests.cs @@ -32,11 +32,12 @@ using OpenMetaverse.StructuredData; using System; using System.Globalization; using System.Threading; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class MundaneFrameworkTests + public class MundaneFrameworkTests : OpenSimTestCase { private bool m_RegionSettingsOnSaveEventFired; private bool m_RegionLightShareDataOnSaveEventFired; diff --git a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs index 36bc6e75f9..82e13e5bc4 100644 --- a/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs +++ b/OpenSim/Framework/Tests/PrimeNumberHelperTests.cs @@ -31,11 +31,12 @@ using NUnit.Framework; using OpenMetaverse; using OpenMetaverse.StructuredData; using OpenSim.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class PrimeNumberHelperTests + public class PrimeNumberHelperTests : OpenSimTestCase { [Test] public void TestGetPrime() diff --git a/OpenSim/Framework/Tests/UtilTest.cs b/OpenSim/Framework/Tests/UtilTest.cs index f0d2a3f7a7..11ca0683d3 100644 --- a/OpenSim/Framework/Tests/UtilTest.cs +++ b/OpenSim/Framework/Tests/UtilTest.cs @@ -33,7 +33,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Framework.Tests { [TestFixture] - public class UtilTests + public class UtilTests : OpenSimTestCase { [Test] public void VectorOperationTests() diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs index d604cf6f51..ed8ec16a38 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs @@ -44,7 +44,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.ClientStack.Linden.Tests { [TestFixture] - public class EventQueueTests + public class EventQueueTests : OpenSimTestCase { private TestScene m_scene; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs index 5fcf376b84..7d9f581817 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/LLImageManagerTests.cs @@ -43,7 +43,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.ClientStack.LindenUDP.Tests { [TestFixture] - public class LLImageManagerTests + public class LLImageManagerTests : OpenSimTestCase { private AssetBase m_testImageAsset; private Scene scene; diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs index 0f88ec619b..5f73a94edf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/PacketHandlerTests.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// Tests for the LL packet handler /// [TestFixture] - public class PacketHandlerTests + public class PacketHandlerTests : OpenSimTestCase { // [Test] // /// diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs index 1c2bfd0dff..0872cc8ee9 100644 --- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs @@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests /// At the moment we're only test the in-memory part of the FlotsamAssetCache. This is a considerable weakness. /// [TestFixture] - public class FlotsamAssetCacheTests + public class FlotsamAssetCacheTests : OpenSimTestCase { protected TestScene m_scene; protected FlotsamAssetCache m_cache; diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs index 848b3bfc08..1830d41880 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs @@ -39,7 +39,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory { [TestFixture] - public class AvatarFactoryModuleTests + public class AvatarFactoryModuleTests : OpenSimTestCase { /// /// Only partial right now since we don't yet test that it's ended up in the avatar appearance service. diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs index 7a197f7cd5..961117ede1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs @@ -40,7 +40,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests { [TestFixture] - public class FriendsModuleTests + public class FriendsModuleTests : OpenSimTestCase { private FriendsModule m_fm; private TestScene m_scene; diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs index 21d8bd77a9..b768257374 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs @@ -49,7 +49,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests { [TestFixture] - public class InventoryAccessModuleTests + public class InventoryAccessModuleTests : OpenSimTestCase { protected TestScene m_scene; protected BasicInventoryAccessModule m_iam; diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs index 32e47f9dda..7e365cace3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs @@ -35,7 +35,6 @@ using NUnit.Framework; using OpenMetaverse; using OpenSim.Framework; using Nini.Config; - using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence; using OpenSim.Region.Framework.Scenes; using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; @@ -44,7 +43,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests { [TestFixture] - public class PresenceConnectorsTests + public class PresenceConnectorsTests : OpenSimTestCase { LocalPresenceServicesConnector m_LocalConnector; private void SetUp() diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs index b5ee4d2cae..14eca42b1e 100644 --- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs +++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs @@ -41,7 +41,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.CoreModules.World.Land.Tests { [TestFixture] - public class PrimCountModuleTests + 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"); diff --git a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs index 396095afe5..ba4b041871 100644 --- a/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs +++ b/OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs @@ -44,7 +44,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests { [TestFixture] - public class MoapTests + public class MoapTests : OpenSimTestCase { protected TestScene m_scene; protected MoapModule m_module; diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 7825e3e7c7..bcb8e2f537 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs @@ -39,7 +39,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Region.CoreModules.World.Serialiser.Tests { [TestFixture] - public class SerialiserTests + public class SerialiserTests : OpenSimTestCase { private string xml = @" diff --git a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs index 3d4f7625c9..be719ea2d3 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/Tests/TerrainTest.cs @@ -30,11 +30,12 @@ using NUnit.Framework; using OpenSim.Framework; using OpenSim.Region.CoreModules.World.Terrain.PaintBrushes; using OpenSim.Region.Framework.Scenes; +using OpenSim.Tests.Common; namespace OpenSim.Region.CoreModules.World.Terrain.Tests { [TestFixture] - public class TerrainTest + public class TerrainTest : OpenSimTestCase { [Test] public void BrushTest() diff --git a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs index 4a21dc9730..e2092214b2 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs @@ -37,7 +37,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class BorderTests + public class BorderTests : OpenSimTestCase { [Test] public void TestCross() diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs index ea9fc9386e..766ce8399a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs @@ -41,7 +41,7 @@ using OpenSim.Tests.Common; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture, LongRunning] - public class EntityManagerTests + public class EntityManagerTests : OpenSimTestCase { static public Random random; SceneObjectGroup found; diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs index d23c96511c..575a081bf8 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs @@ -40,7 +40,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class SceneGraphTests + public class SceneGraphTests : OpenSimTestCase { [Test] public void TestDuplicateObject() diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs index ab56f4ed13..2d831fa252 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneManagerTests.cs @@ -41,7 +41,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class SceneManagerTests + public class SceneManagerTests : OpenSimTestCase { [Test] public void TestClose() diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index 0076f41225..4f15791f10 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs @@ -48,7 +48,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// TODO: These tests are very incomplete - they only test for a few conditions. /// [TestFixture] - public class SceneObjectDeRezTests + public class SceneObjectDeRezTests : OpenSimTestCase { /// /// Test deleting an object from a scene. diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs index 0e525c92de..9378e2010d 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs @@ -40,7 +40,7 @@ using log4net; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class SceneObjectLinkingTests + public class SceneObjectLinkingTests : OpenSimTestCase { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs index 89647d68fc..c264433f6b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// Basic scene object resize tests /// [TestFixture] - public class SceneObjectResizeTests + public class SceneObjectResizeTests : OpenSimTestCase { /// /// Test resizing an object diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs index d2361f8667..a58e735fbd 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectScriptTests.cs @@ -40,7 +40,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class SceneObjectScriptTests + public class SceneObjectScriptTests : OpenSimTestCase { [Test] public void TestAddScript() diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs index 6d255aa2d9..5cf62c25a5 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// Spatial scene object tests (will eventually cover root and child part position, rotation properties, etc.) /// [TestFixture] - public class SceneObjectSpatialTests + public class SceneObjectSpatialTests : OpenSimTestCase { TestScene m_scene; UUID m_ownerId = TestHelpers.ParseTail(0x1); diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs index 742c7691e9..093cbd24b6 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// Basic scene object status tests /// [TestFixture] - public class SceneObjectStatusTests + public class SceneObjectStatusTests : OpenSimTestCase { private TestScene m_scene; private UUID m_ownerId = TestHelpers.ParseTail(0x1); diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs index 646e5fa61a..1cd8ae943c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAnimationTests.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// Scene presence animation tests /// [TestFixture] - public class ScenePresenceAnimationTests + public class ScenePresenceAnimationTests : OpenSimTestCase { [Test] public void TestFlyingAnimation() diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs index 1d1ff88420..d80afd39bc 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAutopilotTests.cs @@ -42,7 +42,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class ScenePresenceAutopilotTests + public class ScenePresenceAutopilotTests : OpenSimTestCase { private TestScene m_scene; diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs index 493ab70883..acaeb90fc4 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs @@ -43,7 +43,7 @@ using System.Threading; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class ScenePresenceSitTests + public class ScenePresenceSitTests : OpenSimTestCase { private TestScene m_scene; private ScenePresence m_sp; diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs index 37b5184715..8dd1f3d5c3 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTeleportTests.cs @@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// Teleport tests in a standalone OpenSim /// [TestFixture] - public class ScenePresenceTeleportTests + public class ScenePresenceTeleportTests : OpenSimTestCase { [TestFixtureSetUp] public void FixtureInit() diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index ac3da1e2cc..9d8eb0b19f 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests /// Scene presence tests /// [TestFixture] - public class SceneTests + public class SceneTests : OpenSimTestCase { /// /// Very basic scene update test. Should become more elaborate with time. diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index a51e4e377b..0b461f5f91 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs @@ -50,7 +50,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.Framework.Tests { [TestFixture] - public class TaskInventoryTests + public class TaskInventoryTests : OpenSimTestCase { [Test] public void TestAddTaskInventoryItem() diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs index 198e487d1b..dd27294372 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs @@ -38,7 +38,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.Framework.Scenes.Tests { [TestFixture] - public class UuidGathererTests + public class UuidGathererTests : OpenSimTestCase { protected IAssetService m_assetService; protected UuidGatherer m_uuidGatherer; diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs index ac638f1053..c1bdacb0e0 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests /// Basic groups module tests /// [TestFixture] - public class GroupsModuleTests + public class GroupsModuleTests : OpenSimTestCase { [Test] public void TestBasic() diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index 52ed8468c6..a522277e8a 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs @@ -48,7 +48,7 @@ using OpenSim.Tests.Common.Mock; namespace OpenSim.Region.OptionalModules.World.NPC.Tests { [TestFixture] - public class NPCModuleTests + public class NPCModuleTests : OpenSimTestCase { private TestScene m_scene; private AvatarFactoryModule m_afMod; diff --git a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs index cbc6b95844..16404c69e4 100644 --- a/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs +++ b/OpenSim/Region/Physics/OdePlugin/Tests/ODETestClass.cs @@ -32,13 +32,14 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.OdePlugin; +using OpenSim.Tests.Common; using log4net; using System.Reflection; namespace OpenSim.Region.Physics.OdePlugin.Tests { [TestFixture] - public class ODETestClass + public class ODETestClass : OpenSimTestCase { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs index 776361958e..77e087c3c6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs @@ -39,7 +39,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests /// The generated C# code is compared against the expected C# code. /// [TestFixture] - public class CSCodeGeneratorTest + public class CSCodeGeneratorTest : OpenSimTestCase { [Test] public void TestDefaultState() diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs index 1fa6954d00..05a8756e6e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs @@ -41,7 +41,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests /// the LSL source. /// [TestFixture] - public class CompilerTest + public class CompilerTest : OpenSimTestCase { private string m_testDir; private CSharpCodeProvider m_CSCodeProvider; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs index c73e22ffdb..2c9d9e8614 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests /// Tests for inventory functions in LSL /// [TestFixture] - public class LSL_ApiInventoryTests + public class LSL_ApiInventoryTests : OpenSimTestCase { protected Scene m_scene; protected XEngine.XEngine m_engine; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs index 2565ae7136..57f19b950d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs @@ -56,7 +56,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests /// OpenSim.Region.Framework.Scenes.Tests.SceneObjectLinkingTests. /// [TestFixture] - public class LSL_ApiLinkingTests + public class LSL_ApiLinkingTests : OpenSimTestCase { protected Scene m_scene; protected XEngine.XEngine m_engine; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs index dd23be8857..182b07b484 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs @@ -46,7 +46,7 @@ using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString; namespace OpenSim.Region.ScriptEngine.Shared.Tests { [TestFixture] - public class LSL_ApiListTests + public class LSL_ApiListTests : OpenSimTestCase { private LSL_Api m_lslApi; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs index 3ed256212e..c8c7f820f4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs @@ -33,7 +33,7 @@ using OpenSim.Region.ScriptEngine.Shared; namespace OpenSim.Region.ScriptEngine.Shared.Tests { [TestFixture] - public class LSL_TypesTestLSLFloat + public class LSL_TypesTestLSLFloat : OpenSimTestCase { // Used for testing equality of two floats. private double _lowPrecisionTolerance = 0.000001; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs index 8d1169a37c..c664108f14 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs @@ -33,7 +33,7 @@ using OpenSim.Region.ScriptEngine.Shared; namespace OpenSim.Region.ScriptEngine.Shared.Tests { [TestFixture] - public class LSL_TypesTestLSLInteger + public class LSL_TypesTestLSLInteger : OpenSimTestCase { private Dictionary m_doubleIntSet; private Dictionary m_stringIntSet; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs index c4ca1a87a8..8550f2df30 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs @@ -33,7 +33,7 @@ using OpenSim.Region.ScriptEngine.Shared; namespace OpenSim.Region.ScriptEngine.Shared.Tests { [TestFixture] - public class LSL_TypesTestLSLString + public class LSL_TypesTestLSLString : OpenSimTestCase { private Dictionary m_doubleStringSet; diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs index b81225f799..71b88bcce6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestList.cs @@ -36,7 +36,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests /// Tests the LSL_Types.list class. /// [TestFixture] - public class LSL_TypesTestList + public class LSL_TypesTestList : OpenSimTestCase { /// /// Tests concatenating a string to a list. diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs index ebf8001e0f..0c838afa3c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestVector3.cs @@ -36,7 +36,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests /// Tests for Vector3 /// [TestFixture] - public class LSL_TypesTestVector3 + public class LSL_TypesTestVector3 : OpenSimTestCase { [Test] public void TestDotProduct() diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs index c40179456d..213f33f060 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests /// Tests for OSSL_Api /// [TestFixture] - public class OSSL_ApiAppearanceTest + public class OSSL_ApiAppearanceTest : OpenSimTestCase { protected Scene m_scene; protected XEngine.XEngine m_engine; diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs index f331658662..5abfe9a2c8 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine.Tests /// XEngine tests. /// [TestFixture] - public class XEngineTest + public class XEngineTest : OpenSimTestCase { private TestScene m_scene; private XEngine m_xEngine; diff --git a/OpenSim/Tests/ConfigurationLoaderTest.cs b/OpenSim/Tests/ConfigurationLoaderTest.cs index 067264d027..e5186ae517 100644 --- a/OpenSim/Tests/ConfigurationLoaderTest.cs +++ b/OpenSim/Tests/ConfigurationLoaderTest.cs @@ -29,11 +29,12 @@ using System.IO; using Nini.Config; using NUnit.Framework; using OpenSim.Framework; +using OpenSim.Tests.Common; namespace OpenSim.Tests { [TestFixture] - public class ConfigurationLoaderTests + public class ConfigurationLoaderTests : OpenSimTestCase { private const string m_testSubdirectory = "test"; private string m_basePath; diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs index 627765b325..2026a881f0 100644 --- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs +++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs @@ -58,7 +58,7 @@ namespace OpenSim.Tests.Performance /// earlier tests. /// [TestFixture] - public class NPCPerformanceTests + public class NPCPerformanceTests : OpenSimTestCase { private TestScene scene; private AvatarFactoryModule afm; diff --git a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs index 2264d86246..656a971648 100644 --- a/OpenSim/Tests/Performance/ObjectPerformanceTests.cs +++ b/OpenSim/Tests/Performance/ObjectPerformanceTests.cs @@ -47,7 +47,7 @@ namespace OpenSim.Tests.Performance /// earlier tests. /// [TestFixture] - public class ObjectPerformanceTests + public class ObjectPerformanceTests : OpenSimTestCase { [TearDown] public void TearDown() diff --git a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs index d708abd1f4..4064edc20f 100644 --- a/OpenSim/Tests/Performance/ScriptPerformanceTests.cs +++ b/OpenSim/Tests/Performance/ScriptPerformanceTests.cs @@ -53,7 +53,7 @@ namespace OpenSim.Tests.Performance /// earlier tests. /// [TestFixture] - public class ScriptPerformanceTests + public class ScriptPerformanceTests : OpenSimTestCase { private TestScene m_scene; private XEngine m_xEngine; diff --git a/prebuild.xml b/prebuild.xml index a7201c53f7..0612c10fd6 100644 --- a/prebuild.xml +++ b/prebuild.xml @@ -2716,10 +2716,11 @@ ../../bin/ - + + @@ -3293,6 +3294,7 @@ +