aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLMigration.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLXInventoryData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLAssetData.cs9
-rw-r--r--OpenSim/Data/Null/NullRegionData.cs2
-rw-r--r--OpenSim/Data/SQLite/Resources/XInventoryStore.migrations4
-rw-r--r--OpenSim/Data/Tests/AssetTests.cs6
-rw-r--r--OpenSim/Data/Tests/EstateTests.cs16
-rw-r--r--OpenSim/Data/Tests/InventoryTests.cs26
-rw-r--r--OpenSim/Data/Tests/RegionTests.cs40
9 files changed, 55 insertions, 52 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLMigration.cs b/OpenSim/Data/MSSQL/MSSQLMigration.cs
index 1aa96c7..c2fecef 100644
--- a/OpenSim/Data/MSSQL/MSSQLMigration.cs
+++ b/OpenSim/Data/MSSQL/MSSQLMigration.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Data.MSSQL
88 cmd.ExecuteNonQuery(); 88 cmd.ExecuteNonQuery();
89 } 89 }
90 } 90 }
91 catch (Exception ex) 91 catch (Exception)
92 { 92 {
93 throw new Exception(sql); 93 throw new Exception(sql);
94 94
diff --git a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
index 10b0f29..b19a0da 100644
--- a/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLXInventoryData.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Data.MSSQL
191 { 191 {
192 cmd.ExecuteNonQuery(); 192 cmd.ExecuteNonQuery();
193 } 193 }
194 catch (Exception e) 194 catch (Exception)
195 { 195 {
196 return false; 196 return false;
197 } 197 }
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index e740232..a743479 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -251,12 +251,14 @@ namespace OpenSim.Data.MySQL
251 } 251 }
252 252
253 /// <summary> 253 /// <summary>
254 /// check if the asset UUID exist in database 254 /// Check if the asset exists in the database
255 /// </summary> 255 /// </summary>
256 /// <param name="uuid">The asset UUID</param> 256 /// <param name="uuid">The asset UUID</param>
257 /// <returns>true if exist.</returns> 257 /// <returns>true if it exists, false otherwise.</returns>
258 override public bool ExistsAsset(UUID uuid) 258 override public bool ExistsAsset(UUID uuid)
259 { 259 {
260// m_log.DebugFormat("[ASSETS DB]: Checking for asset {0}", uuid);
261
260 bool assetExists = false; 262 bool assetExists = false;
261 263
262 lock (m_dbLock) 264 lock (m_dbLock)
@@ -273,7 +275,10 @@ namespace OpenSim.Data.MySQL
273 using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow)) 275 using (MySqlDataReader dbReader = cmd.ExecuteReader(CommandBehavior.SingleRow))
274 { 276 {
275 if (dbReader.Read()) 277 if (dbReader.Read())
278 {
279// m_log.DebugFormat("[ASSETS DB]: Found asset {0}", uuid);
276 assetExists = true; 280 assetExists = true;
281 }
277 } 282 }
278 } 283 }
279 catch (Exception e) 284 catch (Exception e)
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 53e5207..11013c1 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -97,7 +97,7 @@ namespace OpenSim.Data.Null
97 97
98 foreach (RegionData r in m_regionData.Values) 98 foreach (RegionData r in m_regionData.Values)
99 { 99 {
100 m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower()); 100// m_log.DebugFormat("[NULL REGION DATA]: comparing {0} to {1}", cleanName, r.RegionName.ToLower());
101 if (queryMatch(r.RegionName.ToLower())) 101 if (queryMatch(r.RegionName.ToLower()))
102 ret.Add(r); 102 ret.Add(r);
103 } 103 }
diff --git a/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations b/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations
index d5b3019..de44982 100644
--- a/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations
+++ b/OpenSim/Data/SQLite/Resources/XInventoryStore.migrations
@@ -41,11 +41,9 @@ COMMIT;
41 41
42:VERSION 2 42:VERSION 2
43 43
44ATTACH 'inventoryStore.db' AS old;
45
46BEGIN TRANSACTION; 44BEGIN TRANSACTION;
47 45
48INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders; 46INSERT INTO inventoryfolders (folderName, type, version, folderID, agentID, parentFolderID) SELECT `name` AS folderName, `type` AS type, `version` AS version, `UUID` AS folderID, `agentID` AS agentID, `parentID` AS parentFolderID from old.inventoryfolders;
49INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems; 47INSERT INTO inventoryitems (assetID, assetType, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions, salePrice, saleType, creationDate, groupID, groupOwned, flags, inventoryID, parentFolderID, avatarID, inventoryGroupPermissions) SELECT `assetID`, `assetType` AS assetType, `inventoryName` AS inventoryName, `inventoryDescription` AS inventoryDescription, `inventoryNextPermissions` AS inventoryNextPermissions, `inventoryCurrentPermissions` AS inventoryCurrentPermissions, `invType` AS invType, `creatorsID` AS creatorID, `inventoryBasePermissions` AS inventoryBasePermissions, `inventoryEveryOnePermissions` AS inventoryEveryOnePermissions, `salePrice` AS salePrice, `saleType` AS saleType, `creationDate` AS creationDate, `groupID` AS groupID, `groupOwned` AS groupOwned, `flags` AS flags, `UUID` AS inventoryID, `parentFolderID` AS parentFolderID, `avatarID` AS avatarID, `inventoryGroupPermissions` AS inventoryGroupPermissions FROM old.inventoryitems;
50 48
51COMMIT; \ No newline at end of file 49COMMIT;
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index b5ae244..1174e2f 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
106 [Test] 106 [Test]
107 public void T001_LoadEmpty() 107 public void T001_LoadEmpty()
108 { 108 {
109 TestHelper.InMethod(); 109 TestHelpers.InMethod();
110 110
111 Assert.That(m_db.ExistsAsset(uuid1), Is.False); 111 Assert.That(m_db.ExistsAsset(uuid1), Is.False);
112 Assert.That(m_db.ExistsAsset(uuid2), Is.False); 112 Assert.That(m_db.ExistsAsset(uuid2), Is.False);
@@ -116,7 +116,7 @@ namespace OpenSim.Data.Tests
116 [Test] 116 [Test]
117 public void T010_StoreReadVerifyAssets() 117 public void T010_StoreReadVerifyAssets()
118 { 118 {
119 TestHelper.InMethod(); 119 TestHelpers.InMethod();
120 120
121 AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString()); 121 AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString());
122 AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString()); 122 AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString());
@@ -183,7 +183,7 @@ namespace OpenSim.Data.Tests
183 [Test] 183 [Test]
184 public void T020_CheckForWeirdCreatorID() 184 public void T020_CheckForWeirdCreatorID()
185 { 185 {
186 TestHelper.InMethod(); 186 TestHelpers.InMethod();
187 187
188 // It is expected that eventually the CreatorID might be an arbitrary string (an URI) 188 // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
189 // rather than a valid UUID (?). This test is to make sure that the database layer does not 189 // rather than a valid UUID (?). This test is to make sure that the database layer does not
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index 8d332da..3e47bcf 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -107,7 +107,7 @@ namespace OpenSim.Data.Tests
107 [Test] 107 [Test]
108 public void T010_EstateSettingsSimpleStorage_MinimumParameterSet() 108 public void T010_EstateSettingsSimpleStorage_MinimumParameterSet()
109 { 109 {
110 TestHelper.InMethod(); 110 TestHelpers.InMethod();
111 111
112 EstateSettingsSimpleStorage( 112 EstateSettingsSimpleStorage(
113 REGION_ID, 113 REGION_ID,
@@ -140,7 +140,7 @@ namespace OpenSim.Data.Tests
140 [Test] 140 [Test]
141 public void T011_EstateSettingsSimpleStorage_MaximumParameterSet() 141 public void T011_EstateSettingsSimpleStorage_MaximumParameterSet()
142 { 142 {
143 TestHelper.InMethod(); 143 TestHelpers.InMethod();
144 144
145 EstateSettingsSimpleStorage( 145 EstateSettingsSimpleStorage(
146 REGION_ID, 146 REGION_ID,
@@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests
173 [Test] 173 [Test]
174 public void T012_EstateSettingsSimpleStorage_AccurateParameterSet() 174 public void T012_EstateSettingsSimpleStorage_AccurateParameterSet()
175 { 175 {
176 TestHelper.InMethod(); 176 TestHelpers.InMethod();
177 177
178 EstateSettingsSimpleStorage( 178 EstateSettingsSimpleStorage(
179 REGION_ID, 179 REGION_ID,
@@ -206,7 +206,7 @@ namespace OpenSim.Data.Tests
206 [Test] 206 [Test]
207 public void T012_EstateSettingsRandomStorage() 207 public void T012_EstateSettingsRandomStorage()
208 { 208 {
209 TestHelper.InMethod(); 209 TestHelpers.InMethod();
210 210
211 // Letting estate store generate rows to database for us 211 // Letting estate store generate rows to database for us
212 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); 212 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -227,7 +227,7 @@ namespace OpenSim.Data.Tests
227 [Test] 227 [Test]
228 public void T020_EstateSettingsManagerList() 228 public void T020_EstateSettingsManagerList()
229 { 229 {
230 TestHelper.InMethod(); 230 TestHelpers.InMethod();
231 231
232 // Letting estate store generate rows to database for us 232 // Letting estate store generate rows to database for us
233 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); 233 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -248,7 +248,7 @@ namespace OpenSim.Data.Tests
248 [Test] 248 [Test]
249 public void T021_EstateSettingsUserList() 249 public void T021_EstateSettingsUserList()
250 { 250 {
251 TestHelper.InMethod(); 251 TestHelpers.InMethod();
252 252
253 // Letting estate store generate rows to database for us 253 // Letting estate store generate rows to database for us
254 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); 254 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -269,7 +269,7 @@ namespace OpenSim.Data.Tests
269 [Test] 269 [Test]
270 public void T022_EstateSettingsGroupList() 270 public void T022_EstateSettingsGroupList()
271 { 271 {
272 TestHelper.InMethod(); 272 TestHelpers.InMethod();
273 273
274 // Letting estate store generate rows to database for us 274 // Letting estate store generate rows to database for us
275 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); 275 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -290,7 +290,7 @@ namespace OpenSim.Data.Tests
290 [Test] 290 [Test]
291 public void T022_EstateSettingsBanList() 291 public void T022_EstateSettingsBanList()
292 { 292 {
293 TestHelper.InMethod(); 293 TestHelpers.InMethod();
294 294
295 // Letting estate store generate rows to database for us 295 // Letting estate store generate rows to database for us
296 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); 296 EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
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);
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 44cf1ab..2b8fa59 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Data.Tests
151 [Test] 151 [Test]
152 public void T001_LoadEmpty() 152 public void T001_LoadEmpty()
153 { 153 {
154 TestHelper.InMethod(); 154 TestHelpers.InMethod();
155 155
156 List<SceneObjectGroup> objs = db.LoadObjects(region1); 156 List<SceneObjectGroup> objs = db.LoadObjects(region1);
157 List<SceneObjectGroup> objs3 = db.LoadObjects(region3); 157 List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
@@ -169,7 +169,7 @@ namespace OpenSim.Data.Tests
169 [Test] 169 [Test]
170 public void T010_StoreSimpleObject() 170 public void T010_StoreSimpleObject()
171 { 171 {
172 TestHelper.InMethod(); 172 TestHelpers.InMethod();
173 173
174 SceneObjectGroup sog = NewSOG("object1", prim1, region1); 174 SceneObjectGroup sog = NewSOG("object1", prim1, region1);
175 SceneObjectGroup sog2 = NewSOG("object2", prim2, region1); 175 SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
@@ -204,7 +204,7 @@ namespace OpenSim.Data.Tests
204 [Test] 204 [Test]
205 public void T011_ObjectNames() 205 public void T011_ObjectNames()
206 { 206 {
207 TestHelper.InMethod(); 207 TestHelpers.InMethod();
208 208
209 List<SceneObjectGroup> objs = db.LoadObjects(region1); 209 List<SceneObjectGroup> objs = db.LoadObjects(region1);
210 foreach (SceneObjectGroup sog in objs) 210 foreach (SceneObjectGroup sog in objs)
@@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
218 [Test] 218 [Test]
219 public void T012_SceneParts() 219 public void T012_SceneParts()
220 { 220 {
221 TestHelper.InMethod(); 221 TestHelpers.InMethod();
222 222
223 UUID tmp0 = UUID.Random(); 223 UUID tmp0 = UUID.Random();
224 UUID tmp1 = UUID.Random(); 224 UUID tmp1 = UUID.Random();
@@ -253,7 +253,7 @@ namespace OpenSim.Data.Tests
253 [Test] 253 [Test]
254 public void T013_DatabasePersistency() 254 public void T013_DatabasePersistency()
255 { 255 {
256 TestHelper.InMethod(); 256 TestHelpers.InMethod();
257 257
258 // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data 258 // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
259 // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored 259 // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored
@@ -430,7 +430,7 @@ namespace OpenSim.Data.Tests
430 [Test] 430 [Test]
431 public void T014_UpdateObject() 431 public void T014_UpdateObject()
432 { 432 {
433 TestHelper.InMethod(); 433 TestHelpers.InMethod();
434 434
435 string text1 = "object1 text"; 435 string text1 = "object1 text";
436 SceneObjectGroup sog = FindSOG("object1", region1); 436 SceneObjectGroup sog = FindSOG("object1", region1);
@@ -540,7 +540,7 @@ namespace OpenSim.Data.Tests
540 [Test] 540 [Test]
541 public void T015_LargeSceneObjects() 541 public void T015_LargeSceneObjects()
542 { 542 {
543 TestHelper.InMethod(); 543 TestHelpers.InMethod();
544 544
545 UUID id = UUID.Random(); 545 UUID id = UUID.Random();
546 Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>(); 546 Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
@@ -587,7 +587,7 @@ namespace OpenSim.Data.Tests
587 //[Test] 587 //[Test]
588 public void T016_RandomSogWithSceneParts() 588 public void T016_RandomSogWithSceneParts()
589 { 589 {
590 TestHelper.InMethod(); 590 TestHelpers.InMethod();
591 591
592 PropertyScrambler<SceneObjectPart> scrambler = 592 PropertyScrambler<SceneObjectPart> scrambler =
593 new PropertyScrambler<SceneObjectPart>() 593 new PropertyScrambler<SceneObjectPart>()
@@ -663,7 +663,7 @@ namespace OpenSim.Data.Tests
663 [Test] 663 [Test]
664 public void T020_PrimInventoryEmpty() 664 public void T020_PrimInventoryEmpty()
665 { 665 {
666 TestHelper.InMethod(); 666 TestHelpers.InMethod();
667 667
668 SceneObjectGroup sog = GetMySOG("object1"); 668 SceneObjectGroup sog = GetMySOG("object1");
669 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1); 669 TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
@@ -687,7 +687,7 @@ namespace OpenSim.Data.Tests
687 [Test] 687 [Test]
688 public void T021_PrimInventoryBasic() 688 public void T021_PrimInventoryBasic()
689 { 689 {
690 TestHelper.InMethod(); 690 TestHelpers.InMethod();
691 691
692 SceneObjectGroup sog = GetMySOG("object1"); 692 SceneObjectGroup sog = GetMySOG("object1");
693 InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero); 693 InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
@@ -727,7 +727,7 @@ namespace OpenSim.Data.Tests
727 [Test] 727 [Test]
728 public void T025_PrimInventoryPersistency() 728 public void T025_PrimInventoryPersistency()
729 { 729 {
730 TestHelper.InMethod(); 730 TestHelpers.InMethod();
731 731
732 InventoryItemBase i = new InventoryItemBase(); 732 InventoryItemBase i = new InventoryItemBase();
733 UUID id = UUID.Random(); 733 UUID id = UUID.Random();
@@ -800,7 +800,7 @@ namespace OpenSim.Data.Tests
800 [ExpectedException(typeof(ArgumentException))] 800 [ExpectedException(typeof(ArgumentException))]
801 public void T026_PrimInventoryMany() 801 public void T026_PrimInventoryMany()
802 { 802 {
803 TestHelper.InMethod(); 803 TestHelpers.InMethod();
804 804
805 UUID i1,i2,i3,i4; 805 UUID i1,i2,i3,i4;
806 i1 = UUID.Random(); 806 i1 = UUID.Random();
@@ -832,7 +832,7 @@ namespace OpenSim.Data.Tests
832 [Test] 832 [Test]
833 public void T052_RemoveObject() 833 public void T052_RemoveObject()
834 { 834 {
835 TestHelper.InMethod(); 835 TestHelpers.InMethod();
836 836
837 db.RemoveObject(prim1, region1); 837 db.RemoveObject(prim1, region1);
838 SceneObjectGroup sog = FindSOG("object1", region1); 838 SceneObjectGroup sog = FindSOG("object1", region1);
@@ -842,7 +842,7 @@ namespace OpenSim.Data.Tests
842 [Test] 842 [Test]
843 public void T100_DefaultRegionInfo() 843 public void T100_DefaultRegionInfo()
844 { 844 {
845 TestHelper.InMethod(); 845 TestHelpers.InMethod();
846 846
847 RegionSettings r1 = db.LoadRegionSettings(region1); 847 RegionSettings r1 = db.LoadRegionSettings(region1);
848 Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))"); 848 Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
@@ -854,7 +854,7 @@ namespace OpenSim.Data.Tests
854 [Test] 854 [Test]
855 public void T101_UpdateRegionInfo() 855 public void T101_UpdateRegionInfo()
856 { 856 {
857 TestHelper.InMethod(); 857 TestHelpers.InMethod();
858 858
859 int agentlimit = random.Next(); 859 int agentlimit = random.Next();
860 double objectbonus = random.Next(); 860 double objectbonus = random.Next();
@@ -960,7 +960,7 @@ namespace OpenSim.Data.Tests
960 [Test] 960 [Test]
961 public void T300_NoTerrain() 961 public void T300_NoTerrain()
962 { 962 {
963 TestHelper.InMethod(); 963 TestHelpers.InMethod();
964 964
965 Assert.That(db.LoadTerrain(zero), Is.Null); 965 Assert.That(db.LoadTerrain(zero), Is.Null);
966 Assert.That(db.LoadTerrain(region1), Is.Null); 966 Assert.That(db.LoadTerrain(region1), Is.Null);
@@ -971,7 +971,7 @@ namespace OpenSim.Data.Tests
971 [Test] 971 [Test]
972 public void T301_CreateTerrain() 972 public void T301_CreateTerrain()
973 { 973 {
974 TestHelper.InMethod(); 974 TestHelpers.InMethod();
975 975
976 double[,] t1 = GenTerrain(height1); 976 double[,] t1 = GenTerrain(height1);
977 db.StoreTerrain(t1, region1); 977 db.StoreTerrain(t1, region1);
@@ -985,7 +985,7 @@ namespace OpenSim.Data.Tests
985 [Test] 985 [Test]
986 public void T302_FetchTerrain() 986 public void T302_FetchTerrain()
987 { 987 {
988 TestHelper.InMethod(); 988 TestHelpers.InMethod();
989 989
990 double[,] baseterrain1 = GenTerrain(height1); 990 double[,] baseterrain1 = GenTerrain(height1);
991 double[,] baseterrain2 = GenTerrain(height2); 991 double[,] baseterrain2 = GenTerrain(height2);
@@ -997,7 +997,7 @@ namespace OpenSim.Data.Tests
997 [Test] 997 [Test]
998 public void T303_UpdateTerrain() 998 public void T303_UpdateTerrain()
999 { 999 {
1000 TestHelper.InMethod(); 1000 TestHelpers.InMethod();
1001 1001
1002 double[,] baseterrain1 = GenTerrain(height1); 1002 double[,] baseterrain1 = GenTerrain(height1);
1003 double[,] baseterrain2 = GenTerrain(height2); 1003 double[,] baseterrain2 = GenTerrain(height2);
@@ -1011,7 +1011,7 @@ namespace OpenSim.Data.Tests
1011 [Test] 1011 [Test]
1012 public void T400_EmptyLand() 1012 public void T400_EmptyLand()
1013 { 1013 {
1014 TestHelper.InMethod(); 1014 TestHelpers.InMethod();
1015 1015
1016 Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))"); 1016 Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
1017 Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))"); 1017 Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");