aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-23 22:14:04 +0000
committerJustin Clark-Casey (justincc)2011-03-23 22:14:04 +0000
commitf1f4985ab6fc98daf2263f72397fe7db79b20ecd (patch)
tree5c515c6d40c4594aa42cfb3f65ed1ef6a1db26d1
parentExtend simple PCM add object test to check all counts (diff)
downloadopensim-SC_OLD-f1f4985ab6fc98daf2263f72397fe7db79b20ecd.zip
opensim-SC_OLD-f1f4985ab6fc98daf2263f72397fe7db79b20ecd.tar.gz
opensim-SC_OLD-f1f4985ab6fc98daf2263f72397fe7db79b20ecd.tar.bz2
opensim-SC_OLD-f1f4985ab6fc98daf2263f72397fe7db79b20ecd.tar.xz
user a non UUID.Zero user in pcm test to avoid any special treatment of UUID.Zero
-rw-r--r--OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 88c814e..639d781 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -55,8 +55,9 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
55 Scene scene = SceneSetupHelpers.SetupScene(); 55 Scene scene = SceneSetupHelpers.SetupScene();
56 SceneSetupHelpers.SetupSceneModules(scene, lmm, pcm); 56 SceneSetupHelpers.SetupSceneModules(scene, lmm, pcm);
57 57
58 UUID userId = new UUID("00000000-0000-0000-0000-000000000010");
58 UUID dummyUserId = new UUID("99999999-9999-9999-9999-999999999999"); 59 UUID dummyUserId = new UUID("99999999-9999-9999-9999-999999999999");
59 ILandObject lo = new LandObject(UUID.Zero, false, scene); 60 ILandObject lo = new LandObject(userId, false, scene);
60 lo.SetLandBitmap(lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); 61 lo.SetLandBitmap(lo.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
61 lmm.AddLandObject(lo); 62 lmm.AddLandObject(lo);
62 //scene.loadAllLandObjectsFromStorage(scene.RegionInfo.originRegionID); 63 //scene.loadAllLandObjectsFromStorage(scene.RegionInfo.originRegionID);
@@ -65,13 +66,13 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
65 UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001"); 66 UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
66 67
67 SceneObjectPart part 68 SceneObjectPart part
68 = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 69 = new SceneObjectPart(userId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero)
69 { Name = objName, UUID = objUuid }; 70 { Name = objName, UUID = objUuid };
70 71
71 Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(0)); 72 Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(0));
72 Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0)); 73 Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0));
73 Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0)); 74 Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0));
74 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, UUID.Zero), Is.EqualTo(0)); 75 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, userId), Is.EqualTo(0));
75 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0)); 76 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0));
76 Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(0)); 77 Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(0));
77 78
@@ -80,7 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
80 Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(1)); 81 Assert.That(pcm.GetOwnerCount(lo.LandData.GlobalID), Is.EqualTo(1));
81 Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0)); 82 Assert.That(pcm.GetGroupCount(lo.LandData.GlobalID), Is.EqualTo(0));
82 Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0)); 83 Assert.That(pcm.GetOthersCount(lo.LandData.GlobalID), Is.EqualTo(0));
83 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, UUID.Zero), Is.EqualTo(1)); 84 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, userId), Is.EqualTo(1));
84 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0)); 85 Assert.That(pcm.GetUserCount(lo.LandData.GlobalID, dummyUserId), Is.EqualTo(0));
85 Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(1)); 86 Assert.That(pcm.GetSimulatorCount(lo.LandData.GlobalID), Is.EqualTo(1));
86 } 87 }