From 229b69e044ca81233f248ff623b22516136bb3c6 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Tue, 17 Feb 2009 15:39:18 +0000 Subject: * Establish InventoryArchiveSaved event for unit tests * This is done on the inventory archiver module directly rather than Scene.EventManager - the module seems the more appropriate location --- .../Archiver/Tests/InventoryArchiverTests.cs | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests') diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index bc5e564..d1956b4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs @@ -26,7 +26,9 @@ */ using System; +using System.IO; using System.Text; +using System.Threading; using NUnit.Framework; using OpenMetaverse; using OpenSim.Data; @@ -42,10 +44,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests [TestFixture] public class InventoryArchiverTests { + private EventWaitHandle m_waitHandle = new AutoResetEvent(false); + + private void SaveCompleted( + bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, Exception reportedException) + { + m_waitHandle.Set(); + } + /// /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). /// - [Test] + [Test] public void TestSaveIarV0p1() { //log4net.Config.XmlConfigurator.Configure(); @@ -94,16 +104,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests item1.Name = "My Little Dog"; item1.AssetID = asset1.FullID; item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID; - scene.AddInventoryItem(userId, item1); - - /* + scene.AddInventoryItem(userId, item1); MemoryStream archiveWriteStream = new MemoryStream(); - - scene.EventManager.OnOarFileSaved += SaveCompleted; - archiverModule.ArchiveRegion(archiveWriteStream); + archiverModule.OnInventoryArchiveSaved += SaveCompleted; + + archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); m_waitHandle.WaitOne(60000, true); + /* byte[] archive = archiveWriteStream.ToArray(); MemoryStream archiveReadStream = new MemoryStream(archive); TarArchiveReader tar = new TarArchiveReader(archiveReadStream); -- cgit v1.1