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