OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename TestHelper => TestHelpers for consistency

bulletsim
Justin Clark-Casey (justincc) 2011-08-06 00:31:03 +01:00
parent bda1a4be45
commit dad1d6df18
33 changed files with 141 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Data/Tests/AssetTests.cs
View File

@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T001_LoadEmpty() public void T001_LoadEmpty()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Assert.That(m_db.ExistsAsset(uuid1), Is.False); Assert.That(m_db.ExistsAsset(uuid1), Is.False);
Assert.That(m_db.ExistsAsset(uuid2), Is.False); Assert.That(m_db.ExistsAsset(uuid2), Is.False);
@ -116,7 +116,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T010_StoreReadVerifyAssets() public void T010_StoreReadVerifyAssets()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString()); AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString());
AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString()); AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString());
@ -183,7 +183,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T020_CheckForWeirdCreatorID() public void T020_CheckForWeirdCreatorID()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// It is expected that eventually the CreatorID might be an arbitrary string (an URI) // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
// rather than a valid UUID (?). This test is to make sure that the database layer does not // rather than a valid UUID (?). This test is to make sure that the database layer does not

16
OpenSim/Data/Tests/EstateTests.cs
View File

@ -107,7 +107,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T010_EstateSettingsSimpleStorage_MinimumParameterSet() public void T010_EstateSettingsSimpleStorage_MinimumParameterSet()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
EstateSettingsSimpleStorage( EstateSettingsSimpleStorage(
REGION_ID, REGION_ID,
@ -140,7 +140,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T011_EstateSettingsSimpleStorage_MaximumParameterSet() public void T011_EstateSettingsSimpleStorage_MaximumParameterSet()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
EstateSettingsSimpleStorage( EstateSettingsSimpleStorage(
REGION_ID, REGION_ID,
@ -173,7 +173,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T012_EstateSettingsSimpleStorage_AccurateParameterSet() public void T012_EstateSettingsSimpleStorage_AccurateParameterSet()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
EstateSettingsSimpleStorage( EstateSettingsSimpleStorage(
REGION_ID, REGION_ID,
@ -206,7 +206,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T012_EstateSettingsRandomStorage() public void T012_EstateSettingsRandomStorage()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Letting estate store generate rows to database for us // Letting estate store generate rows to database for us
EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@ -227,7 +227,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T020_EstateSettingsManagerList() public void T020_EstateSettingsManagerList()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Letting estate store generate rows to database for us // Letting estate store generate rows to database for us
EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@ -248,7 +248,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T021_EstateSettingsUserList() public void T021_EstateSettingsUserList()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Letting estate store generate rows to database for us // Letting estate store generate rows to database for us
EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@ -269,7 +269,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T022_EstateSettingsGroupList() public void T022_EstateSettingsGroupList()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Letting estate store generate rows to database for us // Letting estate store generate rows to database for us
EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@ -290,7 +290,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T022_EstateSettingsBanList() public void T022_EstateSettingsBanList()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Letting estate store generate rows to database for us // Letting estate store generate rows to database for us
EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true); EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);

26
OpenSim/Data/Tests/InventoryTests.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T001_LoadEmpty() public void T001_LoadEmpty()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Assert.That(db.getInventoryFolder(zero), Is.Null); Assert.That(db.getInventoryFolder(zero), Is.Null);
Assert.That(db.getInventoryFolder(folder1), Is.Null); Assert.That(db.getInventoryFolder(folder1), Is.Null);
@ -134,7 +134,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T010_FolderNonParent() public void T010_FolderNonParent()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2); InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2);
// the folder will go in // the folder will go in
@ -146,7 +146,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T011_FolderCreate() public void T011_FolderCreate()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1); InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1);
// TODO: this is probably wrong behavior, but is what we have // TODO: this is probably wrong behavior, but is what we have
@ -171,7 +171,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T012_FolderList() public void T012_FolderList()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3); InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
db.addInventoryFolder(f2); db.addInventoryFolder(f2);
@ -187,7 +187,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T013_FolderHierarchy() public void T013_FolderHierarchy()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
int n = db.getFolderHierarchy(zero).Count; // (for dbg - easier to see what's returned) int n = db.getFolderHierarchy(zero).Count; // (for dbg - easier to see what's returned)
Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
@ -202,7 +202,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T014_MoveFolder() public void T014_MoveFolder()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
InventoryFolderBase f2 = db.getInventoryFolder(folder2); InventoryFolderBase f2 = db.getInventoryFolder(folder2);
f2.ParentID = folder3; f2.ParentID = folder3;
@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T015_FolderHierarchy() public void T015_FolderHierarchy()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))"); Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))"); 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
[Test] [Test]
public void T100_NoItems() public void T100_NoItems()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))"); Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))"); 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
[Test] [Test]
public void T101_CreatItems() public void T101_CreatItems()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1)); db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2)); db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
@ -256,7 +256,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T102_CompareItems() public void T102_CompareItems()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
InventoryItemBase i1 = db.getInventoryItem(item1); InventoryItemBase i1 = db.getInventoryItem(item1);
InventoryItemBase i2 = db.getInventoryItem(item2); InventoryItemBase i2 = db.getInventoryItem(item2);
@ -275,7 +275,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T103_UpdateItem() public void T103_UpdateItem()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// TODO: probably shouldn't have the ability to have an // TODO: probably shouldn't have the ability to have an
// owner of an item in a folder not owned by the user // owner of an item in a folder not owned by the user
@ -295,7 +295,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T104_RandomUpdateItem() public void T104_RandomUpdateItem()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
PropertyScrambler<InventoryFolderBase> folderScrambler = PropertyScrambler<InventoryFolderBase> folderScrambler =
new PropertyScrambler<InventoryFolderBase>() new PropertyScrambler<InventoryFolderBase>()
@ -354,7 +354,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T999_StillNull() public void T999_StillNull()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// After all tests are run, these should still return no results // After all tests are run, these should still return no results
Assert.That(db.getInventoryFolder(zero), Is.Null); Assert.That(db.getInventoryFolder(zero), Is.Null);

40
OpenSim/Data/Tests/RegionTests.cs
View File

@ -151,7 +151,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T001_LoadEmpty() public void T001_LoadEmpty()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
List<SceneObjectGroup> objs = db.LoadObjects(region1); List<SceneObjectGroup> objs = db.LoadObjects(region1);
List<SceneObjectGroup> objs3 = db.LoadObjects(region3); List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
@ -169,7 +169,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T010_StoreSimpleObject() public void T010_StoreSimpleObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
SceneObjectGroup sog = NewSOG("object1", prim1, region1); SceneObjectGroup sog = NewSOG("object1", prim1, region1);
SceneObjectGroup sog2 = NewSOG("object2", prim2, region1); SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
@ -204,7 +204,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T011_ObjectNames() public void T011_ObjectNames()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
List<SceneObjectGroup> objs = db.LoadObjects(region1); List<SceneObjectGroup> objs = db.LoadObjects(region1);
foreach (SceneObjectGroup sog in objs) foreach (SceneObjectGroup sog in objs)
@ -218,7 +218,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T012_SceneParts() public void T012_SceneParts()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
UUID tmp0 = UUID.Random(); UUID tmp0 = UUID.Random();
UUID tmp1 = UUID.Random(); UUID tmp1 = UUID.Random();
@ -253,7 +253,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T013_DatabasePersistency() public void T013_DatabasePersistency()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
// The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored // 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
[Test] [Test]
public void T014_UpdateObject() public void T014_UpdateObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
string text1 = "object1 text"; string text1 = "object1 text";
SceneObjectGroup sog = FindSOG("object1", region1); SceneObjectGroup sog = FindSOG("object1", region1);
@ -540,7 +540,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T015_LargeSceneObjects() public void T015_LargeSceneObjects()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
UUID id = UUID.Random(); UUID id = UUID.Random();
Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>(); Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
@ -587,7 +587,7 @@ namespace OpenSim.Data.Tests
//[Test] //[Test]
public void T016_RandomSogWithSceneParts() public void T016_RandomSogWithSceneParts()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
PropertyScrambler<SceneObjectPart> scrambler = PropertyScrambler<SceneObjectPart> scrambler =
new PropertyScrambler<SceneObjectPart>() new PropertyScrambler<SceneObjectPart>()
@ -663,7 +663,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T020_PrimInventoryEmpty() public void T020_PrimInventoryEmpty()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
SceneObjectGroup sog = GetMySOG("object1"); SceneObjectGroup sog = GetMySOG("object1");
TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1); TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
@ -687,7 +687,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T021_PrimInventoryBasic() public void T021_PrimInventoryBasic()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
SceneObjectGroup sog = GetMySOG("object1"); SceneObjectGroup sog = GetMySOG("object1");
InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero); InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
@ -727,7 +727,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T025_PrimInventoryPersistency() public void T025_PrimInventoryPersistency()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
InventoryItemBase i = new InventoryItemBase(); InventoryItemBase i = new InventoryItemBase();
UUID id = UUID.Random(); UUID id = UUID.Random();
@ -800,7 +800,7 @@ namespace OpenSim.Data.Tests
[ExpectedException(typeof(ArgumentException))] [ExpectedException(typeof(ArgumentException))]
public void T026_PrimInventoryMany() public void T026_PrimInventoryMany()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
UUID i1,i2,i3,i4; UUID i1,i2,i3,i4;
i1 = UUID.Random(); i1 = UUID.Random();
@ -832,7 +832,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T052_RemoveObject() public void T052_RemoveObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
db.RemoveObject(prim1, region1); db.RemoveObject(prim1, region1);
SceneObjectGroup sog = FindSOG("object1", region1); SceneObjectGroup sog = FindSOG("object1", region1);
@ -842,7 +842,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T100_DefaultRegionInfo() public void T100_DefaultRegionInfo()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
RegionSettings r1 = db.LoadRegionSettings(region1); RegionSettings r1 = db.LoadRegionSettings(region1);
Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))"); Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
@ -854,7 +854,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T101_UpdateRegionInfo() public void T101_UpdateRegionInfo()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
int agentlimit = random.Next(); int agentlimit = random.Next();
double objectbonus = random.Next(); double objectbonus = random.Next();
@ -960,7 +960,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T300_NoTerrain() public void T300_NoTerrain()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Assert.That(db.LoadTerrain(zero), Is.Null); Assert.That(db.LoadTerrain(zero), Is.Null);
Assert.That(db.LoadTerrain(region1), Is.Null); Assert.That(db.LoadTerrain(region1), Is.Null);
@ -971,7 +971,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T301_CreateTerrain() public void T301_CreateTerrain()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
double[,] t1 = GenTerrain(height1); double[,] t1 = GenTerrain(height1);
db.StoreTerrain(t1, region1); db.StoreTerrain(t1, region1);
@ -985,7 +985,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T302_FetchTerrain() public void T302_FetchTerrain()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
double[,] baseterrain1 = GenTerrain(height1); double[,] baseterrain1 = GenTerrain(height1);
double[,] baseterrain2 = GenTerrain(height2); double[,] baseterrain2 = GenTerrain(height2);
@ -997,7 +997,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T303_UpdateTerrain() public void T303_UpdateTerrain()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
double[,] baseterrain1 = GenTerrain(height1); double[,] baseterrain1 = GenTerrain(height1);
double[,] baseterrain2 = GenTerrain(height2); double[,] baseterrain2 = GenTerrain(height2);
@ -1011,7 +1011,7 @@ namespace OpenSim.Data.Tests
[Test] [Test]
public void T400_EmptyLand() public void T400_EmptyLand()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))"); Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))"); Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");

8
OpenSim/Framework/Tests/UtilTest.cs
View File

@ -61,7 +61,7 @@ namespace OpenSim.Framework.Tests
"Magnitude of vector was incorrect."); "Magnitude of vector was incorrect.");
TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
Assert.That(causesArgumentException, Is.True, Assert.That(causesArgumentException, Is.True,
"Getting magnitude of null vector did not cause argument exception."); "Getting magnitude of null vector did not cause argument exception.");
@ -94,12 +94,12 @@ namespace OpenSim.Framework.Tests
"Magnitude of vector was incorrect."); "Magnitude of vector was incorrect.");
TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
Assert.That(causesArgumentException, Is.True, Assert.That(causesArgumentException, Is.True,
"Getting magnitude of null vector did not cause argument exception."); "Getting magnitude of null vector did not cause argument exception.");
d = delegate() { Util.GetNormalizedVector(v2); }; d = delegate() { Util.GetNormalizedVector(v2); };
causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
Assert.That(causesArgumentException, Is.True, Assert.That(causesArgumentException, Is.True,
"Getting magnitude of null vector did not cause argument exception."); "Getting magnitude of null vector did not cause argument exception.");
} }
@ -122,7 +122,7 @@ namespace OpenSim.Framework.Tests
"Magnitude of vector was incorrect."); "Magnitude of vector was incorrect.");
TestDelegate d = delegate() { Util.GetNormalizedVector(v1); }; TestDelegate d = delegate() { Util.GetNormalizedVector(v1); };
bool causesArgumentException = TestHelper.AssertThisDelegateCausesArgumentException(d); bool causesArgumentException = TestHelpers.AssertThisDelegateCausesArgumentException(d);
Assert.That(causesArgumentException, Is.True, Assert.That(causesArgumentException, Is.True,
"Getting magnitude of null vector did not cause argument exception."); "Getting magnitude of null vector did not cause argument exception.");

12
OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs
View File

@ -72,11 +72,11 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
[Test] [Test]
public void TestCacheAsset() public void TestCacheAsset()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
AssetBase asset = AssetHelpers.CreateAsset(); AssetBase asset = AssetHelpers.CreateAsset();
asset.ID = TestHelper.ParseTail(0x1).ToString(); asset.ID = TestHelpers.ParseTail(0x1).ToString();
// Check we don't get anything before the asset is put in the cache // Check we don't get anything before the asset is put in the cache
AssetBase retrievedAsset = m_cache.Get(asset.ID.ToString()); AssetBase retrievedAsset = m_cache.Get(asset.ID.ToString());
@ -93,11 +93,11 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
[Test] [Test]
public void TestExpireAsset() public void TestExpireAsset()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
AssetBase asset = AssetHelpers.CreateAsset(); AssetBase asset = AssetHelpers.CreateAsset();
asset.ID = TestHelper.ParseTail(0x2).ToString(); asset.ID = TestHelpers.ParseTail(0x2).ToString();
m_cache.Store(asset); m_cache.Store(asset);
@ -110,11 +110,11 @@ namespace OpenSim.Region.CoreModules.Asset.Tests
[Test] [Test]
public void TestClearCache() public void TestClearCache()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
AssetBase asset = AssetHelpers.CreateAsset(); AssetBase asset = AssetHelpers.CreateAsset();
asset.ID = TestHelper.ParseTail(0x2).ToString(); asset.ID = TestHelpers.ParseTail(0x2).ToString();
m_cache.Store(asset); m_cache.Store(asset);

6
OpenSim/Region/CoreModules/Avatar/AvatarFactory/Tests/AvatarFactoryModuleTests.cs
View File

@ -44,10 +44,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
[Test] [Test]
public void TestSetAppearance() public void TestSetAppearance()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UUID userId = TestHelper.ParseTail(0x1); UUID userId = TestHelpers.ParseTail(0x1);
AvatarFactoryModule afm = new AvatarFactoryModule(); AvatarFactoryModule afm = new AvatarFactoryModule();
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();
@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
for (byte i = 0; i < visualParams.Length; i++) for (byte i = 0; i < visualParams.Length; i++)
visualParams[i] = i; visualParams[i] = i;
afm.SetAppearance(tc, new Primitive.TextureEntry(TestHelper.ParseTail(0x10)), visualParams); afm.SetAppearance(tc, new Primitive.TextureEntry(TestHelpers.ParseTail(0x10)), visualParams);
ScenePresence sp = scene.GetScenePresence(userId); ScenePresence sp = scene.GetScenePresence(userId);

14
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadCoalesecedItem() public void TestLoadCoalesecedItem()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password"); UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestOrder() public void TestOrder()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
MemoryStream archiveReadStream = new MemoryStream(m_iarStreamBytes); MemoryStream archiveReadStream = new MemoryStream(m_iarStreamBytes);
@ -129,7 +129,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestSaveItemToIar() public void TestSaveItemToIar()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
// Create user // Create user
@ -224,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestSaveItemToIarNoAssets() public void TestSaveItemToIarNoAssets()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
// Create user // Create user
@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarCreatorAccountPresent() public void TestLoadIarCreatorAccountPresent()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood"); UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarV0_1SameNameCreator() public void TestLoadIarV0_1SameNameCreator()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood"); UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarV0_1AbsentCreator() public void TestLoadIarV0_1AbsentCreator()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password"); UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password");

14
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
View File

@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestSavePathToIarV0_1() public void TestSavePathToIarV0_1()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
InventoryArchiverModule archiverModule = new InventoryArchiverModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule();
@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarToInventoryPaths() public void TestLoadIarToInventoryPaths()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SerialiserModule serialiserModule = new SerialiserModule(); SerialiserModule serialiserModule = new SerialiserModule();
@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarPathStartsWithSlash() public void TestLoadIarPathStartsWithSlash()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SerialiserModule serialiserModule = new SerialiserModule(); SerialiserModule serialiserModule = new SerialiserModule();
@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestLoadIarPathWithEscapedChars() public void TestLoadIarPathWithEscapedChars()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
string itemName = "You & you are a mean/man/"; string itemName = "You & you are a mean/man/";
@ -323,7 +323,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestNewIarPath() public void TestNewIarPath()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -390,7 +390,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestPartExistingIarPath() public void TestPartExistingIarPath()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -441,7 +441,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
[Test] [Test]
public void TestMergeIarPath() public void TestMergeIarPath()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();

4
OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
View File

@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
[Test] [Test]
public void TestRezCoalescedObject() public void TestRezCoalescedObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
// Create asset // Create asset
@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
[Test] [Test]
public void TestRezObject() public void TestRezObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
// Create asset // Create asset

10
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test] [Test]
public void TestSaveOar() public void TestSaveOar()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SceneObjectPart part1 = CreateSceneObjectPart1(); SceneObjectPart part1 = CreateSceneObjectPart1();
@ -217,7 +217,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test] [Test]
public void TestSaveOarNoAssets() public void TestSaveOarNoAssets()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SceneObjectPart part1 = CreateSceneObjectPart1(); SceneObjectPart part1 = CreateSceneObjectPart1();
@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test] [Test]
public void TestLoadOar() public void TestLoadOar()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream(); MemoryStream archiveWriteStream = new MemoryStream();
@ -409,7 +409,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
[Test] [Test]
public void TestLoadOarRegionSettings() public void TestLoadOarRegionSettings()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream(); MemoryStream archiveWriteStream = new MemoryStream();
@ -505,7 +505,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
//[Test] //[Test]
public void TestMergeOar() public void TestMergeOar()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//XmlConfigurator.Configure(); //XmlConfigurator.Configure();
MemoryStream archiveWriteStream = new MemoryStream(); MemoryStream archiveWriteStream = new MemoryStream();

18
OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
View File

@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestAddOwnerObject() public void TestAddOwnerObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IPrimCounts pc = m_lo.PrimCounts; IPrimCounts pc = m_lo.PrimCounts;
@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestCopyOwnerObject() public void TestCopyOwnerObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IPrimCounts pc = m_lo.PrimCounts; IPrimCounts pc = m_lo.PrimCounts;
@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestMoveOwnerObject() public void TestMoveOwnerObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01); SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);
@ -230,7 +230,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestRemoveOwnerObject() public void TestRemoveOwnerObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IPrimCounts pc = m_lo.PrimCounts; IPrimCounts pc = m_lo.PrimCounts;
@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestAddGroupObject() public void TestAddGroupObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
m_lo.DeedToGroup(m_groupId); m_lo.DeedToGroup(m_groupId);
@ -284,7 +284,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestRemoveGroupObject() public void TestRemoveGroupObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
m_lo.DeedToGroup(m_groupId); m_lo.DeedToGroup(m_groupId);
@ -313,7 +313,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestAddOthersObject() public void TestAddOthersObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IPrimCounts pc = m_lo.PrimCounts; IPrimCounts pc = m_lo.PrimCounts;
@ -334,7 +334,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestRemoveOthersObject() public void TestRemoveOthersObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IPrimCounts pc = m_lo.PrimCounts; IPrimCounts pc = m_lo.PrimCounts;
@ -360,7 +360,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
[Test] [Test]
public void TestTaint() public void TestTaint()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
IPrimCounts pc = m_lo.PrimCounts; IPrimCounts pc = m_lo.PrimCounts;
SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01); SceneObjectGroup sog = SceneHelpers.CreateSceneObject(3, m_userId, "a", 0x01);

4
OpenSim/Region/CoreModules/World/Media/Moap/Tests/MoapTests.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
[Test] [Test]
public void TestClearMediaUrl() public void TestClearMediaUrl()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene); SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.World.Media.Moap.Tests
[Test] [Test]
public void TestSetMediaUrl() public void TestSetMediaUrl()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
string homeUrl = "opensimulator.org"; string homeUrl = "opensimulator.org";

8
OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
View File

@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
[Test] [Test]
public void TestDeserializeXml() public void TestDeserializeXml()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(xml); SceneObjectGroup so = SceneObjectSerializer.FromOriginalXmlFormat(xml);
@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
[Test] [Test]
public void TestSerializeXml() public void TestSerializeXml()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
string rpName = "My Little Donkey"; string rpName = "My Little Donkey";
@ -334,7 +334,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
[Test] [Test]
public void TestDeserializeXml2() public void TestDeserializeXml2()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(xml2); SceneObjectGroup so = m_serialiserModule.DeserializeGroupFromXml2(xml2);
@ -350,7 +350,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
[Test] [Test]
public void TestSerializeXml2() public void TestSerializeXml2()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
string rpName = "My Little Pony"; string rpName = "My Little Pony";

8
OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
@ -89,7 +89,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T030_TestAddAttachments() public void T030_TestAddAttachments()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
ScenePresence presence = scene.GetScenePresence(agent1); ScenePresence presence = scene.GetScenePresence(agent1);
@ -104,7 +104,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T031_RemoveAttachments() public void T031_RemoveAttachments()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
ScenePresence presence = scene.GetScenePresence(agent1); ScenePresence presence = scene.GetScenePresence(agent1);
presence.RemoveAttachment(sog1); presence.RemoveAttachment(sog1);
@ -118,7 +118,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
//[Test] //[Test]
public void T032_CrossAttachments() public void T032_CrossAttachments()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
ScenePresence presence = scene.GetScenePresence(agent1); ScenePresence presence = scene.GetScenePresence(agent1);
ScenePresence presence2 = scene2.GetScenePresence(agent1); ScenePresence presence2 = scene2.GetScenePresence(agent1);

8
OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
View File

@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestCross() public void TestCross()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
List<Border> testborders = new List<Border>(); List<Border> testborders = new List<Border>();
@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestCrossSquare512() public void TestCrossSquare512()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
List<Border> testborders = new List<Border>(); List<Border> testborders = new List<Border>();
@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestCrossRectangle512x256() public void TestCrossRectangle512x256()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
List<Border> testborders = new List<Border>(); List<Border> testborders = new List<Border>();
@ -259,7 +259,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestCrossOdd512x512w256hole() public void TestCrossOdd512x512w256hole()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
List<Border> testborders = new List<Border>(); List<Border> testborders = new List<Border>();
// 512____ // 512____

4
OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T010_AddObjects() public void T010_AddObjects()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
random = new Random(); random = new Random();
SceneObjectGroup found; SceneObjectGroup found;
@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T011_ThreadAddRemoveTest() public void T011_ThreadAddRemoveTest()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// This test adds and removes with mutiple threads, attempting to break the // This test adds and removes with mutiple threads, attempting to break the
// uuid and localid dictionary coherence. // uuid and localid dictionary coherence.

2
OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
View File

@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestDuplicateObject() public void TestDuplicateObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010"); UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");

8
OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestAddSceneObject() public void TestAddSceneObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
/// </summary> /// </summary>
public void TestAddExistingSceneObjectUuid() public void TestAddExistingSceneObjectUuid()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -110,7 +110,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestDeleteSceneObject() public void TestDeleteSceneObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();
SceneObjectPart part = SceneHelpers.AddSceneObject(scene); SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
@ -126,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestDeleteSceneObjectAsync() public void TestDeleteSceneObjectAsync()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");

4
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestDeRezSceneObject() public void TestDeRezSceneObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestDeRezSceneObjectNotOwner() public void TestDeRezSceneObjectNotOwner()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");

8
OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestLinkDelink2SceneObjects() public void TestLinkDelink2SceneObjects()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
bool debugtest = false; bool debugtest = false;
@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestLinkDelink2groups4SceneObjects() public void TestLinkDelink2groups4SceneObjects()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
bool debugtest = false; bool debugtest = false;
@ -266,7 +266,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestNewSceneObjectLinkPersistence() public void TestNewSceneObjectLinkPersistence()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();
@ -305,7 +305,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestDelinkPersistence() public void TestDelinkPersistence()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();

4
OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestResizeSceneObject() public void TestResizeSceneObject()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestResizeSceneObjectPart() public void TestResizeSceneObjectPart()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();

2
OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
View File

@ -46,7 +46,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestSetPhantom() public void TestSetPhantom()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// Scene scene = SceneSetupHelpers.SetupScene(); // Scene scene = SceneSetupHelpers.SetupScene();
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, UUID.Zero); SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, UUID.Zero);

2
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestShareWithGroup() public void TestShareWithGroup()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");

14
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[TestFixtureSetUp] [TestFixtureSetUp]
public void Init() public void Init()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T010_TestAddRootAgent() public void T010_TestAddRootAgent()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
string firstName = "testfirstname"; string firstName = "testfirstname";
@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T011_TestRemoveRootAgent() public void T011_TestRemoveRootAgent()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
scene.RemoveClient(agent1); scene.RemoveClient(agent1);
@ -147,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T012_TestAddNeighbourRegion() public void T012_TestAddNeighbourRegion()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
string reason; string reason;
@ -175,7 +175,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void T013_TestRemoveNeighbourRegion() public void T013_TestRemoveNeighbourRegion()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
ScenePresence presence = scene.GetScenePresence(agent1); ScenePresence presence = scene.GetScenePresence(agent1);
presence.RemoveNeighbourRegion(region3); presence.RemoveNeighbourRegion(region3);
@ -198,7 +198,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestChildAgentEstablished() public void TestChildAgentEstablished()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
@ -230,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
//[Test] //[Test]
public void T021_TestCrossToNewRegion() public void T021_TestCrossToNewRegion()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
scene.RegisterRegionWithGrid(); scene.RegisterRegionWithGrid();
scene2.RegisterRegionWithGrid(); scene2.RegisterRegionWithGrid();

2
OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
View File

@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestUpdateScene() public void TestUpdateScene()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
scene.Update(); scene.Update();

2
OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
//[Test, LongRunning] //[Test, LongRunning]
public void TestSimpleNotNeighboursTeleport() public void TestSimpleNotNeighboursTeleport()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
ThreadRunResults results = new ThreadRunResults(); ThreadRunResults results = new ThreadRunResults();
results.Result = false; results.Result = false;
results.Message = "Test did not run"; results.Message = "Test did not run";

6
OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests
[Test] [Test]
public void TestRezObjectFromInventoryItem() public void TestRezObjectFromInventoryItem()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Tests
[Test] [Test]
public void TestMoveTaskInventoryItem() public void TestMoveTaskInventoryItem()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Tests
[Test] [Test]
public void TestMoveTaskInventoryItemNoParent() public void TestMoveTaskInventoryItemNoParent()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();

4
OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests
[Test] [Test]
public void TestGiveInventoryItem() public void TestGiveInventoryItem()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();
@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Tests
[Test] [Test]
public void TestGiveInventoryFolder() public void TestGiveInventoryFolder()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneHelpers.SetupScene(); Scene scene = SceneHelpers.SetupScene();

4
OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestCorruptAsset() public void TestCorruptAsset()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
AssetBase corruptAsset AssetBase corruptAsset
@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
[Test] [Test]
public void TestMissingAsset() public void TestMissingAsset()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>(); IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>();

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs
View File

@ -47,7 +47,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests
[Test] [Test]
public void TestBasic() public void TestBasic()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();

10
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
View File

@ -49,7 +49,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
[Test] [Test]
public void TestCreate() public void TestCreate()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IConfigSource config = new IniConfigSource(); IConfigSource config = new IniConfigSource();
@ -59,11 +59,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
AvatarFactoryModule afm = new AvatarFactoryModule(); AvatarFactoryModule afm = new AvatarFactoryModule();
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();
SceneHelpers.SetupSceneModules(scene, config, afm, new NPCModule()); SceneHelpers.SetupSceneModules(scene, config, afm, new NPCModule());
TestClient originalClient = SceneHelpers.AddClient(scene, TestHelper.ParseTail(0x1)); TestClient originalClient = SceneHelpers.AddClient(scene, TestHelpers.ParseTail(0x1));
// ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId); // ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
// 8 is the index of the first baked texture in AvatarAppearance // 8 is the index of the first baked texture in AvatarAppearance
UUID originalFace8TextureId = TestHelper.ParseTail(0x10); UUID originalFace8TextureId = TestHelpers.ParseTail(0x10);
Primitive.TextureEntry originalTe = new Primitive.TextureEntry(UUID.Zero); Primitive.TextureEntry originalTe = new Primitive.TextureEntry(UUID.Zero);
Primitive.TextureEntryFace originalTef = originalTe.CreateFace(8); Primitive.TextureEntryFace originalTef = originalTe.CreateFace(8);
originalTef.TextureID = originalFace8TextureId; originalTef.TextureID = originalFace8TextureId;
@ -86,7 +86,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
[Test] [Test]
public void TestMove() public void TestMove()
{ {
TestHelper.InMethod(); TestHelpers.InMethod();
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
IConfigSource config = new IniConfigSource(); IConfigSource config = new IniConfigSource();
@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests
TestScene scene = SceneHelpers.SetupScene(); TestScene scene = SceneHelpers.SetupScene();
SceneHelpers.SetupSceneModules(scene, config, new NPCModule()); SceneHelpers.SetupSceneModules(scene, config, new NPCModule());
TestClient originalClient = SceneHelpers.AddClient(scene, TestHelper.ParseTail(0x1)); TestClient originalClient = SceneHelpers.AddClient(scene, TestHelpers.ParseTail(0x1));
// ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId); // ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId);
Vector3 startPos = new Vector3(128, 128, 30); Vector3 startPos = new Vector3(128, 128, 30);

2
OpenSim/Tests/Common/TestHelper.cs → OpenSim/Tests/Common/TestHelpers.cs
View File

@ -32,7 +32,7 @@ using OpenMetaverse;
namespace OpenSim.Tests.Common namespace OpenSim.Tests.Common
{ {
public class TestHelper public class TestHelpers
{ {
public static bool AssertThisDelegateCausesArgumentException(TestDelegate d) public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)
{ {