aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-06-04 20:43:05 +0100
committerJustin Clark-Casey (justincc)2010-06-04 20:43:05 +0100
commit75878c8f43251477b3b10942b689d69c1e803056 (patch)
tree6baa8fa16d45e8c20768c4eff7dec3bb2c2cebd9 /OpenSim/Tests
parentremove estate stuff in sqlite region migrations since this also exists in est... (diff)
downloadopensim-SC-75878c8f43251477b3b10942b689d69c1e803056.zip
opensim-SC-75878c8f43251477b3b10942b689d69c1e803056.tar.gz
opensim-SC-75878c8f43251477b3b10942b689d69c1e803056.tar.bz2
opensim-SC-75878c8f43251477b3b10942b689d69c1e803056.tar.xz
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
additional tweaks to get this working properly
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs2
-rw-r--r--OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs5
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 2756324..27d1a69 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Tests.Common.Setup
260 "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"); 260 "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
261 else 261 else
262 config.Configs["AuthenticationService"].Set( 262 config.Configs["AuthenticationService"].Set(
263 "LocalServiceModule", "OpenSim.Tests.Common.dll:MockuthenticationService"); 263 "LocalServiceModule", "OpenSim.Tests.Common.dll:MockAuthenticationService");
264 config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 264 config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
265 service.Initialise(config); 265 service.Initialise(config);
266 service.AddRegion(testScene); 266 service.AddRegion(testScene);
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index e6a7818..380f258 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -25,6 +25,7 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System.Collections.Generic;
28using OpenMetaverse; 29using OpenMetaverse;
29using OpenSim.Framework.Communications; 30using OpenSim.Framework.Communications;
30using OpenSim.Region.Framework.Scenes; 31using OpenSim.Region.Framework.Scenes;
@@ -124,7 +125,9 @@ namespace OpenSim.Tests.Common.Setup
124 public static UserAccount CreateUserWithInventory( 125 public static UserAccount CreateUserWithInventory(
125 Scene scene, string firstName, string lastName, UUID userId, string pw) 126 Scene scene, string firstName, string lastName, UUID userId, string pw)
126 { 127 {
127 UserAccount ua = new UserAccount(userId) { FirstName = firstName, LastName = lastName }; 128 UserAccount ua
129 = new UserAccount(userId)
130 { FirstName = firstName, LastName = lastName, ServiceURLs = new Dictionary<string, object>() };
128 scene.UserAccountService.StoreUserAccount(ua); 131 scene.UserAccountService.StoreUserAccount(ua);
129 scene.InventoryService.CreateUserInventory(ua.PrincipalID); 132 scene.InventoryService.CreateUserInventory(ua.PrincipalID);
130 scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); 133 scene.AuthenticationService.SetPassword(ua.PrincipalID, pw);