aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs78
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs11
-rw-r--r--prebuild.xml1
4 files changed, 91 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index c952ebf..28a2f73 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -165,7 +165,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
165 165
166 // Instantiate the request handler 166 // Instantiate the request handler
167 IHttpServer server = MainServer.GetHttpServer((uint)mPort); 167 IHttpServer server = MainServer.GetHttpServer((uint)mPort);
168 server.AddStreamHandler(new FriendsRequestHandler(this)); 168
169 if (server != null)
170 server.AddStreamHandler(new FriendsRequestHandler(this));
169 } 171 }
170 172
171 if (m_FriendsService == null) 173 if (m_FriendsService == null)
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
new file mode 100644
index 0000000..b52093a
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs
@@ -0,0 +1,78 @@
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 Nini.Config;
31using NUnit.Framework;
32using OpenMetaverse;
33using OpenSim.Framework;
34using OpenSim.Region.CoreModules.Avatar.Friends;
35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Tests.Common;
37using OpenSim.Tests.Common.Mock;
38
39namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests
40{
41 [TestFixture]
42 public class FriendsModuleTests
43 {
44 private FriendsModule m_fm;
45 private TestScene m_scene;
46
47 [SetUp]
48 public void Init()
49 {
50 IConfigSource config = new IniConfigSource();
51 config.AddConfig("Modules");
52 // Not strictly necessary since FriendsModule assumes it is the default (!)
53 config.Configs["Modules"].Set("FriendsModule", "FriendsModule");
54 config.AddConfig("Friends");
55 config.Configs["Friends"].Set("Connector", "OpenSim.Services.FriendsService.dll");
56 config.AddConfig("FriendsService");
57 config.Configs["FriendsService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
58
59 m_scene = SceneHelpers.SetupScene();
60 m_fm = new FriendsModule();
61 SceneHelpers.SetupSceneModules(m_scene, config, m_fm);
62 }
63
64 [Test]
65 public void TestNoFriends()
66 {
67 TestHelpers.InMethod();
68// log4net.Config.XmlConfigurator.Configure();
69
70 UUID userId = TestHelpers.ParseTail(0x1);
71
72 ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
73
74 Assert.That(((TestClient)sp.ControllingClient).OfflineNotificationsReceived.Count, Is.EqualTo(0));
75 Assert.That(((TestClient)sp.ControllingClient).OnlineNotificationsReceived.Count, Is.EqualTo(0));
76 }
77 }
78} \ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 4636961..3ba9ed4 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -56,6 +56,10 @@ namespace OpenSim.Tests.Common.Mock
56 56
57 private IScene m_scene; 57 private IScene m_scene;
58 58
59 // Properties so that we can get at received data for test purposes
60 public List<UUID> OfflineNotificationsReceived { get; private set; }
61 public List<UUID> OnlineNotificationsReceived { get; private set; }
62
59// disable warning: public events, part of the public API 63// disable warning: public events, part of the public API
60#pragma warning disable 67 64#pragma warning disable 67
61 65
@@ -440,6 +444,9 @@ namespace OpenSim.Tests.Common.Mock
440 m_circuitCode = agentData.circuitcode; 444 m_circuitCode = agentData.circuitcode;
441 m_scene = scene; 445 m_scene = scene;
442 CapsSeedUrl = agentData.CapsPath; 446 CapsSeedUrl = agentData.CapsPath;
447
448 OfflineNotificationsReceived = new List<UUID>();
449 OnlineNotificationsReceived = new List<UUID>();
443 } 450 }
444 451
445 /// <summary> 452 /// <summary>
@@ -827,12 +834,12 @@ namespace OpenSim.Tests.Common.Mock
827 834
828 public void SendAgentOffline(UUID[] agentIDs) 835 public void SendAgentOffline(UUID[] agentIDs)
829 { 836 {
830 837 OfflineNotificationsReceived.AddRange(agentIDs);
831 } 838 }
832 839
833 public void SendAgentOnline(UUID[] agentIDs) 840 public void SendAgentOnline(UUID[] agentIDs)
834 { 841 {
835 842 OnlineNotificationsReceived.AddRange(agentIDs);
836 } 843 }
837 844
838 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot, 845 public void SendSitResponse(UUID TargetID, Vector3 OffsetPos, Quaternion SitOrientation, bool autopilot,
diff --git a/prebuild.xml b/prebuild.xml
index 4e4bc61..7013598 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2915,6 +2915,7 @@
2915 <Match path="Asset/Tests" pattern="*.cs" recurse="true"/> 2915 <Match path="Asset/Tests" pattern="*.cs" recurse="true"/>
2916 <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/> 2916 <Match path="Avatar/Attachments/Tests" pattern="*.cs" recurse="true"/>
2917 <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/> 2917 <Match path="Avatar/AvatarFactory/Tests" pattern="*.cs" recurse="true"/>
2918 <Match path="Avatar/Friends/Tests" pattern="*.cs" recurse="true"/>
2918 <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/> 2919 <Match path="Avatar/Inventory/Archiver/Tests" pattern="*.cs" recurse="true"/>
2919 <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/> 2920 <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/>
2920 <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/> 2921 <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>