aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests/InventoryTests.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/Tests/InventoryTests.cs')
-rw-r--r--OpenSim/Data/Tests/InventoryTests.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index cf3bac1..5b6b61b 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Data.Tests
114 [Test] 114 [Test]
115 public void T001_LoadEmpty() 115 public void T001_LoadEmpty()
116 { 116 {
117 TestHelper.InMethod(); 117 TestHelpers.InMethod();
118 118
119 Assert.That(db.getInventoryFolder(zero), Is.Null); 119 Assert.That(db.getInventoryFolder(zero), Is.Null);
120 Assert.That(db.getInventoryFolder(folder1), Is.Null); 120 Assert.That(db.getInventoryFolder(folder1), Is.Null);
@@ -134,7 +134,7 @@ namespace OpenSim.Data.Tests
134 [Test] 134 [Test]
135 public void T010_FolderNonParent() 135 public void T010_FolderNonParent()
136 { 136 {
137 TestHelper.InMethod(); 137 TestHelpers.InMethod();
138 138
139 InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2); 139 InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2);
140 // the folder will go in 140 // the folder will go in
@@ -146,7 +146,7 @@ namespace OpenSim.Data.Tests
146 [Test] 146 [Test]
147 public void T011_FolderCreate() 147 public void T011_FolderCreate()
148 { 148 {
149 TestHelper.InMethod(); 149 TestHelpers.InMethod();
150 150
151 InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1); 151 InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1);
152 // TODO: this is probably wrong behavior, but is what we have 152 // TODO: this is probably wrong behavior, but is what we have
@@ -171,7 +171,7 @@ namespace OpenSim.Data.Tests
171 [Test] 171 [Test]
172 public void T012_FolderList() 172 public void T012_FolderList()
173 { 173 {
174 TestHelper.InMethod(); 174 TestHelpers.InMethod();
175 175
176 InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3); 176 InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
177 db.addInventoryFolder(f2); 177 db.addInventoryFolder(f2);
@@ -187,7 +187,7 @@ namespace OpenSim.Data.Tests
187 [Test] 187 [Test]
188 public void T013_FolderHierarchy() 188 public void T013_FolderHierarchy()
189 { 189 {
190 TestHelper.InMethod(); 190 TestHelpers.InMethod();
191 191
192 int n = db.getFolderHierarchy(zero).Count; // (for dbg - easier to see what's returned) 192 int n = db.getFolderHierarchy(zero).Count; // (for dbg - easier to see what's returned)
193 Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); 193 Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
@@ -202,7 +202,7 @@ namespace OpenSim.Data.Tests
202 [Test] 202 [Test]
203 public void T014_MoveFolder() 203 public void T014_MoveFolder()
204 { 204 {
205 TestHelper.InMethod(); 205 TestHelpers.InMethod();
206 206
207 InventoryFolderBase f2 = db.getInventoryFolder(folder2); 207 InventoryFolderBase f2 = db.getInventoryFolder(folder2);
208 f2.ParentID = folder3; 208 f2.ParentID = folder3;
@@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
218 [Test] 218 [Test]
219 public void T015_FolderHierarchy() 219 public void T015_FolderHierarchy()
220 { 220 {
221 TestHelper.InMethod(); 221 TestHelpers.InMethod();
222 222
223 Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); 223 Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
224 Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))"); 224 Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
@@ -231,7 +231,7 @@ namespace OpenSim.Data.Tests
231 [Test] 231 [Test]
232 public void T100_NoItems() 232 public void T100_NoItems()
233 { 233 {
234 TestHelper.InMethod(); 234 TestHelpers.InMethod();
235 235
236 Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))"); 236 Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
237 Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))"); 237 Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
@@ -245,7 +245,7 @@ namespace OpenSim.Data.Tests
245 [Test] 245 [Test]
246 public void T101_CreatItems() 246 public void T101_CreatItems()
247 { 247 {
248 TestHelper.InMethod(); 248 TestHelpers.InMethod();
249 249
250 db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1)); 250 db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
251 db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2)); 251 db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
@@ -256,7 +256,7 @@ namespace OpenSim.Data.Tests
256 [Test] 256 [Test]
257 public void T102_CompareItems() 257 public void T102_CompareItems()
258 { 258 {
259 TestHelper.InMethod(); 259 TestHelpers.InMethod();
260 260
261 InventoryItemBase i1 = db.getInventoryItem(item1); 261 InventoryItemBase i1 = db.getInventoryItem(item1);
262 InventoryItemBase i2 = db.getInventoryItem(item2); 262 InventoryItemBase i2 = db.getInventoryItem(item2);
@@ -275,7 +275,7 @@ namespace OpenSim.Data.Tests
275 [Test] 275 [Test]
276 public void T103_UpdateItem() 276 public void T103_UpdateItem()
277 { 277 {
278 TestHelper.InMethod(); 278 TestHelpers.InMethod();
279 279
280 // TODO: probably shouldn't have the ability to have an 280 // TODO: probably shouldn't have the ability to have an
281 // owner of an item in a folder not owned by the user 281 // owner of an item in a folder not owned by the user
@@ -295,7 +295,7 @@ namespace OpenSim.Data.Tests
295 [Test] 295 [Test]
296 public void T104_RandomUpdateItem() 296 public void T104_RandomUpdateItem()
297 { 297 {
298 TestHelper.InMethod(); 298 TestHelpers.InMethod();
299 299
300 PropertyScrambler<InventoryFolderBase> folderScrambler = 300 PropertyScrambler<InventoryFolderBase> folderScrambler =
301 new PropertyScrambler<InventoryFolderBase>() 301 new PropertyScrambler<InventoryFolderBase>()
@@ -354,7 +354,7 @@ namespace OpenSim.Data.Tests
354 [Test] 354 [Test]
355 public void T999_StillNull() 355 public void T999_StillNull()
356 { 356 {
357 TestHelper.InMethod(); 357 TestHelpers.InMethod();
358 358
359 // After all tests are run, these should still return no results 359 // After all tests are run, these should still return no results
360 Assert.That(db.getInventoryFolder(zero), Is.Null); 360 Assert.That(db.getInventoryFolder(zero), Is.Null);