From 75878c8f43251477b3b10942b689d69c1e803056 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Jun 2010 20:43:05 +0100
Subject: get TestSaveIarV0_1() working again by setting up an
 OpenSim.Data.Null.UserAuthenticationData plugin

additional tweaks to get this working properly
---
 .../CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs  | 4 +++-
 .../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs         | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 307db97..ab5f485 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -390,7 +390,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <returns></returns>
         protected UserAccount GetUserInfo(string firstName, string lastName, string pass)
         {
-            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
+            UserAccount account 
+                = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
+            
             if (null == account)
             {
                 m_log.ErrorFormat(
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index c81f295..a3b3e2d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         // Commenting for now! The mock inventory service needs more beef, at least for
         // GetFolderForType
         // REFACTORING PROBLEM. This needs to be rewritten.
-        //[Test]
+        [Test]
         public void TestSaveIarV0_1()
         {
             TestHelper.InMethod();
@@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
 
             InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
 
-            Scene scene = SceneSetupHelpers.SetupScene("Inventory");
+            Scene scene = SceneSetupHelpers.SetupScene("Inventory, useraccounts");
             SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
 
             // Create user
-- 
cgit v1.1