diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index cb613f7..5cc0340 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -124,15 +124,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
124 | MemoryStream archiveReadStream = new MemoryStream(archive); | 124 | MemoryStream archiveReadStream = new MemoryStream(archive); |
125 | TarArchiveReader tar = new TarArchiveReader(archiveReadStream); | 125 | TarArchiveReader tar = new TarArchiveReader(archiveReadStream); |
126 | 126 | ||
127 | InventoryFolderImpl objectsFolder = userInfo.RootFolder.FindFolderByPath("Objects"); | ||
128 | |||
127 | //bool gotControlFile = false; | 129 | //bool gotControlFile = false; |
128 | bool gotObject1File = false; | 130 | bool gotObject1File = false; |
129 | //bool gotObject2File = false; | 131 | //bool gotObject2File = false; |
130 | string expectedObject1FilePath = string.Format( | 132 | string expectedObject1FilePath = string.Format( |
131 | "{0}{1}{2}_{3}.xml", | 133 | "{0}{1}/{2}_{3}.xml", |
132 | InventoryArchiveConstants.INVENTORY_PATH, | 134 | InventoryArchiveConstants.INVENTORY_PATH, |
133 | "Objects/", | 135 | string.Format( |
136 | "Objects{0}{1}", InventoryArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID), | ||
134 | item1.Name, | 137 | item1.Name, |
135 | item1Id); | 138 | item1Id); |
139 | |||
136 | /* | 140 | /* |
137 | string expectedObject2FileName = string.Format( | 141 | string expectedObject2FileName = string.Format( |
138 | "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", | 142 | "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", |
@@ -146,6 +150,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
146 | 150 | ||
147 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) | 151 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) |
148 | { | 152 | { |
153 | Console.WriteLine("Got {0}", filePath); | ||
154 | |||
149 | /* | 155 | /* |
150 | if (ArchiveConstants.CONTROL_FILE_PATH == filePath) | 156 | if (ArchiveConstants.CONTROL_FILE_PATH == filePath) |
151 | { | 157 | { |
@@ -153,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
153 | } | 159 | } |
154 | */ | 160 | */ |
155 | if (filePath.StartsWith(InventoryArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) | 161 | if (filePath.StartsWith(InventoryArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) |
156 | { | 162 | { |
157 | //string fileName = filePath.Remove(0, "Objects/".Length); | 163 | //string fileName = filePath.Remove(0, "Objects/".Length); |
158 | 164 | ||
159 | //if (fileName.StartsWith(part1.Name)) | 165 | //if (fileName.StartsWith(part1.Name)) |