1 files changed, 39 insertions, 42 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
index 119a677..4e3b7e5 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/MockScene.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/Tests/HGUserManagementModuleTests.cs
@@ -25,54 +25,51 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using System.Net;
+using System;
+using Nini.Config;
+using NUnit.Framework;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Framework.Scenes;
-using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Region.CoreModules.Framework.UserManagement;
+using OpenSim.Tests.Common;
 
-namespace OpenSim.Region.ClientStack.LindenUDP.Tests
+namespace OpenSim.Region.CoreModules.Framework.UserManagement.Tests
 {
-    /// <summary>
-    /// Mock scene for unit tests
-    /// </summary>
-    public class MockScene : SceneBase
-    {
-        public int ObjectNameCallsReceived
-        {
-            get { return m_objectNameCallsReceived; }
-        }
-        protected int m_objectNameCallsReceived;
-        
-        public MockScene() : base(new RegionInfo(1000, 1000, null, null))
-        {
-            m_regStatus = RegionStatus.Up;
-        }
-        
-        public override void Update(int frames) {}
-        public override void LoadWorldMap() {}
-        
-        public override ISceneAgent AddNewClient(IClientAPI client, PresenceType type)
-        {
-            client.OnObjectName += RecordObjectNameCall;
-
-            // FIXME
-            return null;
-        }
-        
-        public override void RemoveClient(UUID agentID, bool someReason) {}
-//        public override void CloseAllAgents(uint circuitcode) {}
-        public override bool CheckClient(UUID clientId, IPEndPoint endPoint) { return true; }
-        public override void OtherRegionUp(GridRegion otherRegion) {  }
-
-        public override bool TryGetScenePresence(UUID uuid, out ScenePresence sp) { sp = null; return false; }
-            
+    [TestFixture]
+    public class HGUserManagementModuleTests : OpenSimTestCase
+    {    
         /// <summary>
-        /// Doesn't really matter what the call is - we're using this to test that a packet has actually been received
+        /// Test that a new HG agent (i.e. one without a user account) has their name cached in the UMM upon creation.
         /// </summary>
-        protected void RecordObjectNameCall(IClientAPI remoteClient, uint localID, string message)
+        [Test]
+        public void TestCachedUserNameForNewAgent()
         {
-            m_objectNameCallsReceived++;
+            TestHelpers.InMethod();
+//            TestHelpers.EnableLogging();
+
+            HGUserManagementModule hgumm = new HGUserManagementModule();
+            UUID userId = TestHelpers.ParseStem("11");
+            string firstName = "Fred";
+            string lastName = "Astaire";
+            string homeUri = "example.com";
+
+            IConfigSource config = new IniConfigSource();
+            config.AddConfig("Modules");
+            config.Configs["Modules"].Set("UserManagementModule", hgumm.Name);
+
+            SceneHelpers sceneHelpers = new SceneHelpers();
+            TestScene scene = sceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(scene, config, hgumm);
+
+            AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId);
+            acd.firstname = firstName;
+            acd.lastname = lastName;
+            acd.ServiceURLs["HomeURI"] = "http://" + homeUri;
+
+            SceneHelpers.AddScenePresence(scene, acd);
+
+            string name = hgumm.GetUserName(userId);
+            Assert.That(name, Is.EqualTo(string.Format("{0}.{1} @{2}", firstName, lastName, homeUri)));
         }
     }
-}
+}
\ No newline at end of file