ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-13 05:05:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* imo the gain in simplcity of test code outweighs the very small cost of setting up some stuff that some tests will never use
This commit is contained in:
Justin Clarke Casey
2009-01-05 18:00:53 +00:00
parent 04ffcce7ea
commit 0b07c9762b
5 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
View File

@@ -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");

28
OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
View File

@@ -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>

5
OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
View File

@@ -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;