diff options
Diffstat (limited to 'OpenSim/Data/Tests/InventoryTests.cs')
-rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index 3edf89d..da6e7d4 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs | |||
@@ -44,14 +44,9 @@ using OpenSim.Data.SQLite; | |||
44 | 44 | ||
45 | namespace OpenSim.Data.Tests | 45 | namespace OpenSim.Data.Tests |
46 | { | 46 | { |
47 | [TestFixture(Description = "Inventory store tests (SQLite)")] | ||
48 | public class SQLiteInventoryTests : InventoryTests<SqliteConnection, SQLiteInventoryStore> | ||
49 | { | ||
50 | } | ||
51 | |||
52 | [TestFixture(Description = "Inventory store tests (MySQL)")] | 47 | [TestFixture(Description = "Inventory store tests (MySQL)")] |
53 | public class MySqlInventoryTests : InventoryTests<MySqlConnection, MySQLInventoryData> | 48 | public class MySqlInventoryTests : InventoryTests<MySqlConnection, MySQLInventoryData> |
54 | { | 49 | { |
55 | } | 50 | } |
56 | 51 | ||
57 | public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore> | 52 | public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore> |
@@ -107,7 +102,7 @@ namespace OpenSim.Data.Tests | |||
107 | public void T001_LoadEmpty() | 102 | public void T001_LoadEmpty() |
108 | { | 103 | { |
109 | TestHelpers.InMethod(); | 104 | TestHelpers.InMethod(); |
110 | 105 | ||
111 | Assert.That(db.getInventoryFolder(zero), Is.Null); | 106 | Assert.That(db.getInventoryFolder(zero), Is.Null); |
112 | Assert.That(db.getInventoryFolder(folder1), Is.Null); | 107 | Assert.That(db.getInventoryFolder(folder1), Is.Null); |
113 | Assert.That(db.getInventoryFolder(folder2), Is.Null); | 108 | Assert.That(db.getInventoryFolder(folder2), Is.Null); |
@@ -127,7 +122,7 @@ namespace OpenSim.Data.Tests | |||
127 | public void T010_FolderNonParent() | 122 | public void T010_FolderNonParent() |
128 | { | 123 | { |
129 | TestHelpers.InMethod(); | 124 | TestHelpers.InMethod(); |
130 | 125 | ||
131 | InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2); | 126 | InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2); |
132 | // the folder will go in | 127 | // the folder will go in |
133 | db.addInventoryFolder(f1); | 128 | db.addInventoryFolder(f1); |
@@ -139,7 +134,7 @@ namespace OpenSim.Data.Tests | |||
139 | public void T011_FolderCreate() | 134 | public void T011_FolderCreate() |
140 | { | 135 | { |
141 | TestHelpers.InMethod(); | 136 | TestHelpers.InMethod(); |
142 | 137 | ||
143 | InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1); | 138 | InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1); |
144 | // TODO: this is probably wrong behavior, but is what we have | 139 | // TODO: this is probably wrong behavior, but is what we have |
145 | // db.updateInventoryFolder(f1); | 140 | // db.updateInventoryFolder(f1); |
@@ -164,7 +159,7 @@ namespace OpenSim.Data.Tests | |||
164 | public void T012_FolderList() | 159 | public void T012_FolderList() |
165 | { | 160 | { |
166 | TestHelpers.InMethod(); | 161 | TestHelpers.InMethod(); |
167 | 162 | ||
168 | InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3); | 163 | InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3); |
169 | db.addInventoryFolder(f2); | 164 | db.addInventoryFolder(f2); |
170 | 165 | ||
@@ -180,7 +175,7 @@ namespace OpenSim.Data.Tests | |||
180 | public void T013_FolderHierarchy() | 175 | public void T013_FolderHierarchy() |
181 | { | 176 | { |
182 | TestHelpers.InMethod(); | 177 | TestHelpers.InMethod(); |
183 | 178 | ||
184 | int n = db.getFolderHierarchy(zero).Count; // (for dbg - easier to see what's returned) | 179 | int n = db.getFolderHierarchy(zero).Count; // (for dbg - easier to see what's returned) |
185 | Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); | 180 | Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); |
186 | n = db.getFolderHierarchy(folder1).Count; | 181 | n = db.getFolderHierarchy(folder1).Count; |
@@ -195,7 +190,7 @@ namespace OpenSim.Data.Tests | |||
195 | public void T014_MoveFolder() | 190 | public void T014_MoveFolder() |
196 | { | 191 | { |
197 | TestHelpers.InMethod(); | 192 | TestHelpers.InMethod(); |
198 | 193 | ||
199 | InventoryFolderBase f2 = db.getInventoryFolder(folder2); | 194 | InventoryFolderBase f2 = db.getInventoryFolder(folder2); |
200 | f2.ParentID = folder3; | 195 | f2.ParentID = folder3; |
201 | db.moveInventoryFolder(f2); | 196 | db.moveInventoryFolder(f2); |
@@ -211,7 +206,7 @@ namespace OpenSim.Data.Tests | |||
211 | public void T015_FolderHierarchy() | 206 | public void T015_FolderHierarchy() |
212 | { | 207 | { |
213 | TestHelpers.InMethod(); | 208 | TestHelpers.InMethod(); |
214 | 209 | ||
215 | Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); | 210 | Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); |
216 | Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))"); | 211 | Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))"); |
217 | Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))"); | 212 | Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))"); |
@@ -224,7 +219,7 @@ namespace OpenSim.Data.Tests | |||
224 | public void T100_NoItems() | 219 | public void T100_NoItems() |
225 | { | 220 | { |
226 | TestHelpers.InMethod(); | 221 | TestHelpers.InMethod(); |
227 | 222 | ||
228 | Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))"); | 223 | Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))"); |
229 | Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))"); | 224 | Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))"); |
230 | Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))"); | 225 | Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))"); |
@@ -238,7 +233,7 @@ namespace OpenSim.Data.Tests | |||
238 | public void T101_CreatItems() | 233 | public void T101_CreatItems() |
239 | { | 234 | { |
240 | TestHelpers.InMethod(); | 235 | TestHelpers.InMethod(); |
241 | 236 | ||
242 | db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1)); | 237 | db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1)); |
243 | db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2)); | 238 | db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2)); |
244 | db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3)); | 239 | db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3)); |
@@ -249,7 +244,7 @@ namespace OpenSim.Data.Tests | |||
249 | public void T102_CompareItems() | 244 | public void T102_CompareItems() |
250 | { | 245 | { |
251 | TestHelpers.InMethod(); | 246 | TestHelpers.InMethod(); |
252 | 247 | ||
253 | InventoryItemBase i1 = db.getInventoryItem(item1); | 248 | InventoryItemBase i1 = db.getInventoryItem(item1); |
254 | InventoryItemBase i2 = db.getInventoryItem(item2); | 249 | InventoryItemBase i2 = db.getInventoryItem(item2); |
255 | InventoryItemBase i3 = db.getInventoryItem(item3); | 250 | InventoryItemBase i3 = db.getInventoryItem(item3); |
@@ -268,7 +263,7 @@ namespace OpenSim.Data.Tests | |||
268 | public void T103_UpdateItem() | 263 | public void T103_UpdateItem() |
269 | { | 264 | { |
270 | TestHelpers.InMethod(); | 265 | TestHelpers.InMethod(); |
271 | 266 | ||
272 | // TODO: probably shouldn't have the ability to have an | 267 | // TODO: probably shouldn't have the ability to have an |
273 | // owner of an item in a folder not owned by the user | 268 | // owner of an item in a folder not owned by the user |
274 | 269 | ||
@@ -288,7 +283,7 @@ namespace OpenSim.Data.Tests | |||
288 | public void T104_RandomUpdateItem() | 283 | public void T104_RandomUpdateItem() |
289 | { | 284 | { |
290 | TestHelpers.InMethod(); | 285 | TestHelpers.InMethod(); |
291 | 286 | ||
292 | PropertyScrambler<InventoryFolderBase> folderScrambler = | 287 | PropertyScrambler<InventoryFolderBase> folderScrambler = |
293 | new PropertyScrambler<InventoryFolderBase>() | 288 | new PropertyScrambler<InventoryFolderBase>() |
294 | .DontScramble(x => x.Owner) | 289 | .DontScramble(x => x.Owner) |
@@ -347,7 +342,7 @@ namespace OpenSim.Data.Tests | |||
347 | public void T999_StillNull() | 342 | public void T999_StillNull() |
348 | { | 343 | { |
349 | TestHelpers.InMethod(); | 344 | TestHelpers.InMethod(); |
350 | 345 | ||
351 | // After all tests are run, these should still return no results | 346 | // After all tests are run, these should still return no results |
352 | Assert.That(db.getInventoryFolder(zero), Is.Null); | 347 | Assert.That(db.getInventoryFolder(zero), Is.Null); |
353 | Assert.That(db.getInventoryItem(zero), Is.Null); | 348 | Assert.That(db.getInventoryItem(zero), Is.Null); |