Formatting cleanup.

This commit is contained in:
Jeff Ames
2009-10-01 01:00:09 +09:00
parent 33515c75e4
commit ee205e7e81
223 changed files with 875 additions and 930 deletions

View File

@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common
}
protected LongRunningAttribute(string category) : base(category)
{
{
}
}
}

View File

@@ -39,7 +39,7 @@ namespace OpenSim.Tests.Common.Mock
/// tests are single threaded.
/// </summary>
public class TestAssetDataPlugin : BaseAssetRepository, IAssetDataPlugin
{
{
public string Version { get { return "0"; } }
public string Name { get { return "TestAssetDataPlugin"; } }
@@ -59,6 +59,6 @@ namespace OpenSim.Tests.Common.Mock
assets.Add(asset);
}
public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
}
}

View File

@@ -49,7 +49,7 @@ namespace OpenSim.Tests.Common.Mock
if (Assets.ContainsKey(id))
asset = Assets[id];
else
asset = null;
asset = null;
return asset;
}
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Mock
}
public bool Get(string id, object sender, AssetRetrieved handler)
{
{
handler(id, sender, Get(id));
return true;

View File

@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common.Mock
public TestCommunicationsManager(NetworkServersInfo serversInfo)
: base(serversInfo, null)
{
{
LocalUserServices lus = new LocalUserServices(991, 992, this);
lus.AddPlugin(new TemporaryUserProfilePlugin());

View File

@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common.Mock
//// <value>
/// Inventory items
/// </value>
private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();
private Dictionary<UUID, InventoryItemBase> m_items = new Dictionary<UUID, InventoryItemBase>();
/// <value>
/// User root folders
@@ -120,7 +120,7 @@ namespace OpenSim.Tests.Common.Mock
}
return folders;
}
}
public InventoryFolderBase getInventoryFolder(UUID folderId)
{
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Mock
public InventoryItemBase queryInventoryItem(UUID item)
{
return null;
}
}
public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }
}

View File

@@ -31,7 +31,7 @@ using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Tests.Common.Mock
{
{
/// <summary>
/// Land channel for test purposes
/// </summary>
@@ -40,7 +40,7 @@ namespace OpenSim.Tests.Common.Mock
public List<ILandObject> ParcelsNearPoint(Vector3 position) { return null; }
public List<ILandObject> AllParcels() { return null; }
public ILandObject GetLandObject(int x, int y) { return null; }
public ILandObject GetLandObject(int localID) { return null; }
public ILandObject GetLandObject(int localID) { return null; }
public ILandObject GetLandObject(float x, float y) { return null; }
public bool IsLandPrimCountTainted() { return false; }
public bool IsForcefulBansAllowed() { return false; }

View File

@@ -35,9 +35,9 @@ using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Scenes;
namespace OpenSim.Tests.Common.Mock
{
{
public class TestScene : Scene
{
{
public TestScene(
RegionInfo regInfo, AgentCircuitManager authen,
CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager,
@@ -60,7 +60,7 @@ namespace OpenSim.Tests.Common.Mock
{
reason = String.Empty;
return true;
}
}
public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
{

View File

@@ -31,10 +31,10 @@ using OpenSim.Framework;
using OpenSim.Services.Interfaces;
namespace OpenSim.Tests.Common
{
{
/// <summary>
/// Utility functions for carrying out user inventory related tests.
/// </summary>
/// </summary>
public static class UserInventoryTestUtils
{
public static readonly string PATH_DELIMITER = "/";
@@ -78,7 +78,7 @@ namespace OpenSim.Tests.Common
/// </param>
/// <returns>
/// The folder created. If the path contains multiple folders then the last one created is returned.
/// </returns>
/// </returns>
public static InventoryFolderBase CreateInventoryFolder(
IInventoryService inventoryService, InventoryFolderBase parentFolder, string path)
{
@@ -91,7 +91,7 @@ namespace OpenSim.Tests.Common
if (components.Length > 1)
return CreateInventoryFolder(inventoryService, newFolder, components[1]);
else
return newFolder;
return newFolder;
}
}
}

View File

@@ -31,12 +31,12 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Region.Communications.Local;
namespace OpenSim.Tests.Common.Setup
{
{
/// <summary>
/// Utility functions for carrying out user profile related tests.
/// </summary>
public static class UserProfileTestUtils
{
{
/// <summary>
/// Create a test user with a standard inventory
/// </summary>
@@ -51,7 +51,7 @@ namespace OpenSim.Tests.Common.Setup
{
UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
return CreateUserWithInventory(commsManager, userId, callback);
}
}
/// <summary>
/// Create a test user with a standard inventory
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Setup
/// <returns></returns>
public static CachedUserInfo CreateUserWithInventory(
CommunicationsManager commsManager, UUID userId, OnInventoryReceivedDelegate callback)
{
{
return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
}
@@ -84,8 +84,8 @@ namespace OpenSim.Tests.Common.Setup
public static CachedUserInfo CreateUserWithInventory(
CommunicationsManager commsManager, string firstName, string lastName,
UUID userId, OnInventoryReceivedDelegate callback)
{
LocalUserServices lus = (LocalUserServices)commsManager.UserService;
{
LocalUserServices lus = (LocalUserServices)commsManager.UserService;
lus.AddUser(firstName, lastName, "troll", "bill@bailey.com", 1000, 1000, userId);
CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
@@ -93,6 +93,6 @@ namespace OpenSim.Tests.Common.Setup
userInfo.FetchInventory();
return userInfo;
}
}
}
}