1 files changed, 128 insertions, 14 deletions

diff --git a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
index 5a60f22..f006db2 100644
--- a/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
+++ b/OpenSim/Region/CoreModules/World/Land/Tests/PrimCountModuleTests.cs
@@ -45,7 +45,8 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
     public class PrimCountModuleTests
     {
         protected UUID m_userId = new UUID("00000000-0000-0000-0000-100000000000");
-        protected UUID m_dummyUserId = new UUID("99999999-9999-9999-9999-999999999999");        
+        protected UUID m_groupId = new UUID("00000000-0000-0000-8888-000000000000");        
+        protected UUID m_otherUserId = new UUID("99999999-9999-9999-9999-999999999999");        
         protected TestScene m_scene;
         protected PrimCountModule m_pcm;
         protected ILandObject m_lo;
@@ -65,14 +66,11 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
         } 
         
         /// <summary>
-        /// Test count after a parcel owner owned object is added.
+        /// Test that counts before we do anything are correct.
         /// </summary>
         [Test]
-        public void TestAddOwnerObject()
+        public void TestInitialCounts()
         {
-            TestHelper.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();                                  
-                  
             IPrimCounts pc = m_lo.PrimCounts;
             
             Assert.That(pc.Owner, Is.EqualTo(0));
@@ -81,8 +79,20 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Total, Is.EqualTo(0));
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(0));
-            Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0));
-            Assert.That(pc.Simulator, Is.EqualTo(0));            
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
+            Assert.That(pc.Simulator, Is.EqualTo(0));              
+        }            
+        
+        /// <summary>
+        /// Test count after a parcel owner owned object is added.
+        /// </summary>
+        [Test]
+        public void TestAddOwnerObject()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();                                  
+                  
+            IPrimCounts pc = m_lo.PrimCounts;         
             
             SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x01);             
             m_scene.AddNewSceneObject(sog, false);
@@ -93,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Total, Is.EqualTo(3));
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
-            Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
             Assert.That(pc.Simulator, Is.EqualTo(3));            
             
             // Add a second object and retest
@@ -106,7 +116,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Total, Is.EqualTo(5));
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(5));
-            Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
             Assert.That(pc.Simulator, Is.EqualTo(5));              
         }
         
@@ -131,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Total, Is.EqualTo(6));
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(6));
-            Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
             Assert.That(pc.Simulator, Is.EqualTo(6));              
         }        
         
@@ -157,9 +167,113 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Total, Is.EqualTo(1));
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(1));
-            Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
+            Assert.That(pc.Simulator, Is.EqualTo(1));            
+        } 
+        
+        [Test]
+        public void TestAddGroupObject()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();                                  
+            
+            m_lo.DeedToGroup(m_groupId);
+                  
+            IPrimCounts pc = m_lo.PrimCounts;       
+            
+            SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, 0x01);             
+            sog.GroupID = m_groupId;
+            m_scene.AddNewSceneObject(sog, false);
+            
+            Assert.That(pc.Owner, Is.EqualTo(0));
+            Assert.That(pc.Group, Is.EqualTo(3));
+            Assert.That(pc.Others, Is.EqualTo(0));
+            Assert.That(pc.Total, Is.EqualTo(3));
+            Assert.That(pc.Selected, Is.EqualTo(0));
+            
+            // Is this desired behaviour?  Not totally sure.
+            Assert.That(pc.Users[m_userId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
+            
+            Assert.That(pc.Simulator, Is.EqualTo(3));             
+        }
+        
+        /// <summary>
+        /// Test count after a parcel owner owned object is removed.
+        /// </summary>
+        [Test]
+        public void TestRemoveGroupObject()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            
+            m_lo.DeedToGroup(m_groupId);
+            
+            IPrimCounts pc = m_lo.PrimCounts;
+            
+            SceneObjectGroup sogToKeep = SceneSetupHelpers.CreateSceneObject(1, m_userId, 0x1);
+            sogToKeep.GroupID = m_groupId;            
+            m_scene.AddNewSceneObject(sogToKeep, false);
+            
+            SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, m_userId, 0x10);
+            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.DeleteSceneObject(sogToDelete, false);
+            
+            Assert.That(pc.Owner, Is.EqualTo(0));
+            Assert.That(pc.Group, Is.EqualTo(1));
+            Assert.That(pc.Others, Is.EqualTo(0));
+            Assert.That(pc.Total, Is.EqualTo(1));
+            Assert.That(pc.Selected, Is.EqualTo(0));
+            Assert.That(pc.Users[m_userId], Is.EqualTo(1));
+            Assert.That(pc.Users[m_groupId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
+            Assert.That(pc.Simulator, Is.EqualTo(1));            
+        }        
+        
+        [Test]        
+        public void TestAddOthersObject()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();                                  
+                  
+            IPrimCounts pc = m_lo.PrimCounts;       
+            
+            SceneObjectGroup sog = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, 0x01);             
+            m_scene.AddNewSceneObject(sog, false);
+            
+            Assert.That(pc.Owner, Is.EqualTo(0));
+            Assert.That(pc.Group, Is.EqualTo(0));
+            Assert.That(pc.Others, Is.EqualTo(3));
+            Assert.That(pc.Total, Is.EqualTo(3));
+            Assert.That(pc.Selected, Is.EqualTo(0));
+            Assert.That(pc.Users[m_userId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(3));
+            Assert.That(pc.Simulator, Is.EqualTo(3));                          
+        }
+        
+        [Test]
+        public void TestRemoveOthersObject()
+        {
+            TestHelper.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+            
+            IPrimCounts pc = m_lo.PrimCounts;
+            
+            m_scene.AddNewSceneObject(SceneSetupHelpers.CreateSceneObject(1, m_otherUserId, 0x1), false);
+            SceneObjectGroup sogToDelete = SceneSetupHelpers.CreateSceneObject(3, m_otherUserId, 0x10);
+            m_scene.AddNewSceneObject(sogToDelete, false);            
+            m_scene.DeleteSceneObject(sogToDelete, false);
+            
+            Assert.That(pc.Owner, Is.EqualTo(0));
+            Assert.That(pc.Group, Is.EqualTo(0));
+            Assert.That(pc.Others, Is.EqualTo(1));
+            Assert.That(pc.Total, Is.EqualTo(1));
+            Assert.That(pc.Selected, Is.EqualTo(0));
+            Assert.That(pc.Users[m_userId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(1));
             Assert.That(pc.Simulator, Is.EqualTo(1));            
-        }     
+        }           
         
         /// <summary>
         /// Test the count is correct after is has been tainted.
@@ -181,7 +295,7 @@ namespace OpenSim.Region.CoreModules.World.Land.Tests
             Assert.That(pc.Total, Is.EqualTo(3));
             Assert.That(pc.Selected, Is.EqualTo(0));
             Assert.That(pc.Users[m_userId], Is.EqualTo(3));
-            Assert.That(pc.Users[m_dummyUserId], Is.EqualTo(0));
+            Assert.That(pc.Users[m_otherUserId], Is.EqualTo(0));
             Assert.That(pc.Simulator, Is.EqualTo(3));              
         }
     }