* Simplify test code by always setting up mock 'in memory' user and inventory data plugins for every TestCommunicationsManager

* imo the gain in simplcity of test code outweighs the very small cost of setting up some stuff that some tests will never use

3 files changed, 22 insertions, 51 deletions

diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 807afcc..44a28a2 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Communications.Tests
             UUID nonExistingUserId = UUID.Parse("00000000-0000-0000-0000-000000000001");
             UUID existingUserId = UUID.Parse("00000000-0000-0000-0000-000000000002");
             
-            CommunicationsManager commsManager = UserProfileTestUtils.SetupServices();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo existingUserInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, existingUserId);
             
             Assert.That(existingUserInfo, Is.Not.Null, "Existing user info unexpectedly not found");
@@ -68,7 +68,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestRequestInventoryForUser()
         {
-            CommunicationsManager commsManager = UserProfileTestUtils.SetupServices();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);          
             
             Assert.That(userInfo.HasReceivedInventory, Is.True);
@@ -80,7 +80,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestGetChildFolder()
         {
-            CommunicationsManager commsManager = UserProfileTestUtils.SetupServices();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000011");
@@ -96,12 +96,12 @@ namespace OpenSim.Framework.Communications.Tests
         /// </summary>
         [Test]
         public void TestCreateFolder()
-        {
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+        {           
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folderId = UUID.Parse("00000000-0000-0000-0000-000000000010");            
@@ -129,11 +129,11 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestUpdateFolder()
         {
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
@@ -188,11 +188,11 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestMoveFolder()
         {
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
 
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000020");
@@ -226,11 +226,11 @@ namespace OpenSim.Framework.Communications.Tests
         {
             //log4net.Config.XmlConfigurator.Configure();
             
-            IUserDataPlugin userDataPlugin = new TestUserDataPlugin();
-            IInventoryDataPlugin inventoryDataPlugin = new TestInventoryDataPlugin();
+            TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            
+            IUserDataPlugin userDataPlugin = commsManager.UserDataPlugin;
+            IInventoryDataPlugin inventoryDataPlugin = commsManager.InventoryDataPlugin;
             
-            CommunicationsManager commsManager 
-                = UserProfileTestUtils.SetupServices(userDataPlugin, inventoryDataPlugin);
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager);
             
             UUID folder1Id = UUID.Parse("00000000-0000-0000-0000-000000000070");
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
index ea209fd..cf07ae5 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
@@ -37,33 +37,7 @@ namespace OpenSim.Framework.Communications.Tests
     /// Utility functions for carrying out user profile relate tests.
     /// </summary>
     public class UserProfileTestUtils
-    {
-        /// <summary>
-        /// Set up standard services required for user tests.
-        /// </summary>
-        /// <returns>CommunicationsManager used to access these services</returns>
-        public static CommunicationsManager SetupServices()
-        {
-            return SetupServices(new TestUserDataPlugin(), new TestInventoryDataPlugin());
-        }
-        
-        /// <summary>
-        /// Set up standard services required for user tests.
-        /// </summary>
-        /// <param name="userDataPlugin"></param>
-        /// <param name="inventoryDataPlugin"></param>
-        /// <returns>CommunicationsManager used to access these services</returns>
-        public static CommunicationsManager SetupServices(
-            IUserDataPlugin userDataPlugin, IInventoryDataPlugin inventoryDataPlugin)
-        {
-            CommunicationsManager commsManager = new TestCommunicationsManager();
-            
-            ((LocalUserServices)commsManager.UserService).AddPlugin(userDataPlugin);
-            ((LocalInventoryService)commsManager.InventoryService).AddPlugin(inventoryDataPlugin);
-            
-            return commsManager;
-        }
-        
+    {           
         /// <summary>
         /// Create a test user with a standard inventory
         /// </summary>
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 51adba1..1e1fa73 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework.Communications.Tests
         [Test]
         public void TestNormalLoginResponse()
         {
-            log4net.Config.XmlConfigurator.Configure();
+            //log4net.Config.XmlConfigurator.Configure();
             
             string firstName = "Timmy";
             string lastName = "Mallet";
@@ -58,9 +58,6 @@ namespace OpenSim.Framework.Communications.Tests
             CommunicationsManager commsManager 
                 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43));
             
-            ((LocalUserServices)commsManager.UserService).AddPlugin(new TestUserDataPlugin());
-            ((LocalInventoryService)commsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
-            
             commsManager.GridService.RegisterRegion(
                 new RegionInfo(42, 43, new IPEndPoint(IPAddress.Loopback, 9000), "localhost"));
             commsManager.GridService.RegionLoginsEnabled = true;