From 04ffcce7ea4fd303cd05e31aa8ece999c17f45b0 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 5 Jan 2009 17:38:39 +0000
Subject: * Extend stub to test the successful login of a user on the local
login service * Test does not do authentication
---
OpenSim/Framework/Communications/LoginService.cs | 2 -
.../Communications/Tests/LoginServiceTests.cs | 96 ++++++++++++++++++++++
OpenSim/Grid/UserServer/UserLoginService.cs | 1 +
.../Tests/Common/Mock/TestCommunicationsManager.cs | 5 +-
OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs | 5 +-
prebuild.xml | 1 +
6 files changed, 106 insertions(+), 4 deletions(-)
create mode 100644 OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index b2434c2..f34f10c 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -117,8 +117,6 @@ namespace OpenSim.Framework.Communications
bool GoodXML = (requestData.Contains("first") && requestData.Contains("last") &&
(requestData.Contains("passwd") || requestData.Contains("web_login_key")));
-
- //bool GoodLogin;
string startLocationRequest = "last";
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
new file mode 100644
index 0000000..51adba1
--- /dev/null
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -0,0 +1,96 @@
+/*
+ * 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 OpenSim 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;
+using System.Net;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using Nwc.XmlRpc;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Region.Communications.Local;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Framework.Communications.Tests
+{
+ ///
+ /// Test the login service. For now, most of this will be done through the LocalLoginService as LoginService
+ /// is abstract
+ ///
+ [TestFixture]
+ public class LoginServiceTests
+ {
+ ///
+ /// Test the normal response to a login. Does not test authentication. Doesn't yet do what it says on the tin.
+ ///
+ [Test]
+ public void TestNormalLoginResponse()
+ {
+ log4net.Config.XmlConfigurator.Configure();
+
+ string firstName = "Timmy";
+ string lastName = "Mallet";
+
+ CommunicationsManager commsManager
+ = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43));
+
+ ((LocalUserServices)commsManager.UserService).AddPlugin(new TestUserDataPlugin());
+ ((LocalInventoryService)commsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
+
+ commsManager.GridService.RegisterRegion(
+ new RegionInfo(42, 43, new IPEndPoint(IPAddress.Loopback, 9000), "localhost"));
+ commsManager.GridService.RegionLoginsEnabled = true;
+
+ LoginService loginService
+ = new LocalLoginService(
+ (UserManagerBase)commsManager.UserService, "Hello folks", commsManager.InterServiceInventoryService,
+ (LocalBackEndServices)commsManager.GridService,
+ commsManager.NetworkServersInfo, false, new LibraryRootFolder(String.Empty));
+
+ Hashtable loginParams = new Hashtable();
+ loginParams["first"] = firstName;
+ loginParams["last"] = lastName;
+ loginParams["passwd"] = "boingboing";
+
+ ArrayList sendParams = new ArrayList();
+ sendParams.Add(loginParams);
+
+ XmlRpcRequest request = new XmlRpcRequest("login_to_simulator", sendParams);
+
+ XmlRpcResponse response = loginService.XmlRpcLoginMethod(request);
+ Hashtable responseData = (Hashtable)response.Value;
+
+ // TODO: Not check inventory part of response yet.
+ // TODO: Not checking all of login response thoroughly yet.
+
+ Assert.That(
+ responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue));
+ Assert.That(responseData["first_name"], Is.EqualTo(firstName));
+ Assert.That(responseData["last_name"], Is.EqualTo(lastName));
+ }
+ }
+}
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 1ba817d..4819337 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -320,6 +320,7 @@ namespace OpenSim.Grid.UserServer
// Update agent with target sim
user.CurrentAgent.Region = regionInfo.UUID;
user.CurrentAgent.Handle = regionInfo.regionHandle;
+
// Prepare notification
Hashtable loginParams = new Hashtable();
loginParams["session_id"] = user.CurrentAgent.SessionID.ToString();
diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 472645c..204ebd7 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -49,7 +49,10 @@ namespace OpenSim.Tests.Common.Mock
LocalUserServices lus = new LocalUserServices(991, 992, lis);
m_userService = lus;
- m_userAdminService = lus;
+ m_userAdminService = lus;
+
+ LocalBackEndServices gs = new LocalBackEndServices();
+ m_gridService = gs;
}
}
}
diff --git a/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
index a5e2a37..6be7b3d 100644
--- a/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
@@ -102,7 +102,10 @@ namespace OpenSim.Tests.Common.Mock
public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) {}
- public List GetUserFriendList(UUID friendlistowner) { return null; }
+ public List GetUserFriendList(UUID friendlistowner)
+ {
+ return new List();
+ }
public Dictionary GetFriendRegionInfos(List uuids) { return null; }
diff --git a/prebuild.xml b/prebuild.xml
index acad24d..cebb57c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2646,6 +2646,7 @@
+
--
cgit v1.1