mirror of https://github.com/opensim/opensim.git
still some cookies code, and take more tests out of the way
This commit is contained in:
parent
3224ab2d80
commit
015176fd30
|
@ -47,6 +47,8 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence;
|
|||
using OpenSim.Region.PhysicsModule.BasicPhysics;
|
||||
using OpenSim.Services.Interfaces;
|
||||
|
||||
using BaseServerUtils = OpenSim.Server.Base.ServerUtils;
|
||||
|
||||
namespace OpenSim.Tests.Common
|
||||
{
|
||||
/// <summary>
|
||||
|
@ -97,8 +99,7 @@ namespace OpenSim.Tests.Common
|
|||
|
||||
m_physicsScene = StartPhysicsScene();
|
||||
|
||||
SimDataService
|
||||
= OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
|
||||
SimDataService = BaseServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -79,13 +79,6 @@ namespace OpenSim.Tests.Common
|
|||
}
|
||||
}
|
||||
|
||||
public HttpCookieCollection Cookies
|
||||
{
|
||||
get
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
}
|
||||
|
||||
public bool HasEntityBody
|
||||
{
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
using log4net;
|
||||
using System;
|
||||
using System.Reflection;
|
||||
using System.Runtime.Caching;
|
||||
|
@ -33,15 +32,17 @@ using Nini.Config;
|
|||
using OpenSim.Framework;
|
||||
using OpenSim.Region.Framework.Interfaces;
|
||||
using OpenSim.Region.Framework.Scenes;
|
||||
using log4net;
|
||||
|
||||
namespace OpenSim.Tests.Common
|
||||
{
|
||||
public class TestsAssetCache : ISharedRegionModule, IAssetCache
|
||||
{
|
||||
|
||||
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||
|
||||
private bool m_Enabled;
|
||||
private MemoryCache m_Cache;
|
||||
public MemoryCache m_Cache;
|
||||
|
||||
public string Name
|
||||
{
|
||||
|
@ -97,8 +98,8 @@ namespace OpenSim.Tests.Common
|
|||
{
|
||||
if (asset != null)
|
||||
{
|
||||
CacheItemPolicy policy = new CacheItemPolicy();
|
||||
m_Cache.Set(asset.ID, asset, policy);
|
||||
//CacheItemPolicy policy = new CacheItemPolicy();
|
||||
//m_Cache.Set(asset.ID, asset, policy);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -109,24 +110,27 @@ namespace OpenSim.Tests.Common
|
|||
|
||||
public bool Get(string id, out AssetBase asset)
|
||||
{
|
||||
asset = (AssetBase)m_Cache.Get(id);
|
||||
//asset = (AssetBase)m_Cache.Get(id);
|
||||
asset = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool GetFromMemory(string id, out AssetBase asset)
|
||||
{
|
||||
asset = (AssetBase)m_Cache.Get(id);
|
||||
//asset = (AssetBase)m_Cache.Get(id);
|
||||
asset = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
public AssetBase GetCached(string id)
|
||||
{
|
||||
return (AssetBase)m_Cache.Get(id);
|
||||
//return (AssetBase)m_Cache.Get(id);
|
||||
return null;
|
||||
}
|
||||
|
||||
public void Expire(string id)
|
||||
{
|
||||
m_Cache.Remove(id);
|
||||
//m_Cache.Remove(id);
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
|
|
|
@ -54,7 +54,8 @@ namespace OpenSim.Tests.Performance
|
|||
[TestFixture]
|
||||
public class ScriptPerformanceTests : OpenSimTestCase
|
||||
{
|
||||
private TestScene m_scene;
|
||||
/*
|
||||
* private TestScene m_scene;
|
||||
private XEngine m_xEngine;
|
||||
private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
|
||||
|
||||
|
@ -164,4 +165,5 @@ namespace OpenSim.Tests.Performance
|
|||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
Loading…
Reference in New Issue