From e28e2d24c714c3fba1cba60097986a1c1c28c6c0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 24 Oct 2011 22:23:41 +0100
Subject: Add new EventQueueTests with basic test to check that adding a client
registers an http poll
---
.nant/local.include | 5 ++
.../Linden/Caps/EventQueue/EventQueueGetModule.cs | 1 -
.../Caps/EventQueue/Tests/EventQueueTests.cs | 72 ++++++++++++++++++++++
OpenSim/Region/Framework/Scenes/Scene.cs | 4 +-
....Region.ClientStack.LindenCaps.Tests.dll.config | 33 ++++++++++
prebuild.xml | 36 +++++++++++
6 files changed, 149 insertions(+), 2 deletions(-)
create mode 100644 OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
create mode 100644 bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll.config
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 @@
</exec>
<fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.serialization.tests)==0}" />
+ <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindencaps.tests">
+ <arg value="./bin/OpenSim.Region.ClientStack.LindenCaps.Tests.dll" />
+ </exec>
+ <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindencaps.tests)==0}" />
+
<!--
<exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
<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
{
m_gConfig = null;
}
-
}
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 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using log4net.Config;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Packets;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.ClientStack.Linden;
+using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.ClientStack.Linden.Tests
+{
+ [TestFixture]
+ public class EventQueueTests
+ {
+ [Test]
+ public void AddForClient()
+ {
+ TestHelpers.InMethod();
+ log4net.Config.XmlConfigurator.Configure();
+
+ MainServer.Instance = new BaseHttpServer(9999, false, 9998, "");
+
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Startup");
+ config.Configs["Startup"].Set("EventQueue", "true");
+
+ CapabilitiesModule capsModule = new CapabilitiesModule();
+ EventQueueGetModule eqgModule = new EventQueueGetModule();
+
+ TestScene scene = SceneHelpers.SetupScene();
+ SceneHelpers.SetupSceneModules(scene, config, capsModule, eqgModule);
+
+ SceneHelpers.AddScenePresence(scene, TestHelpers.ParseTail(0x1));
+
+ // TODO: Add more assertions for the other aspects of event queues
+ Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(1));
+ }
+ }
+}
\ 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
if (aCircuit.child == false)
{
sp.IsChildAgent = false;
- Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
+
+ if (AttachmentsModule != null)
+ Util.FireAndForget(delegate(object o) { AttachmentsModule.RezAttachments(sp); });
}
}
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 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+ <configSections>
+ <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
+ </configSections>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="nunit.framework" publicKeyToken="96d09a1eb7f44a77" culture="Neutral" />
+ <bindingRedirect oldVersion="2.0.6.0" newVersion="2.4.6.0" />
+ <bindingRedirect oldVersion="2.1.4.0" newVersion="2.4.6.0" />
+ <bindingRedirect oldVersion="2.2.8.0" newVersion="2.4.6.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+ <log4net>
+ <!-- A1 is set to be a ConsoleAppender -->
+ <appender name="A1" type="log4net.Appender.ConsoleAppender">
+
+ <!-- A1 uses PatternLayout -->
+ <layout type="log4net.Layout.PatternLayout">
+ <!-- Print the date in ISO 8601 format -->
+ <conversionPattern value="%date [%thread] %-5level %logger %ndc - %message%newline" />
+ </layout>
+ </appender>
+
+ <!-- Set root logger level to DEBUG and its only appender to A1 -->
+ <root>
+ <level value="DEBUG" />
+ <appender-ref ref="A1" />
+ </root>
+ </log4net>
+</configuration>
diff --git a/prebuild.xml b/prebuild.xml
index d6db614..a1d56bc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3068,6 +3068,42 @@
</Files>
</Project>
+ <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenCaps.Tests" path="OpenSim/Region/ClientStack/Linden/Caps" type="Library">
+ <Configuration name="Debug">
+ <Options>
+ <OutputPath>../../../../../bin/</OutputPath>
+ </Options>
+ </Configuration>
+ <Configuration name="Release">
+ <Options>
+ <OutputPath>../../../../../bin/</OutputPath>
+ </Options>
+ </Configuration>
+
+ <ReferencePath>../../../../../bin/</ReferencePath>
+ <Reference name="System"/>
+ <Reference name="System.Xml"/>
+ <Reference name="log4net" path="../../../../../bin/"/>
+ <Reference name="Nini" path="../../../../../bin/"/>
+ <Reference name="nunit.framework" path="../../../../../bin/"/>
+ <Reference name="OpenMetaverse" path="../../../../../bin/"/>
+ <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/>
+ <Reference name="OpenSim.Framework"/>
+ <Reference name="OpenSim.Framework.Communications"/>
+ <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+ <Reference name="OpenSim.Framework.Statistics"/>
+ <Reference name="OpenSim.Region.ClientStack.LindenCaps"/>
+ <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
+ <Reference name="OpenSim.Region.CoreModules"/>
+ <Reference name="OpenSim.Region.Framework"/>
+ <Reference name="OpenSim.Services.Interfaces"/>
+ <Reference name="OpenSim.Tests.Common"/>
+
+ <Files>
+ <Match path="EventQueue/Tests" pattern="*.cs" recurse="false"/>
+ </Files>
+ </Project>
+
<Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.LindenUDP.Tests" path="OpenSim/Region/ClientStack/Linden/UDP/Tests" type="Library">
<Configuration name="Debug">
<Options>
--
cgit v1.1