From 892406248ab6452871fa8ac74c8c8b856feee070 Mon Sep 17 00:00:00 2001 From: lbsa71 Date: Wed, 27 May 2009 11:54:17 +0000 Subject: * Added OpenSim.Server.Handlers.Tests project * Added AssetServerGetHandlerTests - not really wired up yet; more to come. * Ignored some gens --- OpenSim/Server/Base/ServerUtils.cs | 8 +- .../Tests/Asset/AssetServerGetHandlerTests.cs | 103 +++++++++++++++++++++ 2 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs (limited to 'OpenSim/Server') diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index d827b86..c0749e3 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs @@ -32,6 +32,7 @@ using System.Xml; using System.Xml.Serialization; using System.Text; using log4net; +using OpenSim.Framework; namespace OpenSim.Server.Base { @@ -92,7 +93,7 @@ namespace OpenSim.Server.Base ms.Seek(0, SeekOrigin.Begin); byte[] ret = ms.GetBuffer(); - Array.Resize(ref ret, (int)ms.Length); + Array.Resize(ref ret, (int)ms.Length); return ret; } @@ -117,9 +118,6 @@ namespace OpenSim.Server.Base try { - //m_log.DebugFormat("[PLUGINS]: Loading plugins from {0}", System.IO.Directory.GetCurrentDirectory()); - //m_log.DebugFormat("[PLUGINS]: Trying to load {0}", dllName); - Assembly pluginAssembly = Assembly.LoadFrom(dllName); foreach (Type pluginType in pluginAssembly.GetTypes()) @@ -152,4 +150,4 @@ namespace OpenSim.Server.Base } } } -} +} \ No newline at end of file diff --git a/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs new file mode 100644 index 0000000..3636972 --- /dev/null +++ b/OpenSim/Server/Handlers/Tests/Asset/AssetServerGetHandlerTests.cs @@ -0,0 +1,103 @@ +using NUnit.Framework; +using OpenSim.Framework; +using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Server.Handlers.Asset; +using OpenSim.Services.Interfaces; +using OpenSim.Tests.Common; +using OpenSim.Tests.Common.Mock; +using OpenSim.Tests.Common.Setup; + +namespace OpenSim.Server.Handlers.Tests.Asset +{ + [TestFixture] + public class AssetServerGetHandlerTests + { + private const string ASSETS_PATH = "/assets"; + + [Test] + public void TestConstructor() + { + TestHelper.InMethod(); + + AssetServerGetHandler handler = new AssetServerGetHandler( null ); + } + + [Test] + public void TestGetParams() + { + TestHelper.InMethod(); + + AssetServerGetHandler handler = new AssetServerGetHandler(null); + BaseRequestHandlerTestHelper.BaseTestGetParams(handler, ASSETS_PATH); + } + + [Test] + public void TestSplitParams() + { + TestHelper.InMethod(); + + AssetServerGetHandler handler = new AssetServerGetHandler(null); + BaseRequestHandlerTestHelper.BaseTestSplitParams(handler, ASSETS_PATH); + } + + //[Test] + //public void TestHandleNoParams() + //{ + // TestHelper.InMethod(); + + // AssetServerGetHandler handler = new AssetServerGetHandler(null); + + // BaseRequestHandlerTestHelper.BaseTestHandleNoParams(handler, ASSETS_PATH); + //} + + //[Test] + //public void TestHandleMalformedGuid() + //{ + // TestHelper.InMethod(); + + // AssetServerGetHandler handler = new AssetServerGetHandler(null); + + // BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH); + //} + + //[Test] + //public void TestHandleFetchMissingAsset() + //{ + // IAssetService assetDataPlugin = new TestAssetDataPlugin(); + // AssetServerGetHandler handler = new AssetServerGetHandler(assetDataPlugin); + + // GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler); + //} + + //[Test] + //public void TestHandleFetchExistingAssetData() + //{ + // AssetServerGetHandler handler; + // OSHttpResponse response; + // AssetBase asset = CreateTestEnvironment(out handler, out response); + + // GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response); + //} + + //[Test] + //public void TestHandleFetchExistingAssetXml() + //{ + // AssetServerGetHandler handler; + // OSHttpResponse response; + // AssetBase asset = CreateTestEnvironment(out handler, out response); + + // GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response); + //} + + private static AssetBase CreateTestEnvironment(out AssetServerGetHandler handler, out OSHttpResponse response) + { + AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response); + + IAssetService assetDataPlugin = new TestAssetService(); + handler = new AssetServerGetHandler(assetDataPlugin); + + assetDataPlugin.Store(asset); + return asset; + } + } +} \ No newline at end of file -- cgit v1.1