diff options
Merge branch 'master' into bulletsim
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/Tests/EstateTests.cs | 16 |
1 files changed, 8 insertions, 8 deletions
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); |