From 134f86e8d5c414409631b25b8c6f0ee45fbd8631 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 3 Nov 2016 21:44:39 +1000
Subject: Initial update to OpenSim 0.8.2.1 source code.
---
.../Caps/EventQueue/Tests/EventQueueTests.cs | 103 +++++++++++++++++++--
1 file changed, 95 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
index ed8ec16..16a902d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/Tests/EventQueueTests.cs
@@ -26,6 +26,7 @@
*/
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Net;
using log4net.Config;
@@ -33,13 +34,15 @@ using Nini.Config;
using NUnit.Framework;
using OpenMetaverse;
using OpenMetaverse.Packets;
+using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Region.ClientStack.Linden;
using OpenSim.Region.CoreModules.Framework;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.OptionalModules.World.NPC;
using OpenSim.Tests.Common;
-using OpenSim.Tests.Common.Mock;
namespace OpenSim.Region.ClientStack.Linden.Tests
{
@@ -47,10 +50,14 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
public class EventQueueTests : OpenSimTestCase
{
private TestScene m_scene;
+ private EventQueueGetModule m_eqgMod;
+ private NPCModule m_npcMod;
[SetUp]
- public void SetUp()
+ public override void SetUp()
{
+ base.SetUp();
+
uint port = 9999;
uint sslPort = 9998;
@@ -67,14 +74,19 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
config.Configs["Startup"].Set("EventQueue", "true");
CapabilitiesModule capsModule = new CapabilitiesModule();
- EventQueueGetModule eqgModule = new EventQueueGetModule();
+ m_eqgMod = new EventQueueGetModule();
+
+ // For NPC test support
+ config.AddConfig("NPC");
+ config.Configs["NPC"].Set("Enabled", "true");
+ m_npcMod = new NPCModule();
m_scene = new SceneHelpers().SetupScene();
- SceneHelpers.SetupSceneModules(m_scene, config, capsModule, eqgModule);
+ SceneHelpers.SetupSceneModules(m_scene, config, capsModule, m_eqgMod, m_npcMod);
}
[Test]
- public void AddForClient()
+ public void TestAddForClient()
{
TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure();
@@ -86,18 +98,93 @@ namespace OpenSim.Region.ClientStack.Linden.Tests
}
[Test]
- public void RemoveForClient()
+ public void TestRemoveForClient()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
+// TestHelpers.EnableLogging();
UUID spId = TestHelpers.ParseTail(0x1);
SceneHelpers.AddScenePresence(m_scene, spId);
- m_scene.IncomingCloseAgent(spId, false);
+ m_scene.CloseAgent(spId, false);
// TODO: Add more assertions for the other aspects of event queues
Assert.That(MainServer.Instance.GetPollServiceHandlerKeys().Count, Is.EqualTo(0));
}
+
+ [Test]
+ public void TestEnqueueMessage()
+ {
+ TestHelpers.InMethod();
+// log4net.Config.XmlConfigurator.Configure();
+
+ ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
+
+ string messageName = "TestMessage";
+
+ m_eqgMod.Enqueue(m_eqgMod.BuildEvent(messageName, new OSDMap()), sp.UUID);
+
+ Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, sp.UUID);
+
+ Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.OK));
+
+// Console.WriteLine("Response [{0}]", (string)eventsResponse["str_response_string"]);
+
+ OSDMap rawOsd = (OSDMap)OSDParser.DeserializeLLSDXml((string)eventsResponse["str_response_string"]);
+ OSDArray eventsOsd = (OSDArray)rawOsd["events"];
+
+ bool foundUpdate = false;
+ foreach (OSD osd in eventsOsd)
+ {
+ OSDMap eventOsd = (OSDMap)osd;
+
+ if (eventOsd["message"] == messageName)
+ foundUpdate = true;
+ }
+
+ Assert.That(foundUpdate, Is.True, string.Format("Did not find {0} in response", messageName));
+ }
+
+ ///
+ /// Test an attempt to put a message on the queue of a user that is not in the region.
+ ///
+ [Test]
+ public void TestEnqueueMessageNoUser()
+ {
+ TestHelpers.InMethod();
+ TestHelpers.EnableLogging();
+
+ string messageName = "TestMessage";
+
+ m_eqgMod.Enqueue(m_eqgMod.BuildEvent(messageName, new OSDMap()), TestHelpers.ParseTail(0x1));
+
+ Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, TestHelpers.ParseTail(0x1));
+
+ Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway));
+ }
+
+ ///
+ /// NPCs do not currently have an event queue but a caller may try to send a message anyway, so check behaviour.
+ ///
+ [Test]
+ public void TestEnqueueMessageToNpc()
+ {
+ TestHelpers.InMethod();
+// TestHelpers.EnableLogging();
+
+ UUID npcId
+ = m_npcMod.CreateNPC(
+ "John", "Smith", new Vector3(128, 128, 30), UUID.Zero, true, m_scene, new AvatarAppearance());
+
+ ScenePresence npc = m_scene.GetScenePresence(npcId);
+
+ string messageName = "TestMessage";
+
+ m_eqgMod.Enqueue(m_eqgMod.BuildEvent(messageName, new OSDMap()), npc.UUID);
+
+ Hashtable eventsResponse = m_eqgMod.GetEvents(UUID.Zero, npc.UUID);
+
+ Assert.That((int)eventsResponse["int_response_code"], Is.EqualTo((int)HttpStatusCode.BadGateway));
+ }
}
}
\ No newline at end of file
--
cgit v1.1