ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Added some more tests to the GetAssetStreamHandlers

Browse Source
This commit is contained in:
lbsa71
2009-05-13 17:11:53 +00:00
parent b95b7222f9
commit 40e95cab02
12 changed files with 386 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
View File

@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Servers
if (p.Length > 0)
{
UUID assetID = UUID.Zero;
UUID assetID;
if (!UUID.TryParse(p[0], out assetID))
{
@@ -70,16 +70,14 @@ namespace OpenSim.Framework.Servers
}
if (StatsManager.AssetStats != null)
{
StatsManager.AssetStats.AddRequest();
}
AssetBase asset = GetAsset(assetID);
if (asset != null)
{
// if (asset.ContainsReferences)
// {
// asset.Data = ProcessOutgoingAssetData(asset.Data);
// }
if (p.Length > 1 && p[1] == "data")
{
httpResponse.StatusCode = (int)HttpStatusCode.OK;
@@ -88,25 +86,15 @@ namespace OpenSim.Framework.Servers
}
else
{
XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset);
xw.Flush();
ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length);
result = GetXml(asset);
}
}
else
{
if (StatsManager.AssetStats != null)
{
StatsManager.AssetStats.AddNotFoundRequest();
}
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
}
@@ -115,6 +103,25 @@ namespace OpenSim.Framework.Servers
return result;
}
public static byte[] GetXml(AssetBase asset)
{
byte[] result;
XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset);
xw.Flush();
ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length);
return result;
}
public string ProcessAssetDataString(string data)
{
Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)");

4
OpenSim/Framework/Servers/HttpServer/OSHttpResponse.cs
View File

@@ -45,7 +45,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// Setting this property will also set IsContentTypeSet to
/// true.
/// </remarks>
public string ContentType
public virtual string ContentType
{
get
{
@@ -226,7 +226,7 @@ namespace OpenSim.Framework.Servers.HttpServer
/// <summary>
/// HTTP status code.
/// </summary>
public int StatusCode
public virtual int StatusCode
{
get
{

37
OpenSim/Framework/Servers/Tests/CachedGetAssetStreamHandlerTests.cs
View File

@@ -4,7 +4,10 @@ using System.Text;
using NUnit.Framework;
using OpenSim.Data;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Services.Interfaces;
using OpenSim.Tests.Common;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Framework.Servers.Tests
{
@@ -59,14 +62,34 @@ namespace OpenSim.Framework.Servers.Tests
BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);
}
//[Test]
//public void TestHandleFetchMissingAsset()
//{
[Test]
public void TestHandleFetchMissingAsset()
{
IAssetCache assetCache = new TestAssetCache();
CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(assetCache);
// byte[] emptyResult = new byte[] { };
// CachedGetAssetStreamHandler handler = new CachedGetAssetStreamHandler(null);
GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler);
}
// Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid.");
//}
[Test]
public void TestHandleFetchExistingAssetData()
{
CachedGetAssetStreamHandler handler;
OSHttpResponse response;
AssetBase asset = CreateTestEnvironment(out handler, out response);
GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response);
}
private static AssetBase CreateTestEnvironment(out CachedGetAssetStreamHandler handler, out OSHttpResponse response)
{
AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
IAssetCache assetDataPlugin = new TestAssetCache();
handler = new CachedGetAssetStreamHandler(assetDataPlugin);
assetDataPlugin.AddAsset(asset);
return asset;
}
}
}

49
OpenSim/Framework/Servers/Tests/GetAssetStreamHandlerTests.cs
View File

@@ -1,10 +1,14 @@
using System;
using System.Collections.Generic;
using System.Net;
using System.Text;
using HttpServer;
using NUnit.Framework;
using OpenSim.Data;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Tests.Common;
using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup;
namespace OpenSim.Framework.Servers.Tests
{
@@ -59,13 +63,44 @@ namespace OpenSim.Framework.Servers.Tests
BaseRequestHandlerTestHelper.BaseTestHandleMalformedGuid(handler, ASSETS_PATH);
}
//[Test]
//public void TestHandleFetchMissingAsset()
//{
// byte[] emptyResult = new byte[] { };
// GetAssetStreamHandler handler = new GetAssetStreamHandler(null);
[Test]
public void TestHandleFetchMissingAsset()
{
IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin();
GetAssetStreamHandler handler = new GetAssetStreamHandler(assetDataPlugin);
// Assert.AreEqual(new string[] { }, handler.Handle("/assets/badGuid", null, null, null), "Failed on bad guid.");
//}
GetAssetStreamHandlerTestHelpers.BaseFetchMissingAsset(handler);
}
[Test]
public void TestHandleFetchExistingAssetData()
{
GetAssetStreamHandler handler;
OSHttpResponse response;
AssetBase asset = CreateTestEnvironment(out handler, out response);
GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetDataTest(asset, handler, response);
}
[Test]
public void TestHandleFetchExistingAssetXml()
{
GetAssetStreamHandler handler;
OSHttpResponse response;
AssetBase asset = CreateTestEnvironment(out handler, out response);
GetAssetStreamHandlerTestHelpers.BaseFetchExistingAssetXmlTest(asset, handler, response);
}
private static AssetBase CreateTestEnvironment(out GetAssetStreamHandler handler, out OSHttpResponse response)
{
AssetBase asset = GetAssetStreamHandlerTestHelpers.CreateCommonTestResources(out response);
IAssetDataPlugin assetDataPlugin = new TestAssetDataPlugin();
handler = new GetAssetStreamHandler(assetDataPlugin);
assetDataPlugin.CreateAsset(asset);
return asset;
}
}
}