aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-10-25 03:26:20 +0100
committerMelanie2011-10-25 03:26:20 +0100
commit740077a291dbd95dcf5e8e57561443522dabb72f (patch)
tree533ed10fa917a274e98aff1a299e993b8e4d9084 /OpenSim
parentMerge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge (diff)
parentAdd new EventQueueTests with basic test to check that adding a client registe... (diff)
downloadopensim-SC-740077a291dbd95dcf5e8e57561443522dabb72f.zip
opensim-SC-740077a291dbd95dcf5e8e57561443522dabb72f.tar.gz
opensim-SC-740077a291dbd95dcf5e8e57561443522dabb72f.tar.bz2
opensim-SC-740077a291dbd95dcf5e8e57561443522dabb72f.tar.xz
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs1
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs72
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
3 files changed, 75 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 8d0c7a1..3eb2b5e 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -102,7 +102,6 @@ namespace OpenSim.Region.ClientStack.Linden
102 { 102 {
103 m_gConfig = null; 103 m_gConfig = null;
104 } 104 }
105
106 } 105 }
107 106
108 private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string p) 107 private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string p)
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
new file mode 100644
index 0000000..74d91d4
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -0,0 +1,72 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Net;
31using log4net.Config;
32using Nini.Config;
33using NUnit.Framework;
34using OpenMetaverse;
35using OpenMetaverse.Packets;
36using OpenSim.Framework;
37using OpenSim.Framework.Servers.HttpServer;
38using OpenSim.Region.ClientStack.Linden;
39using OpenSim.Region.CoreModules.Framework;
40using OpenSim.Tests.Common;
41using OpenSim.Tests.Common.Mock;
42
43namespace OpenSim.Region.ClientStack.Linden.Tests
44{
45 [TestFixture]
46 public class EventQueueTests
47 {
48 [Test]
49 public void AddForClient()
50 {
51 TestHelpers.InMethod();
52 log4net.Config.XmlConfigurator.Configure();
53
54 MainServer.Instance = new BaseHttpServer(9999, false, 9998, "");
55
56 IConfigSource config = new IniConfigSource();
57 config.AddConfig("Startup");
58 config.Configs["Startup"].Set("EventQueue", "true");
59
60 CapabilitiesModule capsModule = new CapabilitiesModule();
61 EventQueueGetModule eqgModule = new EventQueueGetModule();
62
63 TestScene scene = SceneHelpers.SetupScene();
64 SceneHelpers.SetupSceneModules(scene, config, capsModule, eqgModule);
65
66 SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
67
68 // TODO: Add more assertions for the other aspects of event queues
69 Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1));
70 }
71 }
72} \ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6a11353..8c7ce24 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2672,7 +2672,9 @@ namespace OpenSim.Region.Framework.Scenes
2672 if (aCircuit.child == false) 2672 if (aCircuit.child == false)
2673 { 2673 {
2674 sp.IsChildAgent = false; 2674 sp.IsChildAgent = false;
2675 Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); }); 2675
2676 if (AttachmentsModule != null)
2677 Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
2676 } 2678 }
2677 } 2679 }
2678 2680