Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge

avinationmerge
Melanie 2011-10-25 03:26:34 +01:00
commit a055dd39ac
1 changed files with 14 additions and 8 deletions

View File

@ -45,12 +45,11 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
[TestFixture] [TestFixture]
public class EventQueueTests public class EventQueueTests
{ {
[Test] private TestScene m_scene;
public void AddForClient()
{
TestHelpers.InMethod();
log4net.Config.XmlConfigurator.Configure();
[SetUp]
public void SetUp()
{
MainServer.Instance = new BaseHttpServer(9999, false, 9998, ""); MainServer.Instance = new BaseHttpServer(9999, false, 9998, "");
IConfigSource config = new IniConfigSource(); IConfigSource config = new IniConfigSource();
@ -60,10 +59,17 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
CapabilitiesModule capsModule = new CapabilitiesModule(); CapabilitiesModule capsModule = new CapabilitiesModule();
EventQueueGetModule eqgModule = new EventQueueGetModule(); EventQueueGetModule eqgModule = new EventQueueGetModule();
TestScene scene = SceneHelpers.SetupScene(); m_scene = SceneHelpers.SetupScene();
SceneHelpers.SetupSceneModules(scene, config, capsModule, eqgModule); SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
}
SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1)); [Test]
public void AddForClient()
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
// TODO: Add more assertions for the other aspects of event queues // TODO: Add more assertions for the other aspects of event queues
Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1)); Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1));