diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs index b85739e..b614c18 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs | |||
@@ -43,7 +43,6 @@ using OpenSim.Region.Framework.Scenes; | |||
43 | using OpenSim.Region.Framework.Scenes.Serialization; | 43 | using OpenSim.Region.Framework.Scenes.Serialization; |
44 | using OpenSim.Services.Interfaces; | 44 | using OpenSim.Services.Interfaces; |
45 | using OpenSim.Tests.Common; | 45 | using OpenSim.Tests.Common; |
46 | using OpenSim.Tests.Common.Mock; | ||
47 | 46 | ||
48 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | 47 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests |
49 | { | 48 | { |
@@ -85,8 +84,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
85 | byte[] data = tar.ReadEntry(out filePath, out tarEntryType); | 84 | byte[] data = tar.ReadEntry(out filePath, out tarEntryType); |
86 | Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH)); | 85 | Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH)); |
87 | 86 | ||
88 | InventoryArchiveReadRequest iarr | 87 | InventoryArchiveReadRequest iarr |
89 | = new InventoryArchiveReadRequest(null, null, null, null, null, (Stream)null, false); | 88 | = new InventoryArchiveReadRequest(UUID.Random(), null, null, null, null, null, null, (Stream)null, false); |
90 | iarr.LoadControlFile(filePath, data); | 89 | iarr.LoadControlFile(filePath, data); |
91 | 90 | ||
92 | Assert.That(iarr.ControlFileLoaded, Is.True); | 91 | Assert.That(iarr.ControlFileLoaded, Is.True); |
@@ -110,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
110 | 109 | ||
111 | mre.Reset(); | 110 | mre.Reset(); |
112 | m_archiverModule.ArchiveInventory( | 111 | m_archiverModule.ArchiveInventory( |
113 | Guid.NewGuid(), userFirstName, userLastName, "/", userPassword, archiveWriteStream); | 112 | UUID.Random(), userFirstName, userLastName, "/", userPassword, archiveWriteStream); |
114 | mre.WaitOne(60000, false); | 113 | mre.WaitOne(60000, false); |
115 | 114 | ||
116 | // Test created iar | 115 | // Test created iar |
@@ -179,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
179 | 178 | ||
180 | mre.Reset(); | 179 | mre.Reset(); |
181 | m_archiverModule.ArchiveInventory( | 180 | m_archiverModule.ArchiveInventory( |
182 | Guid.NewGuid(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream); | 181 | UUID.Random(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream); |
183 | mre.WaitOne(60000, false); | 182 | mre.WaitOne(60000, false); |
184 | 183 | ||
185 | // Test created iar | 184 | // Test created iar |
@@ -267,7 +266,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
267 | 266 | ||
268 | mre.Reset(); | 267 | mre.Reset(); |
269 | m_archiverModule.ArchiveInventory( | 268 | m_archiverModule.ArchiveInventory( |
270 | Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream); | 269 | UUID.Random(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream); |
271 | mre.WaitOne(60000, false); | 270 | mre.WaitOne(60000, false); |
272 | 271 | ||
273 | byte[] archive = archiveWriteStream.ToArray(); | 272 | byte[] archive = archiveWriteStream.ToArray(); |
@@ -364,7 +363,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
364 | 363 | ||
365 | // When we're not saving assets, archiving is being done synchronously. | 364 | // When we're not saving assets, archiving is being done synchronously. |
366 | m_archiverModule.ArchiveInventory( | 365 | m_archiverModule.ArchiveInventory( |
367 | Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options); | 366 | UUID.Random(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options); |
368 | 367 | ||
369 | byte[] archive = archiveWriteStream.ToArray(); | 368 | byte[] archive = archiveWriteStream.ToArray(); |
370 | MemoryStream archiveReadStream = new MemoryStream(archive); | 369 | MemoryStream archiveReadStream = new MemoryStream(archive); |