OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Added some more tests to the GetAssetStreamHandlers

0.6.5-rc1
lbsa71 2009-05-13 17:11:53 +00:00
parent b95b7222f9
commit 40e95cab02
12 changed files with 386 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
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,6 +86,26 @@ namespace OpenSim.Framework.Servers
}
else
{
result = GetXml(asset);
}
}
else
{
if (StatsManager.AssetStats != null)
{
StatsManager.AssetStats.AddNotFoundRequest();
}
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
}
}
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);
@ -101,17 +119,6 @@ namespace OpenSim.Framework.Servers
result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length);
}
}
else
{
if (StatsManager.AssetStats != null)
StatsManager.AssetStats.AddNotFoundRequest();
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
}
}
return result;
}

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;
}
}
}

4
OpenSim/Tests/Common/BaseRequestHandlerTestHelper.cs
View File

@ -1,9 +1,11 @@
using System;
using System;
using System.Collections.Generic;
using System.Text;
using NUnit.Framework;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Tests.Common.Mock;
namespace OpenSim.Tests.Common
{

34
OpenSim/Tests/Common/Mock/BaseAssetRepository.cs Normal file
View File

@ -0,0 +1,34 @@
using System.Collections.Generic;
using OpenMetaverse;
using OpenSim.Framework;
namespace OpenSim.Tests.Common.Mock
{
public class BaseAssetRepository
{
protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>();
public AssetBase FetchAsset(UUID uuid)
{
if (ExistsAsset(uuid))
return Assets[uuid];
else
return null;
}
public void CreateAsset(AssetBase asset)
{
Assets[asset.FullID] = asset;
}
public void UpdateAsset(AssetBase asset)
{
CreateAsset(asset);
}
public bool ExistsAsset(UUID uuid)
{
return Assets.ContainsKey(uuid);
}
}
}

92
OpenSim/Tests/Common/Mock/TestAssetCache.cs Normal file
View File

@ -0,0 +1,92 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
namespace OpenSim.Tests.Common.Mock
{
public class TestAssetCache : BaseAssetRepository, IAssetCache
{
public void AssetReceived(AssetBase asset, bool IsTexture)
{
throw new NotImplementedException();
}
public void AssetNotFound(UUID assetID, bool IsTexture)
{
throw new NotImplementedException();
}
public void Dispose()
{
throw new NotImplementedException();
}
public string Version
{
get { throw new NotImplementedException(); }
}
public string Name
{
get { throw new NotImplementedException(); }
}
public void Initialise()
{
throw new NotImplementedException();
}
public IAssetServer AssetServer
{
get { throw new NotImplementedException(); }
}
public void Initialise(ConfigSettings cs, IAssetServer server)
{
throw new NotImplementedException();
}
public void ShowState()
{
throw new NotImplementedException();
}
public void Clear()
{
throw new NotImplementedException();
}
public bool TryGetCachedAsset(UUID assetID, out AssetBase asset)
{
throw new NotImplementedException();
}
public void GetAsset(UUID assetID, AssetRequestCallback callback, bool isTexture)
{
throw new NotImplementedException();
}
public AssetBase GetAsset(UUID assetID, bool isTexture)
{
return FetchAsset(assetID);
}
public void AddAsset(AssetBase asset)
{
CreateAsset( asset );
}
public void ExpireAsset(UUID assetID)
{
throw new NotImplementedException();
}
public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
{
throw new NotImplementedException();
}
}
}

27
OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs
View File

@ -37,40 +37,15 @@ namespace OpenSim.Tests.Common.Mock
/// mono addin plugin system starts co-operating with the unit test system. Currently no locking since unit
/// tests are single threaded.
/// </summary>
public class TestAssetDataPlugin : IAssetDataPlugin
public class TestAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin
{
public string Version { get { return "0"; } }
public string Name { get { return "TestAssetDataPlugin"; } }
protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>();
public void Initialise() {}
public void Initialise(string connect) {}
public void Dispose() {}
public AssetBase FetchAsset(UUID uuid)
{
if (ExistsAsset(uuid))
return Assets[uuid];
else
return null;
}
public void CreateAsset(AssetBase asset)
{
Assets[asset.FullID] = asset;
}
public void UpdateAsset(AssetBase asset)
{
CreateAsset(asset);
}
public bool ExistsAsset(UUID uuid)
{
return Assets.ContainsKey(uuid);
}
public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
}
}

78
OpenSim/Tests/Common/Mock/TestAssetService.cs Normal file
View File

@ -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 System;
using System.Collections.Generic;
using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Data;
using OpenSim.Services.Interfaces;
namespace OpenSim.Tests.Common.Mock
{
public class TestAssetService : IAssetService
{
private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>();
public AssetBase Get(string id)
{
return Assets[ id ];
}
public AssetMetadata GetMetadata(string id)
{
throw new System.NotImplementedException();
}
public byte[] GetData(string id)
{
throw new System.NotImplementedException();
}
public bool Get(string id, object sender, AssetRetrieved handler)
{
throw new NotImplementedException();
}
public string Store(AssetBase asset)
{
Assets[asset.ID] = asset;
return asset.ID;
}
public bool UpdateContent(string id, byte[] data)
{
throw new System.NotImplementedException();
}
public bool Delete(string id)
{
throw new System.NotImplementedException();
}
}
}

13
OpenSim/Tests/Common/Mock/TestOSHttpResponse.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenSim.Framework.Servers.HttpServer;
namespace OpenSim.Tests.Common.Mock
{
public class TestOSHttpResponse : OSHttpResponse
{
public override int StatusCode { get; set; }
public override string ContentType { get; set; }
}
}

64
OpenSim/Tests/Common/Setup/GetAssetStreamHandlerTestHelpers.cs Normal file
View File

@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
using NUnit.Framework;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Tests.Common.Mock;
namespace OpenSim.Tests.Common.Setup
{
public class GetAssetStreamHandlerTestHelpers
{
public static void BaseFetchExistingAssetXmlTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response)
{
byte[] expected = BaseGetAssetStreamHandler.GetXml(asset);
byte[] actual = handler.Handle("/assets/" + asset.ID , null, null, response);
Assert.Greater(actual.Length, 10, "Too short xml on fetching xml without trailing slash.");
Assert.AreEqual(expected, actual, "Failed on fetching xml without trailing slash.");
// Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on first fetch.");
byte[] actual1 = handler.Handle("/assets/" + asset.ID + "/", null, null, response);
Assert.Greater(actual1.Length, 10, "Too short xml on fetching xml with trailing slash.");
Assert.AreEqual(expected, actual1, "Failed on fetching xml with trailing slash.");
// Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on second fetch.");
}
public static void BaseFetchExistingAssetDataTest(AssetBase asset, BaseGetAssetStreamHandler handler, OSHttpResponse response)
{
Assert.AreEqual(asset.Data, handler.Handle("/assets/" + asset.ID + "/data", null, null, response), "Failed on fetching data without trailing slash.");
Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on first fetch.");
Assert.AreEqual(asset.Data, handler.Handle("/assets/" + asset.ID + "/data/", null, null, response), "Failed on fetching data with trailing slash.");
Assert.AreEqual((int)HttpStatusCode.OK, response.StatusCode, "Wrong http response code on second fetch.");
}
public static AssetBase CreateCommonTestResources(out OSHttpResponse response)
{
AssetBase asset = CreateTestAsset();
response = new TestOSHttpResponse();
return asset;
}
public static AssetBase CreateTestAsset()
{
byte[] expected = new byte[] { 1,2,3 };
AssetBase asset = new AssetBase( );
asset.ID = Guid.NewGuid().ToString();
asset.Data = expected;
return asset;
}
public static void BaseFetchMissingAsset(BaseGetAssetStreamHandler handler)
{
Assert.AreEqual(BaseRequestHandlerTestHelper.EmptyByteArray, handler.Handle("/assets/" + Guid.NewGuid(), null, null, null), "Failed on bad guid.");
}
}
}

2
prebuild.xml
View File

@ -3133,6 +3133,7 @@
<Reference name="OpenSim.Framework.Servers"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Region.Communications.Local"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
@ -3330,6 +3331,7 @@
<ReferencePath>../../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Tests.Common"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Servers"/>