/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs |
@@ -70,7 +70,7 @@ |
UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood"); |
UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); |
|
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", m_iarStream); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream); |
InventoryItemBase foundItem1 |
= InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name); |
|
@@ -79,7 +79,7 @@ |
// Now try loading to a root child folder |
UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false); |
MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", archiveReadStream); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream); |
|
InventoryItemBase foundItem2 |
= InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xA/" + m_item1Name); |
@@ -88,7 +88,7 @@ |
// Now try loading to a more deeply nested folder |
UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC", false); |
archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", archiveReadStream); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream); |
|
InventoryItemBase foundItem3 |
= InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC/" + m_item1Name); |
@@ -110,7 +110,7 @@ |
SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
|
UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password"); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", m_iarStream); |
archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream); |
|
InventoryItemBase foundItem1 |
= InventoryArchiveUtils.FindItemByPath( |
@@ -127,6 +127,7 @@ |
|
string itemName = "You & you are a mean/man/"; |
string humanEscapedItemName = @"You & you are a mean\/man\/"; |
string userPassword = "meowfood"; |
|
InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
|
@@ -179,13 +180,13 @@ |
|
mre.Reset(); |
archiverModule.ArchiveInventory( |
Guid.NewGuid(), userFirstName, userLastName, "Objects", archiveWriteStream); |
Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream); |
mre.WaitOne(60000, false); |
|
// LOAD ITEM |
MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
|
archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", archiveReadStream); |
archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream); |
|
InventoryItemBase foundItem1 |
= InventoryArchiveUtils.FindItemByPath( |
/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadTests.cs |
@@ -72,7 +72,7 @@ |
// TestHelpers.EnableLogging(); |
|
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password"); |
m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", m_iarStream); |
m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream); |
|
InventoryItemBase coaItem |
= InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_coaItemName); |
@@ -107,7 +107,7 @@ |
|
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood"); |
|
m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", m_iarStream); |
m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream); |
InventoryItemBase foundItem1 |
= InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaLL1.PrincipalID, m_item1Name); |
|
@@ -171,7 +171,7 @@ |
// log4net.Config.XmlConfigurator.Configure(); |
|
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password"); |
m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", m_iarStream); |
m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream); |
|
InventoryItemBase foundItem1 |
= InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name); |
/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs |
@@ -110,7 +110,7 @@ |
|
mre.Reset(); |
m_archiverModule.ArchiveInventory( |
Guid.NewGuid(), userFirstName, userLastName, "/", archiveWriteStream); |
Guid.NewGuid(), userFirstName, userLastName, "/", userPassword, archiveWriteStream); |
mre.WaitOne(60000, false); |
|
// Test created iar |
@@ -179,7 +179,7 @@ |
|
mre.Reset(); |
m_archiverModule.ArchiveInventory( |
Guid.NewGuid(), userFirstName, userLastName, "f1", archiveWriteStream); |
Guid.NewGuid(), userFirstName, userLastName, "f1", userPassword, archiveWriteStream); |
mre.WaitOne(60000, false); |
|
// Test created iar |
@@ -267,7 +267,7 @@ |
|
mre.Reset(); |
m_archiverModule.ArchiveInventory( |
Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, archiveWriteStream); |
Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream); |
mre.WaitOne(60000, false); |
|
byte[] archive = archiveWriteStream.ToArray(); |
@@ -364,7 +364,7 @@ |
|
// When we're not saving assets, archiving is being done synchronously. |
m_archiverModule.ArchiveInventory( |
Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, archiveWriteStream, options); |
Guid.NewGuid(), userFirstName, userLastName, "Objects/" + item1Name, userPassword, archiveWriteStream, options); |
|
byte[] archive = archiveWriteStream.ToArray(); |
MemoryStream archiveReadStream = new MemoryStream(archive); |