diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs index 7265405..bd112b4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs | |||
@@ -50,19 +50,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
50 | { | 50 | { |
51 | protected TestScene m_scene; | 51 | protected TestScene m_scene; |
52 | protected InventoryArchiverModule m_archiverModule; | 52 | protected InventoryArchiverModule m_archiverModule; |
53 | 53 | ||
54 | [SetUp] | 54 | [SetUp] |
55 | public override void SetUp() | 55 | public override void SetUp() |
56 | { | 56 | { |
57 | base.SetUp(); | 57 | base.SetUp(); |
58 | 58 | ||
59 | SerialiserModule serialiserModule = new SerialiserModule(); | 59 | SerialiserModule serialiserModule = new SerialiserModule(); |
60 | m_archiverModule = new InventoryArchiverModule(); | 60 | m_archiverModule = new InventoryArchiverModule(); |
61 | 61 | ||
62 | m_scene = new SceneHelpers().SetupScene(); | 62 | m_scene = new SceneHelpers().SetupScene(); |
63 | SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule); | 63 | SceneHelpers.SetupSceneModules(m_scene, serialiserModule, m_archiverModule); |
64 | } | 64 | } |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Test that the IAR has the required files in the right order. | 67 | /// Test that the IAR has the required files in the right order. |
68 | /// </summary> | 68 | /// </summary> |
@@ -73,20 +73,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
73 | public void TestOrder() | 73 | public void TestOrder() |
74 | { | 74 | { |
75 | TestHelpers.InMethod(); | 75 | TestHelpers.InMethod(); |
76 | // log4net.Config.XmlConfigurator.Configure(); | 76 | // log4net.Config.XmlConfigurator.Configure(); |
77 | 77 | ||
78 | MemoryStream archiveReadStream = new MemoryStream(m_iarStreamBytes); | 78 | MemoryStream archiveReadStream = new MemoryStream(m_iarStreamBytes); |
79 | TarArchiveReader tar = new TarArchiveReader(archiveReadStream); | 79 | TarArchiveReader tar = new TarArchiveReader(archiveReadStream); |
80 | string filePath; | 80 | string filePath; |
81 | TarArchiveReader.TarEntryType tarEntryType; | 81 | TarArchiveReader.TarEntryType tarEntryType; |
82 | 82 | ||
83 | byte[] data = tar.ReadEntry(out filePath, out tarEntryType); | 83 | byte[] data = tar.ReadEntry(out filePath, out tarEntryType); |
84 | Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH)); | 84 | Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH)); |
85 | 85 | ||
86 | InventoryArchiveReadRequest iarr | 86 | InventoryArchiveReadRequest iarr |
87 | = new InventoryArchiveReadRequest(UUID.Random(), null, null, null, null, null, null, (Stream)null, false); | 87 | = new InventoryArchiveReadRequest(UUID.Random(), null, null, null, null, null, null, (Stream)null, false); |
88 | iarr.LoadControlFile(filePath, data); | 88 | iarr.LoadControlFile(filePath, data); |
89 | 89 | ||
90 | Assert.That(iarr.ControlFileLoaded, Is.True); | 90 | Assert.That(iarr.ControlFileLoaded, Is.True); |
91 | } | 91 | } |
92 | 92 | ||
@@ -119,22 +119,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
119 | // InventoryArchiveUtils. | 119 | // InventoryArchiveUtils. |
120 | bool gotObjectsFolder = false; | 120 | bool gotObjectsFolder = false; |
121 | 121 | ||
122 | string objectsFolderName | 122 | string objectsFolderName |
123 | = string.Format( | 123 | = string.Format( |
124 | "{0}{1}", | 124 | "{0}{1}", |
125 | ArchiveConstants.INVENTORY_PATH, | 125 | ArchiveConstants.INVENTORY_PATH, |
126 | InventoryArchiveWriteRequest.CreateArchiveFolderName( | 126 | InventoryArchiveWriteRequest.CreateArchiveFolderName( |
127 | UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, userId, "Objects"))); | 127 | UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, userId, "Objects"))); |
128 | 128 | ||
129 | string filePath; | 129 | string filePath; |
130 | TarArchiveReader.TarEntryType tarEntryType; | 130 | TarArchiveReader.TarEntryType tarEntryType; |
131 | 131 | ||
132 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) | 132 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) |
133 | { | 133 | { |
134 | // Console.WriteLine("Got {0}", filePath); | 134 | // Console.WriteLine("Got {0}", filePath); |
135 | 135 | ||
136 | // Lazily, we only bother to look for the system objects folder created when we call CreateUserWithInventory() | 136 | // Lazily, we only bother to look for the system objects folder created when we call CreateUserWithInventory() |
137 | // XXX: But really we need to stop all that stuff being created in tests or check for such folders | 137 | // XXX: But really we need to stop all that stuff being created in tests or check for such folders |
138 | // more thoroughly | 138 | // more thoroughly |
139 | if (filePath == objectsFolderName) | 139 | if (filePath == objectsFolderName) |
140 | gotObjectsFolder = true; | 140 | gotObjectsFolder = true; |
@@ -157,19 +157,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
157 | UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword); | 157 | UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword); |
158 | 158 | ||
159 | // Create base folder | 159 | // Create base folder |
160 | InventoryFolderBase f1 | 160 | InventoryFolderBase f1 |
161 | = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1", true); | 161 | = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1", true); |
162 | 162 | ||
163 | // Create item1 | 163 | // Create item1 |
164 | SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Dog Object", 0x5); | 164 | SceneObjectGroup so1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Dog Object", 0x5); |
165 | InventoryItemBase i1 = UserInventoryHelpers.AddInventoryItem(m_scene, so1, 0x50, 0x60, "f1"); | 165 | InventoryItemBase i1 = UserInventoryHelpers.AddInventoryItem(m_scene, so1, 0x50, 0x60, "f1"); |
166 | 166 | ||
167 | // Create embedded folder | 167 | // Create embedded folder |
168 | InventoryFolderBase f1_1 | 168 | InventoryFolderBase f1_1 |
169 | = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1/f1.1", true); | 169 | = UserInventoryHelpers.CreateInventoryFolder(m_scene.InventoryService, userId, "f1/f1.1", true); |
170 | 170 | ||
171 | // Create embedded item | 171 | // Create embedded item |
172 | SceneObjectGroup so1_1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Cat Object", 0x6); | 172 | SceneObjectGroup so1_1 = SceneHelpers.CreateSceneObject(1, userId, "My Little Cat Object", 0x6); |
173 | InventoryItemBase i2 = UserInventoryHelpers.AddInventoryItem(m_scene, so1_1, 0x500, 0x600, "f1/f1.1"); | 173 | InventoryItemBase i2 = UserInventoryHelpers.AddInventoryItem(m_scene, so1_1, 0x500, 0x600, "f1/f1.1"); |
174 | 174 | ||
175 | MemoryStream archiveWriteStream = new MemoryStream(); | 175 | MemoryStream archiveWriteStream = new MemoryStream(); |
@@ -188,18 +188,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
188 | // InventoryArchiveUtils. | 188 | // InventoryArchiveUtils. |
189 | bool gotf1 = false, gotf1_1 = false, gotso1 = false, gotso2 = false; | 189 | bool gotf1 = false, gotf1_1 = false, gotso1 = false, gotso2 = false; |
190 | 190 | ||
191 | string f1FileName | 191 | string f1FileName |
192 | = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1)); | 192 | = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1)); |
193 | string f1_1FileName | 193 | string f1_1FileName |
194 | = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1_1)); | 194 | = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveFolderName(f1_1)); |
195 | string so1FileName | 195 | string so1FileName |
196 | = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i1)); | 196 | = string.Format("{0}{1}", f1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i1)); |
197 | string so2FileName | 197 | string so2FileName |
198 | = string.Format("{0}{1}", f1_1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i2)); | 198 | = string.Format("{0}{1}", f1_1FileName, InventoryArchiveWriteRequest.CreateArchiveItemName(i2)); |
199 | 199 | ||
200 | string filePath; | 200 | string filePath; |
201 | TarArchiveReader.TarEntryType tarEntryType; | 201 | TarArchiveReader.TarEntryType tarEntryType; |
202 | 202 | ||
203 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) | 203 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) |
204 | { | 204 | { |
205 | // Console.WriteLine("Got {0}", filePath); | 205 | // Console.WriteLine("Got {0}", filePath); |
@@ -222,7 +222,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
222 | 222 | ||
223 | // TODO: Test presence of more files and contents of files. | 223 | // TODO: Test presence of more files and contents of files. |
224 | } | 224 | } |
225 | 225 | ||
226 | /// <summary> | 226 | /// <summary> |
227 | /// Test saving a single inventory item to an IAR | 227 | /// Test saving a single inventory item to an IAR |
228 | /// (subject to change since there is no fixed format yet). | 228 | /// (subject to change since there is no fixed format yet). |
@@ -239,10 +239,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
239 | string userPassword = "troll"; | 239 | string userPassword = "troll"; |
240 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); | 240 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); |
241 | UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword); | 241 | UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword); |
242 | 242 | ||
243 | // Create asset | 243 | // Create asset |
244 | UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040"); | 244 | UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040"); |
245 | SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50); | 245 | SceneObjectGroup object1 = SceneHelpers.CreateSceneObject(1, ownerId, "My Little Dog Object", 0x50); |
246 | 246 | ||
247 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); | 247 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); |
248 | AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1); | 248 | AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1); |
@@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
255 | item1.Name = item1Name; | 255 | item1.Name = item1Name; |
256 | item1.AssetID = asset1.FullID; | 256 | item1.AssetID = asset1.FullID; |
257 | item1.ID = item1Id; | 257 | item1.ID = item1Id; |
258 | InventoryFolderBase objsFolder | 258 | InventoryFolderBase objsFolder |
259 | = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, userId, "Objects")[0]; | 259 | = InventoryArchiveUtils.FindFoldersByPath(m_scene.InventoryService, userId, "Objects")[0]; |
260 | item1.Folder = objsFolder.ID; | 260 | item1.Folder = objsFolder.ID; |
261 | m_scene.AddInventoryItem(item1); | 261 | m_scene.AddInventoryItem(item1); |
@@ -285,7 +285,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
285 | TarArchiveReader.TarEntryType tarEntryType; | 285 | TarArchiveReader.TarEntryType tarEntryType; |
286 | 286 | ||
287 | // Console.WriteLine("Reading archive"); | 287 | // Console.WriteLine("Reading archive"); |
288 | 288 | ||
289 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) | 289 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) |
290 | { | 290 | { |
291 | Console.WriteLine("Got {0}", filePath); | 291 | Console.WriteLine("Got {0}", filePath); |
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
294 | // { | 294 | // { |
295 | // gotControlFile = true; | 295 | // gotControlFile = true; |
296 | // } | 296 | // } |
297 | 297 | ||
298 | if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) | 298 | if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) |
299 | { | 299 | { |
300 | // string fileName = filePath.Remove(0, "Objects/".Length); | 300 | // string fileName = filePath.Remove(0, "Objects/".Length); |