From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- OpenSim/Tests/Common/LongRunningAttribute.cs | 2 +- OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs | 4 ++-- OpenSim/Tests/Common/Mock/TestAssetService.cs | 4 ++-- OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 2 +- OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | 6 +++--- OpenSim/Tests/Common/Mock/TestLandChannel.cs | 4 ++-- OpenSim/Tests/Common/Mock/TestScene.cs | 6 +++--- OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs | 8 ++++---- OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs | 14 +++++++------- 9 files changed, 25 insertions(+), 25 deletions(-) (limited to 'OpenSim/Tests/Common') diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs index 37cbbcd..9831ea8 100644 --- a/OpenSim/Tests/Common/LongRunningAttribute.cs +++ b/OpenSim/Tests/Common/LongRunningAttribute.cs @@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common } protected LongRunningAttribute(string category) : base(category) - { + { } } } diff --git a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs index 3981fe9..20ea18f 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetDataPlugin.cs @@ -39,7 +39,7 @@ namespace OpenSim.Tests.Common.Mock /// tests are single threaded. /// 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 FetchAssetMetadataSet(int start, int count) { return new List(count); } + public List FetchAssetMetadataSet(int start, int count) { return new List(count); } } } \ No newline at end of file diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs index 81f123a..317ec06 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetService.cs +++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs @@ -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; diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index de73663..013462e 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs @@ -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()); diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs index daef38b..0c7ebca 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs @@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common.Mock //// /// Inventory items /// - private Dictionary m_items = new Dictionary(); + private Dictionary m_items = new Dictionary(); /// /// 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 fetchActiveGestures(UUID avatarID) { return null; } } diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index f7eda68..01b5203 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs @@ -31,7 +31,7 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; namespace OpenSim.Tests.Common.Mock -{ +{ /// /// Land channel for test purposes /// @@ -40,7 +40,7 @@ namespace OpenSim.Tests.Common.Mock public List ParcelsNearPoint(Vector3 position) { return null; } public List 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; } diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 3fc22ba..22cfa2c 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs @@ -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 { diff --git a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs index 3528072..7e0c567 100644 --- a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs +++ b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs @@ -31,10 +31,10 @@ using OpenSim.Framework; using OpenSim.Services.Interfaces; namespace OpenSim.Tests.Common -{ +{ /// /// Utility functions for carrying out user inventory related tests. - /// + /// public static class UserInventoryTestUtils { public static readonly string PATH_DELIMITER = "/"; @@ -78,7 +78,7 @@ namespace OpenSim.Tests.Common /// /// /// The folder created. If the path contains multiple folders then the last one created is returned. - /// + /// 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; } } } \ No newline at end of file diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs index 4ad9926..3ca44a1 100644 --- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs +++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs @@ -31,12 +31,12 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Communications.Local; namespace OpenSim.Tests.Common.Setup -{ +{ /// /// Utility functions for carrying out user profile related tests. /// public static class UserProfileTestUtils - { + { /// /// Create a test user with a standard inventory /// @@ -51,7 +51,7 @@ namespace OpenSim.Tests.Common.Setup { UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); return CreateUserWithInventory(commsManager, userId, callback); - } + } /// /// Create a test user with a standard inventory @@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common.Setup /// 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; - } + } } } -- cgit v1.1