aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-24 22:29:13 +0100
committerJustin Clark-Casey (justincc)2011-10-24 22:29:13 +0100
commit79d5bc9beb445ca07cff9ecbd91d89b2a57e14da (patch)
treeb95a985c8a1673e8449d73d5e44081c1cad64363
parentre-enable running linden udp tests in local.include, though no tests are curr... (diff)
downloadopensim-SC_OLD-79d5bc9beb445ca07cff9ecbd91d89b2a57e14da.zip
opensim-SC_OLD-79d5bc9beb445ca07cff9ecbd91d89b2a57e14da.tar.gz
opensim-SC_OLD-79d5bc9beb445ca07cff9ecbd91d89b2a57e14da.tar.bz2
opensim-SC_OLD-79d5bc9beb445ca07cff9ecbd91d89b2a57e14da.tar.xz
separate out future common setup code from EventQueueTests.AddForClient()
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs22
1 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index 74d91d4..ec8a414 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -45,12 +45,11 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
45 [TestFixture] 45 [TestFixture]
46 public class EventQueueTests 46 public class EventQueueTests
47 { 47 {
48 [Test] 48 private TestScene m_scene;
49 public void AddForClient()
50 {
51 TestHelpers.InMethod();
52 log4net.Config.XmlConfigurator.Configure();
53 49
50 [SetUp]
51 public void SetUp()
52 {
54 MainServer.Instance = new BaseHttpServer(9999, false, 9998, ""); 53 MainServer.Instance = new BaseHttpServer(9999, false, 9998, "");
55 54
56 IConfigSource config = new IniConfigSource(); 55 IConfigSource config = new IniConfigSource();
@@ -60,10 +59,17 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
60 CapabilitiesModule capsModule = new CapabilitiesModule(); 59 CapabilitiesModule capsModule = new CapabilitiesModule();
61 EventQueueGetModule eqgModule = new EventQueueGetModule(); 60 EventQueueGetModule eqgModule = new EventQueueGetModule();
62 61
63 TestScene scene = SceneHelpers.SetupScene(); 62 m_scene = SceneHelpers.SetupScene();
64 SceneHelpers.SetupSceneModules(scene, config, capsModule, eqgModule); 63 SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
64 }
65
66 [Test]
67 public void AddForClient()
68 {
69 TestHelpers.InMethod();
70// log4net.Config.XmlConfigurator.Configure();
65 71
66 SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1)); 72 SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
67 73
68 // TODO: Add more assertions for the other aspects of event queues 74 // TODO: Add more assertions for the other aspects of event queues
69 Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1)); 75 Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1));