From a3145e4e5a69ec8570e3678d55f6d3bdda1b4d55 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Fri, 22 May 2009 19:59:45 +0000
Subject: [PATCH] * Reintroduce save iar test, which wasn't working because the
 asset service hadn't been manually post intiailized

---
 .../Archiver/Tests/InventoryArchiverTests.cs  | 20 +++++++++----------
 .../Tests/Common/Setup/SceneSetupHelpers.cs   |  2 ++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index d1f3113d56..fd79ffaf9f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
         /// <summary>
         /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet).
         /// </summary>
-        //[Test]
+        [Test]
         public void TestSaveIarV0_1()
         {
             TestHelper.InMethod();
@@ -127,10 +127,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             lock (this)
             {
                 archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream);
-                //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer;
-                //while (assetServer.HasWaitingRequests())
-                //    assetServer.ProcessNextRequest();
-                
                 Monitor.Wait(this, 60000);
             }
 
@@ -160,9 +156,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             string filePath;
             TarArchiveReader.TarEntryType tarEntryType;
 
+            Console.WriteLine("Reading archive");
+            
             while (tar.ReadEntry(out filePath, out tarEntryType) != null)
             {
-                //Console.WriteLine("Got {0}", filePath);
+                Console.WriteLine("Got {0}", filePath);
 
 //                if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
 //                {
@@ -171,13 +169,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 
                 if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
                 {
-                    string fileName = filePath.Remove(0, "Objects/".Length);
-
-                    if (fileName.StartsWith(part1.Name))
-                    {
+//                    string fileName = filePath.Remove(0, "Objects/".Length);
+//
+//                    if (fileName.StartsWith(part1.Name))
+//                    {
                         Assert.That(filePath, Is.EqualTo(expectedObject1FilePath));
                         gotObject1File = true;
-                    }
+//                    }
 //                    else if (fileName.StartsWith(part2.Name))
 //                    {
 //                        Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 434b734312..413a2b946f 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -136,6 +136,7 @@ namespace OpenSim.Tests.Common.Setup
             assetService.AddRegion(testScene);
             assetService.RegionLoaded(testScene);
             testScene.AddRegionModule(assetService.Name, assetService);
+            assetService.PostInitialise();
             
             testScene.SetModuleInterfaces();
 
@@ -176,6 +177,7 @@ namespace OpenSim.Tests.Common.Setup
                     IRegionModule m = (IRegionModule)module;
                     m.Initialise(scene, config);
                     scene.AddModule(m.Name, m);
+                    m.PostInitialise();
                 }
                 else if (module is IRegionModuleBase)
                 {