diff options
author | Justin Clarke Casey | 2009-02-02 20:59:12 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-02 20:59:12 +0000 |
commit | 2c2f10e156c62aa1d95923ff5309f2be7f08faeb (patch) | |
tree | c6631296849e076264ce8e034d29ca117750bfa5 /OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs | |
parent | * As per http://opensimulator.org/mantis/view.php?id=3065 (diff) | |
download | opensim-SC_OLD-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.zip opensim-SC_OLD-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.tar.gz opensim-SC_OLD-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.tar.bz2 opensim-SC_OLD-2c2f10e156c62aa1d95923ff5309f2be7f08faeb.tar.xz |
* Establish OnOarFileSaved EventManager event and subscribe to that instead of passing in a waithandle to the archiver
* This matches the existing OnOarFileLoaded event
* This brings up the question of how these things can be made generic so that they don't have to be tied into EventManager, but that's a topic for another day
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs index 95064e2..43df685 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -44,13 +44,20 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests | |||
44 | [TestFixture] | 44 | [TestFixture] |
45 | public class ArchiverTests | 45 | public class ArchiverTests |
46 | { | 46 | { |
47 | private EventWaitHandle m_waitHandle = new AutoResetEvent(false); | ||
48 | |||
49 | private void SaveCompleted(string errorMessage) | ||
50 | { | ||
51 | m_waitHandle.Set(); | ||
52 | } | ||
53 | |||
47 | /// <summary> | 54 | /// <summary> |
48 | /// Test saving a V0.2 OpenSim Region Archive. | 55 | /// Test saving a V0.2 OpenSim Region Archive. |
49 | /// </summary> | 56 | /// </summary> |
50 | [Test] | 57 | [Test] |
51 | public void TestSaveOarV0p2() | 58 | public void TestSaveOarV0p2() |
52 | { | 59 | { |
53 | //log4net.Config.XmlConfigurator.Configure(); | 60 | log4net.Config.XmlConfigurator.Configure(); |
54 | 61 | ||
55 | ArchiverModule archiverModule = new ArchiverModule(); | 62 | ArchiverModule archiverModule = new ArchiverModule(); |
56 | SerialiserModule serialiserModule = new SerialiserModule(); | 63 | SerialiserModule serialiserModule = new SerialiserModule(); |
@@ -71,11 +78,12 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver.Tests | |||
71 | ownerId, shape, groupPosition, rotationOffset, offsetPosition); | 78 | ownerId, shape, groupPosition, rotationOffset, offsetPosition); |
72 | part.Name = partName; | 79 | part.Name = partName; |
73 | 80 | ||
74 | scene.AddNewSceneObject(new SceneObjectGroup(part), false); | 81 | scene.AddNewSceneObject(new SceneObjectGroup(part), false); |
75 | EventWaitHandle waitHandle = new ManualResetEvent(false); | ||
76 | MemoryStream archiveWriteStream = new MemoryStream(); | 82 | MemoryStream archiveWriteStream = new MemoryStream(); |
77 | archiverModule.ArchiveRegion(archiveWriteStream, waitHandle); | 83 | |
78 | waitHandle.WaitOne(60000, true); | 84 | scene.EventManager.OnOarFileSaved += SaveCompleted; |
85 | archiverModule.ArchiveRegion(archiveWriteStream); | ||
86 | m_waitHandle.WaitOne(60000, true); | ||
79 | 87 | ||
80 | byte[] archive = archiveWriteStream.ToArray(); | 88 | byte[] archive = archiveWriteStream.ToArray(); |
81 | MemoryStream archiveReadStream = new MemoryStream(archive); | 89 | MemoryStream archiveReadStream = new MemoryStream(archive); |