diff options
author | Mike Mazur | 2009-03-12 06:04:17 +0000 |
---|---|---|
committer | Mike Mazur | 2009-03-12 06:04:17 +0000 |
commit | 7b2977d625d46718fe39051c778c477022153cc1 (patch) | |
tree | 58c39648c77751cf2b728e0a784e244e7e043735 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests | |
parent | Moving TarArchive to OpenSim.Framework.Archive (diff) | |
download | opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.zip opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.tar.gz opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.tar.bz2 opensim-SC_OLD-7b2977d625d46718fe39051c778c477022153cc1.tar.xz |
Move ArchiveConstants to OpenSim.Framework.Archive
- move a couple constants from InventoryArchiveConstants to
ArchiveConstants, now only one of these is needed
- change InventoryArchiveConstants references to ArchiveConstants
- remove InventoryArchive AssetInventoryServer plugin dependency on
OpenSim.Region.CodeModules
- trim trailing whitespace
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index ef7f93f..ea72f08 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -53,31 +53,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
53 | lock (this) | 53 | lock (this) |
54 | { | 54 | { |
55 | Monitor.PulseAll(this); | 55 | Monitor.PulseAll(this); |
56 | } | 56 | } |
57 | } | 57 | } |
58 | 58 | ||
59 | /// <summary> | 59 | /// <summary> |
60 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). | 60 | /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). |
61 | /// </summary> | 61 | /// </summary> |
62 | [Test] | 62 | [Test] |
63 | public void TestSaveIarV0p1() | 63 | public void TestSaveIarV0p1() |
64 | { | 64 | { |
65 | //log4net.Config.XmlConfigurator.Configure(); | 65 | //log4net.Config.XmlConfigurator.Configure(); |
66 | 66 | ||
67 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); | 67 | InventoryArchiverModule archiverModule = new InventoryArchiverModule(); |
68 | 68 | ||
69 | Scene scene = SceneSetupHelpers.SetupScene(); | 69 | Scene scene = SceneSetupHelpers.SetupScene(); |
70 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 70 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
71 | CommunicationsManager cm = scene.CommsManager; | 71 | CommunicationsManager cm = scene.CommsManager; |
72 | 72 | ||
73 | // Create user | 73 | // Create user |
74 | string userFirstName = "Jock"; | 74 | string userFirstName = "Jock"; |
75 | string userLastName = "Stirrup"; | 75 | string userLastName = "Stirrup"; |
76 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); | 76 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); |
77 | cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId); | 77 | cm.UserAdminService.AddUser(userFirstName, userLastName, string.Empty, string.Empty, 1000, 1000, userId); |
78 | CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId); | 78 | CachedUserInfo userInfo = cm.UserProfileCacheService.GetUserDetails(userId); |
79 | userInfo.FetchInventory(); | 79 | userInfo.FetchInventory(); |
80 | 80 | ||
81 | // Create asset | 81 | // Create asset |
82 | SceneObjectGroup object1; | 82 | SceneObjectGroup object1; |
83 | SceneObjectPart part1; | 83 | SceneObjectPart part1; |
@@ -88,81 +88,81 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
88 | Vector3 groupPosition = new Vector3(10, 20, 30); | 88 | Vector3 groupPosition = new Vector3(10, 20, 30); |
89 | Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); | 89 | Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); |
90 | Vector3 offsetPosition = new Vector3(5, 10, 15); | 90 | Vector3 offsetPosition = new Vector3(5, 10, 15); |
91 | 91 | ||
92 | part1 | 92 | part1 |
93 | = new SceneObjectPart( | 93 | = new SceneObjectPart( |
94 | ownerId, shape, groupPosition, rotationOffset, offsetPosition); | 94 | ownerId, shape, groupPosition, rotationOffset, offsetPosition); |
95 | part1.Name = partName; | 95 | part1.Name = partName; |
96 | 96 | ||
97 | object1 = new SceneObjectGroup(part1); | 97 | object1 = new SceneObjectGroup(part1); |
98 | } | 98 | } |
99 | 99 | ||
100 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); | 100 | UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); |
101 | AssetBase asset1 = new AssetBase(); | 101 | AssetBase asset1 = new AssetBase(); |
102 | asset1.FullID = asset1Id; | 102 | asset1.FullID = asset1Id; |
103 | asset1.Data = Encoding.ASCII.GetBytes(object1.ToXmlString2()); | 103 | asset1.Data = Encoding.ASCII.GetBytes(object1.ToXmlString2()); |
104 | cm.AssetCache.AddAsset(asset1); | 104 | cm.AssetCache.AddAsset(asset1); |
105 | 105 | ||
106 | // Create item | 106 | // Create item |
107 | UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080"); | 107 | UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080"); |
108 | InventoryItemBase item1 = new InventoryItemBase(); | 108 | InventoryItemBase item1 = new InventoryItemBase(); |
109 | item1.Name = "My Little Dog"; | 109 | item1.Name = "My Little Dog"; |
110 | item1.AssetID = asset1.FullID; | 110 | item1.AssetID = asset1.FullID; |
111 | item1.ID = item1Id; | 111 | item1.ID = item1Id; |
112 | item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID; | 112 | item1.Folder = userInfo.RootFolder.FindFolderByPath("Objects").ID; |
113 | scene.AddInventoryItem(userId, item1); | 113 | scene.AddInventoryItem(userId, item1); |
114 | 114 | ||
115 | MemoryStream archiveWriteStream = new MemoryStream(); | 115 | MemoryStream archiveWriteStream = new MemoryStream(); |
116 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 116 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
117 | 117 | ||
118 | lock (this) | 118 | lock (this) |
119 | { | 119 | { |
120 | archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); | 120 | archiverModule.ArchiveInventory(userFirstName, userLastName, "Objects", archiveWriteStream); |
121 | Monitor.Wait(this, 60000); | 121 | Monitor.Wait(this, 60000); |
122 | } | 122 | } |
123 | 123 | ||
124 | byte[] archive = archiveWriteStream.ToArray(); | 124 | byte[] archive = archiveWriteStream.ToArray(); |
125 | MemoryStream archiveReadStream = new MemoryStream(archive); | 125 | MemoryStream archiveReadStream = new MemoryStream(archive); |
126 | TarArchiveReader tar = new TarArchiveReader(archiveReadStream); | 126 | TarArchiveReader tar = new TarArchiveReader(archiveReadStream); |
127 | 127 | ||
128 | InventoryFolderImpl objectsFolder = userInfo.RootFolder.FindFolderByPath("Objects"); | 128 | InventoryFolderImpl objectsFolder = userInfo.RootFolder.FindFolderByPath("Objects"); |
129 | 129 | ||
130 | //bool gotControlFile = false; | 130 | //bool gotControlFile = false; |
131 | bool gotObject1File = false; | 131 | bool gotObject1File = false; |
132 | //bool gotObject2File = false; | 132 | //bool gotObject2File = false; |
133 | string expectedObject1FilePath = string.Format( | 133 | string expectedObject1FilePath = string.Format( |
134 | "{0}{1}/{2}_{3}.xml", | 134 | "{0}{1}/{2}_{3}.xml", |
135 | InventoryArchiveConstants.INVENTORY_PATH, | 135 | ArchiveConstants.INVENTORY_PATH, |
136 | string.Format( | 136 | string.Format( |
137 | "Objects{0}{1}", InventoryArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID), | 137 | "Objects{0}{1}", ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, objectsFolder.ID), |
138 | item1.Name, | 138 | item1.Name, |
139 | item1Id); | 139 | item1Id); |
140 | 140 | ||
141 | /* | 141 | /* |
142 | string expectedObject2FileName = string.Format( | 142 | string expectedObject2FileName = string.Format( |
143 | "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", | 143 | "{0}_{1:000}-{2:000}-{3:000}__{4}.xml", |
144 | part2.Name, | 144 | part2.Name, |
145 | Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z), | 145 | Math.Round(part2.GroupPosition.X), Math.Round(part2.GroupPosition.Y), Math.Round(part2.GroupPosition.Z), |
146 | part2.UUID); | 146 | part2.UUID); |
147 | */ | 147 | */ |
148 | 148 | ||
149 | string filePath; | 149 | string filePath; |
150 | TarArchiveReader.TarEntryType tarEntryType; | 150 | TarArchiveReader.TarEntryType tarEntryType; |
151 | 151 | ||
152 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) | 152 | while (tar.ReadEntry(out filePath, out tarEntryType) != null) |
153 | { | 153 | { |
154 | Console.WriteLine("Got {0}", filePath); | 154 | Console.WriteLine("Got {0}", filePath); |
155 | 155 | ||
156 | /* | 156 | /* |
157 | if (ArchiveConstants.CONTROL_FILE_PATH == filePath) | 157 | if (ArchiveConstants.CONTROL_FILE_PATH == filePath) |
158 | { | 158 | { |
159 | gotControlFile = true; | 159 | gotControlFile = true; |
160 | } | 160 | } |
161 | */ | 161 | */ |
162 | if (filePath.StartsWith(InventoryArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) | 162 | if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml")) |
163 | { | 163 | { |
164 | //string fileName = filePath.Remove(0, "Objects/".Length); | 164 | //string fileName = filePath.Remove(0, "Objects/".Length); |
165 | 165 | ||
166 | //if (fileName.StartsWith(part1.Name)) | 166 | //if (fileName.StartsWith(part1.Name)) |
167 | //{ | 167 | //{ |
168 | Assert.That(filePath, Is.EqualTo(expectedObject1FilePath)); | 168 | Assert.That(filePath, Is.EqualTo(expectedObject1FilePath)); |
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
171 | //else if (fileName.StartsWith(part2.Name)) | 171 | //else if (fileName.StartsWith(part2.Name)) |
172 | //{ | 172 | //{ |
173 | // Assert.That(fileName, Is.EqualTo(expectedObject2FileName)); | 173 | // Assert.That(fileName, Is.EqualTo(expectedObject2FileName)); |
174 | // gotObject2File = true; | 174 | // gotObject2File = true; |
175 | //} | 175 | //} |
176 | } | 176 | } |
177 | } | 177 | } |
@@ -179,8 +179,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
179 | //Assert.That(gotControlFile, Is.True, "No control file in archive"); | 179 | //Assert.That(gotControlFile, Is.True, "No control file in archive"); |
180 | Assert.That(gotObject1File, Is.True, "No item1 file in archive"); | 180 | Assert.That(gotObject1File, Is.True, "No item1 file in archive"); |
181 | //Assert.That(gotObject2File, Is.True, "No object2 file in archive"); | 181 | //Assert.That(gotObject2File, Is.True, "No object2 file in archive"); |
182 | 182 | ||
183 | // TODO: Test presence of more files and contents of files. | 183 | // TODO: Test presence of more files and contents of files. |
184 | } | 184 | } |
185 | } | 185 | } |
186 | } | 186 | } |