clockwerk-opensim-stable – Diff between revs 1 and 3
?pathlinks?
Rev 1 | Rev 3 | |||
---|---|---|---|---|
Line 68... | Line 68... | |||
68 | SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
68 | SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
|
Line 69... | Line 69... | |||
69 | |
69 | |
|
70 | UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood"); |
70 | UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood"); |
|
Line 71... | Line 71... | |||
71 | UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); |
71 | UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); |
|
72 | |
72 | |
|
73 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream); |
73 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", m_iarStream); |
|
Line 74... | Line 74... | |||
74 | InventoryItemBase foundItem1 |
74 | InventoryItemBase foundItem1 |
|
Line 75... | Line 75... | |||
75 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name); |
75 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name); |
|
76 | |
76 | |
|
77 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); |
77 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); |
|
78 | |
78 | |
|
Line 79... | Line 79... | |||
79 | // Now try loading to a root child folder |
79 | // Now try loading to a root child folder |
|
80 | UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false); |
80 | UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA", false); |
|
81 | MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); |
81 | MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); |
|
Line 82... | Line 82... | |||
82 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream); |
82 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", archiveReadStream); |
|
83 | |
83 | |
|
84 | InventoryItemBase foundItem2 |
84 | InventoryItemBase foundItem2 |
|
85 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xA/" + m_item1Name); |
85 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xA/" + m_item1Name); |
|
Line 86... | Line 86... | |||
86 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); |
86 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); |
|
87 | |
87 | |
|
88 | // Now try loading to a more deeply nested folder |
88 | // Now try loading to a more deeply nested folder |
|
89 | UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC", false); |
89 | UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC", false); |
|
Line 108... | Line 108... | |||
108 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
108 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
|
109 | Scene scene = new SceneHelpers().SetupScene(); |
109 | Scene scene = new SceneHelpers().SetupScene(); |
|
110 | SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
110 | SceneHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
|
Line 111... | Line 111... | |||
111 | |
111 | |
|
112 | UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password"); |
112 | UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password"); |
|
Line 113... | Line 113... | |||
113 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream); |
113 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", m_iarStream); |
|
114 | |
114 | |
|
115 | InventoryItemBase foundItem1 |
115 | InventoryItemBase foundItem1 |
|
Line 125... | Line 125... | |||
125 | TestHelpers.InMethod(); |
125 | TestHelpers.InMethod(); |
|
126 | // log4net.Config.XmlConfigurator.Configure(); |
126 | // log4net.Config.XmlConfigurator.Configure(); |
|
Line 127... | Line 127... | |||
127 | |
127 | |
|
128 | string itemName = "You & you are a mean/man/"; |
128 | string itemName = "You & you are a mean/man/"; |
|
129 | string humanEscapedItemName = @"You & you are a mean\/man\/"; |
- | ||
Line 130... | Line 129... | |||
130 | string userPassword = "meowfood"; |
129 | string humanEscapedItemName = @"You & you are a mean\/man\/"; |
|
Line 131... | Line 130... | |||
131 | |
130 | |
|
132 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
131 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
|
Line 178... | Line 177... | |||
178 | MemoryStream archiveWriteStream = new MemoryStream(); |
177 | MemoryStream archiveWriteStream = new MemoryStream(); |
|
179 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
178 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
|
Line 180... | Line 179... | |||
180 | |
179 | |
|
181 | mre.Reset(); |
180 | mre.Reset(); |
|
182 | archiverModule.ArchiveInventory( |
181 | archiverModule.ArchiveInventory( |
|
183 | Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream); |
182 | Guid.NewGuid(), userFirstName, userLastName, "Objects", archiveWriteStream); |
|
Line 184... | Line 183... | |||
184 | mre.WaitOne(60000, false); |
183 | mre.WaitOne(60000, false); |
|
185 | |
184 | |
|
Line 186... | Line 185... | |||
186 | // LOAD ITEM |
185 | // LOAD ITEM |
|
Line 187... | Line 186... | |||
187 | MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
186 | MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); |
|
188 | |
187 | |
|
189 | archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream); |
188 | archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", archiveReadStream); |