aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.nant/local.include5
-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
-rw-r--r--bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config33
-rw-r--r--prebuild.xml36
6 files changed, 149 insertions, 2 deletions
diff --git a/.nant/local.include b/.nant/local.include
index e5efb67..40224f9 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -112,6 +112,11 @@
112 </exec> 112 </exec>
113 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" /> 113 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" />
114 114
115 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindencaps.tests">
116 <arg value="./bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll" />
117 </exec>
118 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindencaps.tests)==0}" />
119
115<!-- 120<!--
116 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> 121 <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
117 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 122 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
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 894d8d2..e43185d 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2561,7 +2561,9 @@ namespace OpenSim.Region.Framework.Scenes
2561 if (aCircuit.child == false) 2561 if (aCircuit.child == false)
2562 { 2562 {
2563 sp.IsChildAgent = false; 2563 sp.IsChildAgent = false;
2564 Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); }); 2564
2565 if (AttachmentsModule != null)
2566 Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
2565 } 2567 }
2566 } 2568 }
2567 2569
diff --git a/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config b/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config
new file mode 100644
index 0000000..a3f681d
--- /dev/null
+++ b/bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config
@@ -0,0 +1,33 @@
1<?xml version="1.0" encoding="utf-8" ?>
2<configuration>
3 <configSections>
4 <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
5 </configSections>
6 <runtime>
7 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8 <dependentAssembly>
9 <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
10 <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
11 <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
12 <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
13 </dependentAssembly>
14 </assemblyBinding>
15 </runtime>
16 <log4net>
17 <!-- A1 is set to be a ConsoleAppender -->
18 <appender name="A1" type="log4net.Appender.ConsoleAppender">
19
20 <!-- A1 uses PatternLayout -->
21 <layout type="log4net.Layout.PatternLayout">
22 <!-- Print the date in ISO 8601 format -->
23 <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
24 </layout>
25 </appender>
26
27 <!-- Set root logger level to DEBUG and its only appender to A1 -->
28 <root>
29 <level value="DEBUG" />
30 <appender-ref ref="A1" />
31 </root>
32 </log4net>
33</configuration>
diff --git a/prebuild.xml b/prebuild.xml
index d6db614..a1d56bc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3068,6 +3068,42 @@
3068 </Files> 3068 </Files>
3069 </Project> 3069 </Project>
3070 3070
3071 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
3072 <Configuration name="Debug">
3073 <Options>
3074 <OutputPath>../../../../../bin/</OutputPath>
3075 </Options>
3076 </Configuration>
3077 <Configuration name="Release">
3078 <Options>
3079 <OutputPath>../../../../../bin/</OutputPath>
3080 </Options>
3081 </Configuration>
3082
3083 <ReferencePath>../../../../../bin/</ReferencePath>
3084 <Reference name="System"/>
3085 <Reference name="System.Xml"/>
3086 <Reference name="log4net" path="../../../../../bin/"/>
3087 <Reference name="Nini" path="../../../../../bin/"/>
3088 <Reference name="nunit.framework" path="../../../../../bin/"/>
3089 <Reference name="OpenMetaverse" path="../../../../../bin/"/>
3090 <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
3091 <Reference name="OpenSim.Framework"/>
3092 <Reference name="OpenSim.Framework.Communications"/>
3093 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3094 <Reference name="OpenSim.Framework.Statistics"/>
3095 <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
3096 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
3097 <Reference name="OpenSim.Region.CoreModules"/>
3098 <Reference name="OpenSim.Region.Framework"/>
3099 <Reference name="OpenSim.Services.Interfaces"/>
3100 <Reference name="OpenSim.Tests.Common"/>
3101
3102 <Files>
3103 <Match path="EventQueue/Tests" pattern="*.cs" recurse="false"/>
3104 </Files>
3105 </Project>
3106
3071 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library"> 3107 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
3072 <Configuration name="Debug"> 3108 <Configuration name="Debug">
3073 <Options> 3109 <Options>