diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Tests/Common | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
25 files changed, 238 insertions, 238 deletions
diff --git a/OpenSim/Tests/Common/DatabaseTestAttribute.cs b/OpenSim/Tests/Common/DatabaseTestAttribute.cs index d027d59..d6a03cd 100644 --- a/OpenSim/Tests/Common/DatabaseTestAttribute.cs +++ b/OpenSim/Tests/Common/DatabaseTestAttribute.cs | |||
@@ -32,13 +32,13 @@ using NUnit.Framework; | |||
32 | 32 | ||
33 | namespace OpenSim.Tests.Common | 33 | namespace OpenSim.Tests.Common |
34 | { | 34 | { |
35 | [AttributeUsage(AttributeTargets.All, | 35 | [AttributeUsage(AttributeTargets.All, |
36 | AllowMultiple=false, | 36 | AllowMultiple=false, |
37 | Inherited=true)] | 37 | Inherited=true)] |
38 | public class DatabaseTestAttribute : LongRunningAttribute | 38 | public class DatabaseTestAttribute : LongRunningAttribute |
39 | { | 39 | { |
40 | public DatabaseTestAttribute() : base("Database") | 40 | public DatabaseTestAttribute() : base("Database") |
41 | { | 41 | { |
42 | } | 42 | } |
43 | } | 43 | } |
44 | } \ No newline at end of file | 44 | } \ No newline at end of file |
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs index 7af8bed..974da4c 100644 --- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Tests.Common | |||
66 | { | 66 | { |
67 | return CreateAsset(assetId, AssetType.Notecard, text, UUID.Random()); | 67 | return CreateAsset(assetId, AssetType.Notecard, text, UUID.Random()); |
68 | } | 68 | } |
69 | 69 | ||
70 | // /// <summary> | 70 | // /// <summary> |
71 | // /// Create and store a notecard asset with a random uuid and dummy text. | 71 | // /// Create and store a notecard asset with a random uuid and dummy text. |
72 | // /// </summary> | 72 | // /// </summary> |
@@ -92,7 +92,7 @@ namespace OpenSim.Tests.Common | |||
92 | { | 92 | { |
93 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog); | 93 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), sog); |
94 | } | 94 | } |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
97 | /// Create an asset from the given object. | 97 | /// Create an asset from the given object. |
98 | /// </summary> | 98 | /// </summary> |
@@ -102,12 +102,12 @@ namespace OpenSim.Tests.Common | |||
102 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) | 102 | public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog) |
103 | { | 103 | { |
104 | return CreateAsset( | 104 | return CreateAsset( |
105 | assetUuid, | 105 | assetUuid, |
106 | AssetType.Object, | 106 | AssetType.Object, |
107 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), | 107 | Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), |
108 | sog.OwnerID); | 108 | sog.OwnerID); |
109 | } | 109 | } |
110 | 110 | ||
111 | /// <summary> | 111 | /// <summary> |
112 | /// Create an asset from the given scene object. | 112 | /// Create an asset from the given scene object. |
113 | /// </summary> | 113 | /// </summary> |
@@ -120,8 +120,8 @@ namespace OpenSim.Tests.Common | |||
120 | public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa) | 120 | public static AssetBase CreateAsset(int assetUuidTail, CoalescedSceneObjects coa) |
121 | { | 121 | { |
122 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa); | 122 | return CreateAsset(new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", assetUuidTail)), coa); |
123 | } | 123 | } |
124 | 124 | ||
125 | /// <summary> | 125 | /// <summary> |
126 | /// Create an asset from the given scene object. | 126 | /// Create an asset from the given scene object. |
127 | /// </summary> | 127 | /// </summary> |
@@ -131,12 +131,12 @@ namespace OpenSim.Tests.Common | |||
131 | public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa) | 131 | public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa) |
132 | { | 132 | { |
133 | return CreateAsset( | 133 | return CreateAsset( |
134 | assetUuid, | 134 | assetUuid, |
135 | AssetType.Object, | 135 | AssetType.Object, |
136 | Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), | 136 | Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), |
137 | coa.CreatorId); | 137 | coa.CreatorId); |
138 | } | 138 | } |
139 | 139 | ||
140 | /// <summary> | 140 | /// <summary> |
141 | /// Create an asset from the given data. | 141 | /// Create an asset from the given data. |
142 | /// </summary> | 142 | /// </summary> |
@@ -148,7 +148,7 @@ namespace OpenSim.Tests.Common | |||
148 | 148 | ||
149 | return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); | 149 | return CreateAsset(assetUuid, assetType, anc.AssetData, creatorID); |
150 | } | 150 | } |
151 | 151 | ||
152 | /// <summary> | 152 | /// <summary> |
153 | /// Create an asset from the given data. | 153 | /// Create an asset from the given data. |
154 | /// </summary> | 154 | /// </summary> |
@@ -158,9 +158,9 @@ namespace OpenSim.Tests.Common | |||
158 | asset.Data = data; | 158 | asset.Data = data; |
159 | return asset; | 159 | return asset; |
160 | } | 160 | } |
161 | 161 | ||
162 | public static string ReadAssetAsString(IAssetService assetService, UUID uuid) | 162 | public static string ReadAssetAsString(IAssetService assetService, UUID uuid) |
163 | { | 163 | { |
164 | byte[] assetData = assetService.GetData(uuid.ToString()); | 164 | byte[] assetData = assetService.GetData(uuid.ToString()); |
165 | return Encoding.ASCII.GetString(assetData); | 165 | return Encoding.ASCII.GetString(assetData); |
166 | } | 166 | } |
diff --git a/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs b/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs index 82ecf9a..b27c719 100644 --- a/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/BaseRequestHandlerHelpers.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Tests.Common | |||
59 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(null), "Failed on null."); | 59 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(null), "Failed on null."); |
60 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(""), "Failed on empty path."); | 60 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(""), "Failed on empty path."); |
61 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams("corruptUrl"), "Failed on corrupt url."); | 61 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams("corruptUrl"), "Failed on corrupt url."); |
62 | 62 | ||
63 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath), "Failed on empty params."); | 63 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath), "Failed on empty params."); |
64 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath + "/"), "Failed on single slash."); | 64 | Assert.AreEqual(m_emptyStringArray, handler.SplitParams(assetsPath + "/"), "Failed on single slash."); |
65 | 65 | ||
diff --git a/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs b/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs index df9f6f2..753830f 100644 --- a/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/ClientStackHelpers.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Tests.Common | |||
48 | { | 48 | { |
49 | public static ScenePresence AddChildClient( | 49 | public static ScenePresence AddChildClient( |
50 | Scene scene, LLUDPServer udpServer, UUID agentId, UUID sessionId, uint circuitCode) | 50 | Scene scene, LLUDPServer udpServer, UUID agentId, UUID sessionId, uint circuitCode) |
51 | { | 51 | { |
52 | IPEndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999); | 52 | IPEndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999); |
53 | 53 | ||
54 | UseCircuitCodePacket uccp = new UseCircuitCodePacket(); | 54 | UseCircuitCodePacket uccp = new UseCircuitCodePacket(); |
diff --git a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs index 1f6233d..b0c9596 100644 --- a/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/EntityTransferHelpers.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common | |||
56 | /// </summary> | 56 | /// </summary> |
57 | /// <param name='tc'></param> | 57 | /// <param name='tc'></param> |
58 | /// <param name='neighbourTcs'> | 58 | /// <param name='neighbourTcs'> |
59 | /// A list that will be populated with any TestClients set up in response to | 59 | /// A list that will be populated with any TestClients set up in response to |
60 | /// being informed about a destination region. | 60 | /// being informed about a destination region. |
61 | /// </param> | 61 | /// </param> |
62 | public static void SetupInformClientOfNeighbourTriggersNeighbourClientCreate( | 62 | public static void SetupInformClientOfNeighbourTriggersNeighbourClientCreate( |
@@ -71,7 +71,7 @@ namespace OpenSim.Tests.Common | |||
71 | Util.RegionHandleToRegionLoc(neighbourHandle, out x, out y); | 71 | Util.RegionHandleToRegionLoc(neighbourHandle, out x, out y); |
72 | 72 | ||
73 | m_log.DebugFormat( | 73 | m_log.DebugFormat( |
74 | "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}", | 74 | "[TEST CLIENT]: Processing inform client of neighbour located at {0},{1} at {2}", |
75 | x, y, neighbourExternalEndPoint); | 75 | x, y, neighbourExternalEndPoint); |
76 | 76 | ||
77 | AgentCircuitData newAgent = tc.RequestClientInfo(); | 77 | AgentCircuitData newAgent = tc.RequestClientInfo(); |
@@ -91,20 +91,20 @@ namespace OpenSim.Tests.Common | |||
91 | /// </summary> | 91 | /// </summary> |
92 | /// <param name='tc'></param> | 92 | /// <param name='tc'></param> |
93 | /// <param name='neighbourTcs'> | 93 | /// <param name='neighbourTcs'> |
94 | /// A list that will be populated with any TestClients set up in response to | 94 | /// A list that will be populated with any TestClients set up in response to |
95 | /// being informed about a destination region. | 95 | /// being informed about a destination region. |
96 | /// </param> | 96 | /// </param> |
97 | public static void SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement( | 97 | public static void SetupSendRegionTeleportTriggersDestinationClientCreateAndCompleteMovement( |
98 | TestClient client, List<TestClient> destinationClients) | 98 | TestClient client, List<TestClient> destinationClients) |
99 | { | 99 | { |
100 | client.OnTestClientSendRegionTeleport | 100 | client.OnTestClientSendRegionTeleport |
101 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) => | 101 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) => |
102 | { | 102 | { |
103 | uint x, y; | 103 | uint x, y; |
104 | Util.RegionHandleToRegionLoc(regionHandle, out x, out y); | 104 | Util.RegionHandleToRegionLoc(regionHandle, out x, out y); |
105 | 105 | ||
106 | m_log.DebugFormat( | 106 | m_log.DebugFormat( |
107 | "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}", | 107 | "[TEST CLIENT]: Processing send region teleport for destination at {0},{1} at {2}", |
108 | x, y, regionExternalEndPoint); | 108 | x, y, regionExternalEndPoint); |
109 | 109 | ||
110 | AgentCircuitData newAgent = client.RequestClientInfo(); | 110 | AgentCircuitData newAgent = client.RequestClientInfo(); |
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index f8485e0..fbd7e90 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Tests.Common | |||
102 | 102 | ||
103 | m_physicsScene = StartPhysicsScene(); | 103 | m_physicsScene = StartPhysicsScene(); |
104 | 104 | ||
105 | SimDataService | 105 | SimDataService |
106 | = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null); | 106 | = OpenSim.Server.Base.ServerUtils.LoadPlugin<ISimulationDataService>("OpenSim.Tests.Common.dll", null); |
107 | } | 107 | } |
108 | 108 | ||
@@ -146,7 +146,7 @@ namespace OpenSim.Tests.Common | |||
146 | 146 | ||
147 | // We must set up a console otherwise setup of some modules may fail | 147 | // We must set up a console otherwise setup of some modules may fail |
148 | MainConsole.Instance = new MockConsole(); | 148 | MainConsole.Instance = new MockConsole(); |
149 | 149 | ||
150 | RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); | 150 | RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1"); |
151 | regInfo.RegionName = name; | 151 | regInfo.RegionName = name; |
152 | regInfo.RegionID = id; | 152 | regInfo.RegionID = id; |
@@ -199,13 +199,13 @@ namespace OpenSim.Tests.Common | |||
199 | m_presenceService.AddRegion(testScene); | 199 | m_presenceService.AddRegion(testScene); |
200 | m_presenceService.RegionLoaded(testScene); | 200 | m_presenceService.RegionLoaded(testScene); |
201 | testScene.AddRegionModule(m_presenceService.Name, m_presenceService); | 201 | testScene.AddRegionModule(m_presenceService.Name, m_presenceService); |
202 | 202 | ||
203 | 203 | ||
204 | testScene.SetModuleInterfaces(); | 204 | testScene.SetModuleInterfaces(); |
205 | 205 | ||
206 | testScene.LandChannel = new TestLandChannel(testScene); | 206 | testScene.LandChannel = new TestLandChannel(testScene); |
207 | testScene.LoadWorldMap(); | 207 | testScene.LoadWorldMap(); |
208 | 208 | ||
209 | testScene.LoginsEnabled = true; | 209 | testScene.LoginsEnabled = true; |
210 | testScene.RegisterRegionWithGrid(); | 210 | testScene.RegisterRegionWithGrid(); |
211 | 211 | ||
@@ -217,10 +217,10 @@ namespace OpenSim.Tests.Common | |||
217 | private static LocalAssetServicesConnector StartAssetService(CoreAssetCache cache) | 217 | private static LocalAssetServicesConnector StartAssetService(CoreAssetCache cache) |
218 | { | 218 | { |
219 | IConfigSource config = new IniConfigSource(); | 219 | IConfigSource config = new IniConfigSource(); |
220 | config.AddConfig("Modules"); | 220 | config.AddConfig("Modules"); |
221 | config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); | 221 | config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); |
222 | config.AddConfig("AssetService"); | 222 | config.AddConfig("AssetService"); |
223 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); | 223 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); |
224 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 224 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
225 | 225 | ||
226 | LocalAssetServicesConnector assetService = new LocalAssetServicesConnector(); | 226 | LocalAssetServicesConnector assetService = new LocalAssetServicesConnector(); |
@@ -235,7 +235,7 @@ namespace OpenSim.Tests.Common | |||
235 | 235 | ||
236 | cache.Initialise(cacheConfig); | 236 | cache.Initialise(cacheConfig); |
237 | } | 237 | } |
238 | 238 | ||
239 | return assetService; | 239 | return assetService; |
240 | } | 240 | } |
241 | 241 | ||
@@ -257,7 +257,7 @@ namespace OpenSim.Tests.Common | |||
257 | 257 | ||
258 | private static LocalInventoryServicesConnector StartInventoryService() | 258 | private static LocalInventoryServicesConnector StartInventoryService() |
259 | { | 259 | { |
260 | IConfigSource config = new IniConfigSource(); | 260 | IConfigSource config = new IniConfigSource(); |
261 | config.AddConfig("Modules"); | 261 | config.AddConfig("Modules"); |
262 | config.AddConfig("InventoryService"); | 262 | config.AddConfig("InventoryService"); |
263 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); | 263 | config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); |
@@ -266,8 +266,8 @@ namespace OpenSim.Tests.Common | |||
266 | 266 | ||
267 | LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector(); | 267 | LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector(); |
268 | inventoryService.Initialise(config); | 268 | inventoryService.Initialise(config); |
269 | 269 | ||
270 | return inventoryService; | 270 | return inventoryService; |
271 | } | 271 | } |
272 | 272 | ||
273 | private static LocalGridServicesConnector StartGridService() | 273 | private static LocalGridServicesConnector StartGridService() |
@@ -282,7 +282,7 @@ namespace OpenSim.Tests.Common | |||
282 | 282 | ||
283 | LocalGridServicesConnector gridService = new LocalGridServicesConnector(); | 283 | LocalGridServicesConnector gridService = new LocalGridServicesConnector(); |
284 | gridService.Initialise(config); | 284 | gridService.Initialise(config); |
285 | 285 | ||
286 | return gridService; | 286 | return gridService; |
287 | } | 287 | } |
288 | 288 | ||
@@ -303,7 +303,7 @@ namespace OpenSim.Tests.Common | |||
303 | 303 | ||
304 | LocalUserAccountServicesConnector userAccountService = new LocalUserAccountServicesConnector(); | 304 | LocalUserAccountServicesConnector userAccountService = new LocalUserAccountServicesConnector(); |
305 | userAccountService.Initialise(config); | 305 | userAccountService.Initialise(config); |
306 | 306 | ||
307 | return userAccountService; | 307 | return userAccountService; |
308 | } | 308 | } |
309 | 309 | ||
@@ -328,7 +328,7 @@ namespace OpenSim.Tests.Common | |||
328 | 328 | ||
329 | LocalPresenceServicesConnector presenceService = new LocalPresenceServicesConnector(); | 329 | LocalPresenceServicesConnector presenceService = new LocalPresenceServicesConnector(); |
330 | presenceService.Initialise(config); | 330 | presenceService.Initialise(config); |
331 | 331 | ||
332 | return presenceService; | 332 | return presenceService; |
333 | } | 333 | } |
334 | 334 | ||
@@ -384,8 +384,8 @@ namespace OpenSim.Tests.Common | |||
384 | /// </summary> | 384 | /// </summary> |
385 | /// <remarks> | 385 | /// <remarks> |
386 | /// If called directly, then all the modules must be shared modules. | 386 | /// If called directly, then all the modules must be shared modules. |
387 | /// | 387 | /// |
388 | /// We are emulating here the normal calls made to setup region modules | 388 | /// We are emulating here the normal calls made to setup region modules |
389 | /// (Initialise(), PostInitialise(), AddRegion, RegionLoaded()). | 389 | /// (Initialise(), PostInitialise(), AddRegion, RegionLoaded()). |
390 | /// TODO: Need to reuse normal runtime module code. | 390 | /// TODO: Need to reuse normal runtime module code. |
391 | /// </remarks> | 391 | /// </remarks> |
@@ -655,7 +655,7 @@ namespace OpenSim.Tests.Common | |||
655 | 655 | ||
656 | return so; | 656 | return so; |
657 | } | 657 | } |
658 | 658 | ||
659 | /// <summary> | 659 | /// <summary> |
660 | /// Create a scene object part. | 660 | /// Create a scene object part. |
661 | /// </summary> | 661 | /// </summary> |
@@ -664,10 +664,10 @@ namespace OpenSim.Tests.Common | |||
664 | /// <param name="ownerId"></param> | 664 | /// <param name="ownerId"></param> |
665 | /// <returns></returns> | 665 | /// <returns></returns> |
666 | public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId) | 666 | public static SceneObjectPart CreateSceneObjectPart(string name, UUID id, UUID ownerId) |
667 | { | 667 | { |
668 | return new SceneObjectPart( | 668 | return new SceneObjectPart( |
669 | ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 669 | ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
670 | { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) }; | 670 | { Name = name, UUID = id, Scale = new Vector3(1, 1, 1) }; |
671 | } | 671 | } |
672 | 672 | ||
673 | /// <summary> | 673 | /// <summary> |
@@ -682,10 +682,10 @@ namespace OpenSim.Tests.Common | |||
682 | /// <param name="ownerId"></param> | 682 | /// <param name="ownerId"></param> |
683 | /// <returns></returns> | 683 | /// <returns></returns> |
684 | public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId) | 684 | public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId) |
685 | { | 685 | { |
686 | return CreateSceneObject(parts, ownerId, 0x1); | 686 | return CreateSceneObject(parts, ownerId, 0x1); |
687 | } | 687 | } |
688 | 688 | ||
689 | /// <summary> | 689 | /// <summary> |
690 | /// Create a scene object but do not add it to the scene. | 690 | /// Create a scene object but do not add it to the scene. |
691 | /// </summary> | 691 | /// </summary> |
@@ -697,10 +697,10 @@ namespace OpenSim.Tests.Common | |||
697 | /// </param> | 697 | /// </param> |
698 | /// <returns></returns> | 698 | /// <returns></returns> |
699 | public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, int uuidTail) | 699 | public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, int uuidTail) |
700 | { | 700 | { |
701 | return CreateSceneObject(parts, ownerId, "", uuidTail); | 701 | return CreateSceneObject(parts, ownerId, "", uuidTail); |
702 | } | 702 | } |
703 | 703 | ||
704 | /// <summary> | 704 | /// <summary> |
705 | /// Create a scene object but do not add it to the scene. | 705 | /// Create a scene object but do not add it to the scene. |
706 | /// </summary> | 706 | /// </summary> |
@@ -718,22 +718,22 @@ namespace OpenSim.Tests.Common | |||
718 | /// </param> | 718 | /// </param> |
719 | /// <returns></returns> | 719 | /// <returns></returns> |
720 | public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, string partNamePrefix, int uuidTail) | 720 | public static SceneObjectGroup CreateSceneObject(int parts, UUID ownerId, string partNamePrefix, int uuidTail) |
721 | { | 721 | { |
722 | string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail); | 722 | string rawSogId = string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail); |
723 | 723 | ||
724 | SceneObjectGroup sog | 724 | SceneObjectGroup sog |
725 | = new SceneObjectGroup( | 725 | = new SceneObjectGroup( |
726 | CreateSceneObjectPart(string.Format("{0}Part1", partNamePrefix), new UUID(rawSogId), ownerId)); | 726 | CreateSceneObjectPart(string.Format("{0}Part1", partNamePrefix), new UUID(rawSogId), ownerId)); |
727 | 727 | ||
728 | if (parts > 1) | 728 | if (parts > 1) |
729 | for (int i = 2; i <= parts; i++) | 729 | for (int i = 2; i <= parts; i++) |
730 | sog.AddPart( | 730 | sog.AddPart( |
731 | CreateSceneObjectPart( | 731 | CreateSceneObjectPart( |
732 | string.Format("{0}Part{1}", partNamePrefix, i), | 732 | string.Format("{0}Part{1}", partNamePrefix, i), |
733 | new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i - 1)), | 733 | new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail + i - 1)), |
734 | ownerId)); | 734 | ownerId)); |
735 | 735 | ||
736 | return sog; | 736 | return sog; |
737 | } | 737 | } |
738 | } | 738 | } |
739 | } | 739 | } |
diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs index 3a3b33a..e3110f6 100644 --- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs | |||
@@ -78,12 +78,12 @@ namespace OpenSim.Tests.Common | |||
78 | = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero); | 78 | = AssetHelpers.CreateAsset(assetID, AssetType.Notecard, nc.AssetData, UUID.Zero); |
79 | assetService.Store(ncAsset); | 79 | assetService.Store(ncAsset); |
80 | 80 | ||
81 | TaskInventoryItem ncItem | 81 | TaskInventoryItem ncItem |
82 | = new TaskInventoryItem | 82 | = new TaskInventoryItem |
83 | { Name = itemName, AssetID = assetID, ItemID = itemID, | 83 | { Name = itemName, AssetID = assetID, ItemID = itemID, |
84 | Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard }; | 84 | Type = (int)AssetType.Notecard, InvType = (int)InventoryType.Notecard }; |
85 | part.Inventory.AddInventoryItem(ncItem, true); | 85 | part.Inventory.AddInventoryItem(ncItem, true); |
86 | 86 | ||
87 | return ncItem; | 87 | return ncItem; |
88 | } | 88 | } |
89 | 89 | ||
@@ -119,7 +119,7 @@ namespace OpenSim.Tests.Common | |||
119 | { | 119 | { |
120 | return AddScript(assetService, part, UUID.Random(), UUID.Random(), scriptName, scriptSource); | 120 | return AddScript(assetService, part, UUID.Random(), UUID.Random(), scriptName, scriptSource); |
121 | } | 121 | } |
122 | 122 | ||
123 | /// <summary> | 123 | /// <summary> |
124 | /// Add a simple script to the given part. | 124 | /// Add a simple script to the given part. |
125 | /// </summary> | 125 | /// </summary> |
@@ -145,7 +145,7 @@ namespace OpenSim.Tests.Common | |||
145 | = AssetHelpers.CreateAsset(assetId, AssetType.LSLText, ast.AssetData, UUID.Zero); | 145 | = AssetHelpers.CreateAsset(assetId, AssetType.LSLText, ast.AssetData, UUID.Zero); |
146 | assetService.Store(asset); | 146 | assetService.Store(asset); |
147 | TaskInventoryItem item | 147 | TaskInventoryItem item |
148 | = new TaskInventoryItem | 148 | = new TaskInventoryItem |
149 | { Name = scriptName, AssetID = assetId, ItemID = itemId, | 149 | { Name = scriptName, AssetID = assetId, ItemID = itemId, |
150 | Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL }; | 150 | Type = (int)AssetType.LSLText, InvType = (int)InventoryType.LSL }; |
151 | part.Inventory.AddInventoryItem(item, true); | 151 | part.Inventory.AddInventoryItem(item, true); |
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs index c62b58e..e6af34b 100644 --- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim.Tests.Common | |||
83 | // /// </param> | 83 | // /// </param> |
84 | // /// <returns></returns> | 84 | // /// <returns></returns> |
85 | // public static CachedUserInfo CreateUserWithInventory( | 85 | // public static CachedUserInfo CreateUserWithInventory( |
86 | // CommunicationsManager commsManager, string firstName, string lastName, | 86 | // CommunicationsManager commsManager, string firstName, string lastName, |
87 | // UUID userId, OnInventoryReceivedDelegate callback) | 87 | // UUID userId, OnInventoryReceivedDelegate callback) |
88 | // { | 88 | // { |
89 | // return CreateUserWithInventory(commsManager, firstName, lastName, "troll", userId, callback); | 89 | // return CreateUserWithInventory(commsManager, firstName, lastName, "troll", userId, callback); |
@@ -147,7 +147,7 @@ namespace OpenSim.Tests.Common | |||
147 | CreateUserWithInventory(scene, ua, pw); | 147 | CreateUserWithInventory(scene, ua, pw); |
148 | return ua; | 148 | return ua; |
149 | } | 149 | } |
150 | 150 | ||
151 | public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw) | 151 | public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw) |
152 | { | 152 | { |
153 | // FIXME: This should really be set up by UserAccount itself | 153 | // FIXME: This should really be set up by UserAccount itself |
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index e7e145a..5a46201 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs | |||
@@ -101,7 +101,7 @@ namespace OpenSim.Tests.Common | |||
101 | Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId) | 101 | Scene scene, string itemName, UUID itemId, InventoryType itemType, AssetBase asset, UUID userId) |
102 | { | 102 | { |
103 | return AddInventoryItem( | 103 | return AddInventoryItem( |
104 | scene, itemName, itemId, itemType, asset, userId, | 104 | scene, itemName, itemId, itemType, asset, userId, |
105 | scene.InventoryService.GetFolderForType(userId, (FolderType)asset.Type).Name); | 105 | scene.InventoryService.GetFolderForType(userId, (FolderType)asset.Type).Name); |
106 | } | 106 | } |
107 | 107 | ||
@@ -128,7 +128,7 @@ namespace OpenSim.Tests.Common | |||
128 | item.Owner = userId; | 128 | item.Owner = userId; |
129 | item.AssetType = asset.Type; | 129 | item.AssetType = asset.Type; |
130 | item.InvType = (int)itemType; | 130 | item.InvType = (int)itemType; |
131 | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | | 131 | item.BasePermissions = (uint)OpenMetaverse.PermissionMask.All | |
132 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); | 132 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); |
133 | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | | 133 | item.CurrentPermissions = (uint)OpenMetaverse.PermissionMask.All | |
134 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); | 134 | (uint)(Framework.PermissionMask.foldedMask | Framework.PermissionMask.foldedCopy | Framework.PermissionMask.foldedModify | Framework.PermissionMask.foldedTransfer); |
@@ -211,7 +211,7 @@ namespace OpenSim.Tests.Common | |||
211 | /// </param> | 211 | /// </param> |
212 | /// <param name="useExistingFolders"> | 212 | /// <param name="useExistingFolders"> |
213 | /// If true, then folders in the path which already the same name are | 213 | /// If true, then folders in the path which already the same name are |
214 | /// used. This applies to the terminal folder as well. | 214 | /// used. This applies to the terminal folder as well. |
215 | /// If false, then all folders in the path are created, even if there is already a folder at a particular | 215 | /// If false, then all folders in the path are created, even if there is already a folder at a particular |
216 | /// level with the same name. | 216 | /// level with the same name. |
217 | /// </param> | 217 | /// </param> |
@@ -236,7 +236,7 @@ namespace OpenSim.Tests.Common | |||
236 | /// </param> | 236 | /// </param> |
237 | /// <param name="useExistingFolders"> | 237 | /// <param name="useExistingFolders"> |
238 | /// If true, then folders in the path which already the same name are | 238 | /// If true, then folders in the path which already the same name are |
239 | /// used. This applies to the terminal folder as well. | 239 | /// used. This applies to the terminal folder as well. |
240 | /// If false, then all folders in the path are created, even if there is already a folder at a particular | 240 | /// If false, then all folders in the path are created, even if there is already a folder at a particular |
241 | /// level with the same name. | 241 | /// level with the same name. |
242 | /// </param> | 242 | /// </param> |
@@ -259,7 +259,7 @@ namespace OpenSim.Tests.Common | |||
259 | /// Create inventory folders starting from a given parent folder | 259 | /// Create inventory folders starting from a given parent folder |
260 | /// </summary> | 260 | /// </summary> |
261 | /// <remarks> | 261 | /// <remarks> |
262 | /// If any stem of the path names folders that already exist then these are not recreated. This includes the | 262 | /// If any stem of the path names folders that already exist then these are not recreated. This includes the |
263 | /// final folder. | 263 | /// final folder. |
264 | /// TODO: May need to make it an option to create duplicate folders. | 264 | /// TODO: May need to make it an option to create duplicate folders. |
265 | /// </remarks> | 265 | /// </remarks> |
@@ -271,7 +271,7 @@ namespace OpenSim.Tests.Common | |||
271 | /// </param> | 271 | /// </param> |
272 | /// <param name="useExistingFolders"> | 272 | /// <param name="useExistingFolders"> |
273 | /// If true, then folders in the path which already the same name are | 273 | /// If true, then folders in the path which already the same name are |
274 | /// used. This applies to the terminal folder as well. | 274 | /// used. This applies to the terminal folder as well. |
275 | /// If false, then all folders in the path are created, even if there is already a folder at a particular | 275 | /// If false, then all folders in the path are created, even if there is already a folder at a particular |
276 | /// level with the same name. | 276 | /// level with the same name. |
277 | /// </param> | 277 | /// </param> |
@@ -299,10 +299,10 @@ namespace OpenSim.Tests.Common | |||
299 | else | 299 | else |
300 | folderIdForCreate = folderId; | 300 | folderIdForCreate = folderId; |
301 | 301 | ||
302 | folder | 302 | folder |
303 | = new InventoryFolderBase( | 303 | = new InventoryFolderBase( |
304 | folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); | 304 | folderIdForCreate, components[0], parentFolder.Owner, (short)AssetType.Unknown, parentFolder.ID, 0); |
305 | 305 | ||
306 | inventoryService.AddFolder(folder); | 306 | inventoryService.AddFolder(folder); |
307 | } | 307 | } |
308 | // else | 308 | // else |
diff --git a/OpenSim/Tests/Common/LongRunningAttribute.cs b/OpenSim/Tests/Common/LongRunningAttribute.cs index 9831ea8..6013fcb 100644 --- a/OpenSim/Tests/Common/LongRunningAttribute.cs +++ b/OpenSim/Tests/Common/LongRunningAttribute.cs | |||
@@ -35,11 +35,11 @@ namespace OpenSim.Tests.Common | |||
35 | [AttributeUsage(AttributeTargets.All, | 35 | [AttributeUsage(AttributeTargets.All, |
36 | AllowMultiple = false, | 36 | AllowMultiple = false, |
37 | Inherited = true)] | 37 | Inherited = true)] |
38 | public class LongRunningAttribute : CategoryAttribute | 38 | public class LongRunningAttribute : CategoryAttribute |
39 | { | 39 | { |
40 | public LongRunningAttribute() : this("Long Running Test") | 40 | public LongRunningAttribute() : this("Long Running Test") |
41 | { | 41 | { |
42 | 42 | ||
43 | } | 43 | } |
44 | 44 | ||
45 | protected LongRunningAttribute(string category) : base(category) | 45 | protected LongRunningAttribute(string category) : base(category) |
diff --git a/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs b/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs index cb4fb80..d0430ff 100644 --- a/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs +++ b/OpenSim/Tests/Common/Mock/BaseAssetRepository.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Tests.Common | |||
36 | { | 36 | { |
37 | protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>(); | 37 | protected Dictionary<UUID, AssetBase> Assets = new Dictionary<UUID, AssetBase>(); |
38 | 38 | ||
39 | public AssetBase FetchAsset(UUID uuid) | 39 | public AssetBase FetchAsset(UUID uuid) |
40 | { | 40 | { |
41 | if (AssetsExist(new[] { uuid })[0]) | 41 | if (AssetsExist(new[] { uuid })[0]) |
42 | return Assets[uuid]; | 42 | return Assets[uuid]; |
@@ -44,17 +44,17 @@ namespace OpenSim.Tests.Common | |||
44 | return null; | 44 | return null; |
45 | } | 45 | } |
46 | 46 | ||
47 | public void CreateAsset(AssetBase asset) | 47 | public void CreateAsset(AssetBase asset) |
48 | { | 48 | { |
49 | Assets[asset.FullID] = asset; | 49 | Assets[asset.FullID] = asset; |
50 | } | 50 | } |
51 | 51 | ||
52 | public void UpdateAsset(AssetBase asset) | 52 | public void UpdateAsset(AssetBase asset) |
53 | { | 53 | { |
54 | CreateAsset(asset); | 54 | CreateAsset(asset); |
55 | } | 55 | } |
56 | 56 | ||
57 | public bool[] AssetsExist(UUID[] uuids) | 57 | public bool[] AssetsExist(UUID[] uuids) |
58 | { | 58 | { |
59 | return Array.ConvertAll(uuids, id => Assets.ContainsKey(id)); | 59 | return Array.ConvertAll(uuids, id => Assets.ContainsKey(id)); |
60 | } | 60 | } |
diff --git a/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs b/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs index 7f530d0..e9deac7 100644 --- a/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs +++ b/OpenSim/Tests/Common/Mock/MockGroupsServicesConnector.cs | |||
@@ -85,8 +85,8 @@ namespace OpenSim.Tests.Common | |||
85 | { | 85 | { |
86 | } | 86 | } |
87 | 87 | ||
88 | public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, | 88 | public UUID CreateGroup(UUID requestingAgentID, string name, string charter, bool showInList, UUID insigniaID, |
89 | int membershipFee, bool openEnrollment, bool allowPublish, | 89 | int membershipFee, bool openEnrollment, bool allowPublish, |
90 | bool maturePublish, UUID founderID) | 90 | bool maturePublish, UUID founderID) |
91 | { | 91 | { |
92 | XGroup group = new XGroup() | 92 | XGroup group = new XGroup() |
@@ -118,13 +118,13 @@ namespace OpenSim.Tests.Common | |||
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, | 121 | public void UpdateGroup(UUID requestingAgentID, UUID groupID, string charter, bool showInList, |
122 | UUID insigniaID, int membershipFee, bool openEnrollment, | 122 | UUID insigniaID, int membershipFee, bool openEnrollment, |
123 | bool allowPublish, bool maturePublish) | 123 | bool allowPublish, bool maturePublish) |
124 | { | 124 | { |
125 | } | 125 | } |
126 | 126 | ||
127 | public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, | 127 | public void AddGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, |
128 | string title, ulong powers) | 128 | string title, ulong powers) |
129 | { | 129 | { |
130 | } | 130 | } |
@@ -133,7 +133,7 @@ namespace OpenSim.Tests.Common | |||
133 | { | 133 | { |
134 | } | 134 | } |
135 | 135 | ||
136 | public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, | 136 | public void UpdateGroupRole(UUID requestingAgentID, UUID groupID, UUID roleID, string name, string description, |
137 | string title, ulong powers) | 137 | string title, ulong powers) |
138 | { | 138 | { |
139 | } | 139 | } |
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Common | |||
144 | 144 | ||
145 | 145 | ||
146 | if (group == null) | 146 | if (group == null) |
147 | m_log.DebugFormat("[MOCK GROUPS SERVICES CONNECTOR]: No group found with ID {0}", groupID); | 147 | m_log.DebugFormat("[MOCK GROUPS SERVICES CONNECTOR]: No group found with ID {0}", groupID); |
148 | 148 | ||
149 | return group; | 149 | return group; |
150 | } | 150 | } |
@@ -152,7 +152,7 @@ namespace OpenSim.Tests.Common | |||
152 | public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID groupID, string groupName) | 152 | public GroupRecord GetGroupRecord(UUID requestingAgentID, UUID groupID, string groupName) |
153 | { | 153 | { |
154 | m_log.DebugFormat( | 154 | m_log.DebugFormat( |
155 | "[MOCK GROUPS SERVICES CONNECTOR]: Processing GetGroupRecord() for groupID {0}, name {1}", | 155 | "[MOCK GROUPS SERVICES CONNECTOR]: Processing GetGroupRecord() for groupID {0}, name {1}", |
156 | groupID, groupName); | 156 | groupID, groupName); |
157 | 157 | ||
158 | XGroup xg = GetXGroup(groupID, groupName); | 158 | XGroup xg = GetXGroup(groupID, groupName); |
@@ -194,7 +194,7 @@ namespace OpenSim.Tests.Common | |||
194 | public void SetAgentGroupInfo(UUID requestingAgentID, UUID agentID, UUID groupID, bool acceptNotices, bool listInProfile) | 194 | public void SetAgentGroupInfo(UUID requestingAgentID, UUID agentID, UUID groupID, bool acceptNotices, bool listInProfile) |
195 | { | 195 | { |
196 | m_log.DebugFormat( | 196 | m_log.DebugFormat( |
197 | "[MOCK GROUPS SERVICES CONNECTOR]: SetAgentGroupInfo, requestingAgentID {0}, agentID {1}, groupID {2}, acceptNotices {3}, listInProfile {4}", | 197 | "[MOCK GROUPS SERVICES CONNECTOR]: SetAgentGroupInfo, requestingAgentID {0}, agentID {1}, groupID {2}, acceptNotices {3}, listInProfile {4}", |
198 | requestingAgentID, agentID, groupID, acceptNotices, listInProfile); | 198 | requestingAgentID, agentID, groupID, acceptNotices, listInProfile); |
199 | 199 | ||
200 | XGroup group = GetXGroup(groupID, null); | 200 | XGroup group = GetXGroup(groupID, null); |
@@ -228,7 +228,7 @@ namespace OpenSim.Tests.Common | |||
228 | public void AddAgentToGroup(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID) | 228 | public void AddAgentToGroup(UUID requestingAgentID, UUID agentID, UUID groupID, UUID roleID) |
229 | { | 229 | { |
230 | m_log.DebugFormat( | 230 | m_log.DebugFormat( |
231 | "[MOCK GROUPS SERVICES CONNECTOR]: AddAgentToGroup, requestingAgentID {0}, agentID {1}, groupID {2}, roleID {3}", | 231 | "[MOCK GROUPS SERVICES CONNECTOR]: AddAgentToGroup, requestingAgentID {0}, agentID {1}, groupID {2}, roleID {3}", |
232 | requestingAgentID, agentID, groupID, roleID); | 232 | requestingAgentID, agentID, groupID, roleID); |
233 | 233 | ||
234 | XGroup group = GetXGroup(groupID, null); | 234 | XGroup group = GetXGroup(groupID, null); |
@@ -348,7 +348,7 @@ namespace OpenSim.Tests.Common | |||
348 | 348 | ||
349 | return notices; | 349 | return notices; |
350 | } | 350 | } |
351 | 351 | ||
352 | public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID) | 352 | public GroupNoticeInfo GetGroupNotice(UUID requestingAgentID, UUID noticeID) |
353 | { | 353 | { |
354 | m_log.DebugFormat( | 354 | m_log.DebugFormat( |
@@ -378,14 +378,14 @@ namespace OpenSim.Tests.Common | |||
378 | return gni; | 378 | return gni; |
379 | } | 379 | } |
380 | } | 380 | } |
381 | 381 | ||
382 | return null; | 382 | return null; |
383 | } | 383 | } |
384 | 384 | ||
385 | public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket) | 385 | public void AddGroupNotice(UUID requestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket) |
386 | { | 386 | { |
387 | m_log.DebugFormat( | 387 | m_log.DebugFormat( |
388 | "[MOCK GROUPS SERVICES CONNECTOR]: AddGroupNotice, requestingAgentID {0}, groupID {1}, noticeID {2}, fromName {3}, subject {4}, message {5}, binaryBucket.Length {6}", | 388 | "[MOCK GROUPS SERVICES CONNECTOR]: AddGroupNotice, requestingAgentID {0}, groupID {1}, noticeID {2}, fromName {3}, subject {4}, message {5}, binaryBucket.Length {6}", |
389 | requestingAgentID, groupID, noticeID, fromName, subject, message, binaryBucket.Length); | 389 | requestingAgentID, groupID, noticeID, fromName, subject, message, binaryBucket.Length); |
390 | 390 | ||
391 | XGroup group = GetXGroup(groupID, null); | 391 | XGroup group = GetXGroup(groupID, null); |
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs index 8daa19d..a73a0b8 100644 --- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs | |||
@@ -174,15 +174,15 @@ namespace OpenSim.Data.Null | |||
174 | public class NullDataStore : ISimulationDataStore | 174 | public class NullDataStore : ISimulationDataStore |
175 | { | 175 | { |
176 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 176 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
177 | 177 | ||
178 | protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); | 178 | protected Dictionary<UUID, RegionSettings> m_regionSettings = new Dictionary<UUID, RegionSettings>(); |
179 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); | 179 | protected Dictionary<UUID, SceneObjectPart> m_sceneObjectParts = new Dictionary<UUID, SceneObjectPart>(); |
180 | protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems | 180 | protected Dictionary<UUID, ICollection<TaskInventoryItem>> m_primItems |
181 | = new Dictionary<UUID, ICollection<TaskInventoryItem>>(); | 181 | = new Dictionary<UUID, ICollection<TaskInventoryItem>>(); |
182 | protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>(); | 182 | protected Dictionary<UUID, TerrainData> m_terrains = new Dictionary<UUID, TerrainData>(); |
183 | protected Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>(); | 183 | protected Dictionary<UUID, TerrainData> m_bakedterrains = new Dictionary<UUID, TerrainData>(); |
184 | protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>(); | 184 | protected Dictionary<UUID, LandData> m_landData = new Dictionary<UUID, LandData>(); |
185 | 185 | ||
186 | public void Initialise(string dbfile) | 186 | public void Initialise(string dbfile) |
187 | { | 187 | { |
188 | return; | 188 | return; |
@@ -196,14 +196,14 @@ namespace OpenSim.Data.Null | |||
196 | { | 196 | { |
197 | m_regionSettings[rs.RegionUUID] = rs; | 197 | m_regionSettings[rs.RegionUUID] = rs; |
198 | } | 198 | } |
199 | 199 | ||
200 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) | 200 | public RegionLightShareData LoadRegionWindlightSettings(UUID regionUUID) |
201 | { | 201 | { |
202 | //This connector doesn't support the windlight module yet | 202 | //This connector doesn't support the windlight module yet |
203 | //Return default LL windlight settings | 203 | //Return default LL windlight settings |
204 | return new RegionLightShareData(); | 204 | return new RegionLightShareData(); |
205 | } | 205 | } |
206 | 206 | ||
207 | public void RemoveRegionWindlightSettings(UUID regionID) | 207 | public void RemoveRegionWindlightSettings(UUID regionID) |
208 | { | 208 | { |
209 | } | 209 | } |
@@ -238,7 +238,7 @@ namespace OpenSim.Data.Null | |||
238 | 238 | ||
239 | if (rs == null) | 239 | if (rs == null) |
240 | rs = new RegionSettings(); | 240 | rs = new RegionSettings(); |
241 | 241 | ||
242 | return rs; | 242 | return rs; |
243 | } | 243 | } |
244 | 244 | ||
@@ -250,9 +250,9 @@ namespace OpenSim.Data.Null | |||
250 | foreach (SceneObjectPart prim in obj.Parts) | 250 | foreach (SceneObjectPart prim in obj.Parts) |
251 | { | 251 | { |
252 | // m_log.DebugFormat( | 252 | // m_log.DebugFormat( |
253 | // "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", | 253 | // "[MOCK REGION DATA PLUGIN]: Storing part {0} {1} in object {2} {3} in region {4}", |
254 | // prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID); | 254 | // prim.Name, prim.UUID, obj.Name, obj.UUID, regionUUID); |
255 | 255 | ||
256 | m_sceneObjectParts[prim.UUID] = prim; | 256 | m_sceneObjectParts[prim.UUID] = prim; |
257 | } | 257 | } |
258 | } | 258 | } |
@@ -266,7 +266,7 @@ namespace OpenSim.Data.Null | |||
266 | if (part.ParentGroup.UUID == obj) | 266 | if (part.ParentGroup.UUID == obj) |
267 | { | 267 | { |
268 | // m_log.DebugFormat( | 268 | // m_log.DebugFormat( |
269 | // "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", | 269 | // "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", |
270 | // part.Name, part.UUID, obj, regionUUID); | 270 | // part.Name, part.UUID, obj, regionUUID); |
271 | m_sceneObjectParts.Remove(part.UUID); | 271 | m_sceneObjectParts.Remove(part.UUID); |
272 | } | 272 | } |
@@ -281,7 +281,7 @@ namespace OpenSim.Data.Null | |||
281 | public List<SceneObjectGroup> LoadObjects(UUID regionUUID) | 281 | public List<SceneObjectGroup> LoadObjects(UUID regionUUID) |
282 | { | 282 | { |
283 | Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); | 283 | Dictionary<UUID, SceneObjectGroup> objects = new Dictionary<UUID, SceneObjectGroup>(); |
284 | 284 | ||
285 | // Create all of the SOGs from the root prims first | 285 | // Create all of the SOGs from the root prims first |
286 | foreach (SceneObjectPart prim in m_sceneObjectParts.Values) | 286 | foreach (SceneObjectPart prim in m_sceneObjectParts.Values) |
287 | { | 287 | { |
@@ -318,10 +318,10 @@ namespace OpenSim.Data.Null | |||
318 | } | 318 | } |
319 | } | 319 | } |
320 | } | 320 | } |
321 | 321 | ||
322 | // TODO: Load items. This is assymetric - we store items as a separate method but don't retrieve them that | 322 | // TODO: Load items. This is assymetric - we store items as a separate method but don't retrieve them that |
323 | // way! | 323 | // way! |
324 | 324 | ||
325 | return new List<SceneObjectGroup>(objects.Values); | 325 | return new List<SceneObjectGroup>(objects.Values); |
326 | } | 326 | } |
327 | 327 | ||
diff --git a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs index b6f5760..9d426f6 100644 --- a/OpenSim/Tests/Common/Mock/MockScriptEngine.cs +++ b/OpenSim/Tests/Common/Mock/MockScriptEngine.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Region.ScriptEngine.Shared; | |||
40 | namespace OpenSim.Tests.Common | 40 | namespace OpenSim.Tests.Common |
41 | { | 41 | { |
42 | public class MockScriptEngine : INonSharedRegionModule, IScriptModule, IScriptEngine | 42 | public class MockScriptEngine : INonSharedRegionModule, IScriptModule, IScriptEngine |
43 | { | 43 | { |
44 | public IConfigSource ConfigSource { get; private set; } | 44 | public IConfigSource ConfigSource { get; private set; } |
45 | 45 | ||
46 | public IConfig Config { get; private set; } | 46 | public IConfig Config { get; private set; } |
@@ -89,7 +89,7 @@ namespace OpenSim.Tests.Common | |||
89 | { | 89 | { |
90 | } | 90 | } |
91 | 91 | ||
92 | public string Name { get { return "Mock Script Engine"; } } | 92 | public string Name { get { return "Mock Script Engine"; } } |
93 | public string ScriptEngineName { get { return Name; } } | 93 | public string ScriptEngineName { get { return Name; } } |
94 | 94 | ||
95 | public Type ReplaceableInterface { get { return null; } } | 95 | public Type ReplaceableInterface { get { return null; } } |
@@ -200,7 +200,7 @@ namespace OpenSim.Tests.Common | |||
200 | { | 200 | { |
201 | throw new System.NotImplementedException (); | 201 | throw new System.NotImplementedException (); |
202 | } | 202 | } |
203 | 203 | ||
204 | public IScriptWorkItem QueueEventHandler(object parms) | 204 | public IScriptWorkItem QueueEventHandler(object parms) |
205 | { | 205 | { |
206 | throw new System.NotImplementedException (); | 206 | throw new System.NotImplementedException (); |
@@ -258,7 +258,7 @@ namespace OpenSim.Tests.Common | |||
258 | 258 | ||
259 | public string[] ScriptReferencedAssemblies { get { throw new System.NotImplementedException (); } } | 259 | public string[] ScriptReferencedAssemblies { get { throw new System.NotImplementedException (); } } |
260 | 260 | ||
261 | public ParameterInfo[] ScriptBaseClassParameters { get { throw new System.NotImplementedException (); } } | 261 | public ParameterInfo[] ScriptBaseClassParameters { get { throw new System.NotImplementedException (); } } |
262 | 262 | ||
263 | public void ClearPostedEvents() | 263 | public void ClearPostedEvents() |
264 | { | 264 | { |
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs index f407e5a..e2f57b5 100644 --- a/OpenSim/Tests/Common/Mock/TestClient.cs +++ b/OpenSim/Tests/Common/Mock/TestClient.cs | |||
@@ -321,7 +321,7 @@ namespace OpenSim.Tests.Common | |||
321 | public event AvatarInterestUpdate OnAvatarInterestUpdate; | 321 | public event AvatarInterestUpdate OnAvatarInterestUpdate; |
322 | 322 | ||
323 | public event PlacesQuery OnPlacesQuery; | 323 | public event PlacesQuery OnPlacesQuery; |
324 | 324 | ||
325 | public event FindAgentUpdate OnFindAgent; | 325 | public event FindAgentUpdate OnFindAgent; |
326 | public event TrackAgentUpdate OnTrackAgent; | 326 | public event TrackAgentUpdate OnTrackAgent; |
327 | public event NewUserReport OnUserReport; | 327 | public event NewUserReport OnUserReport; |
@@ -673,7 +673,7 @@ namespace OpenSim.Tests.Common | |||
673 | { | 673 | { |
674 | AgentCircuitData agentData = new AgentCircuitData(); | 674 | AgentCircuitData agentData = new AgentCircuitData(); |
675 | agentData.AgentID = AgentId; | 675 | agentData.AgentID = AgentId; |
676 | agentData.SessionID = SessionId; | 676 | agentData.SessionID = SessionId; |
677 | agentData.SecureSessionID = UUID.Zero; | 677 | agentData.SecureSessionID = UUID.Zero; |
678 | agentData.circuitcode = m_circuitCode; | 678 | agentData.circuitcode = m_circuitCode; |
679 | agentData.child = false; | 679 | agentData.child = false; |
@@ -713,7 +713,7 @@ namespace OpenSim.Tests.Common | |||
713 | public virtual void SendTeleportFailed(string reason) | 713 | public virtual void SendTeleportFailed(string reason) |
714 | { | 714 | { |
715 | m_log.DebugFormat( | 715 | m_log.DebugFormat( |
716 | "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}", | 716 | "[TEST CLIENT]: Teleport failed for {0} {1} on {2} with reason {3}", |
717 | m_firstName, m_lastName, m_scene.Name, reason); | 717 | m_firstName, m_lastName, m_scene.Name, reason); |
718 | } | 718 | } |
719 | 719 | ||
@@ -781,7 +781,7 @@ namespace OpenSim.Tests.Common | |||
781 | public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, | 781 | public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, |
782 | List<InventoryItemBase> items, | 782 | List<InventoryItemBase> items, |
783 | List<InventoryFolderBase> folders, | 783 | List<InventoryFolderBase> folders, |
784 | int version, | 784 | int version, |
785 | bool fetchFolders, | 785 | bool fetchFolders, |
786 | bool fetchItems) | 786 | bool fetchItems) |
787 | { | 787 | { |
@@ -881,7 +881,7 @@ namespace OpenSim.Tests.Common | |||
881 | OnRegionHandShakeReply(this); | 881 | OnRegionHandShakeReply(this); |
882 | } | 882 | } |
883 | } | 883 | } |
884 | 884 | ||
885 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) | 885 | public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) |
886 | { | 886 | { |
887 | } | 887 | } |
@@ -1314,7 +1314,7 @@ namespace OpenSim.Tests.Common | |||
1314 | public void SendMuteListUpdate(string filename) | 1314 | public void SendMuteListUpdate(string filename) |
1315 | { | 1315 | { |
1316 | } | 1316 | } |
1317 | 1317 | ||
1318 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) | 1318 | public void SendPickInfoReply(UUID pickID,UUID creatorID, bool topPick, UUID parcelID, string name, string desc, UUID snapshotID, string user, string originalName, string simName, Vector3 posGlobal, int sortOrder, bool enabled) |
1319 | { | 1319 | { |
1320 | } | 1320 | } |
@@ -1334,7 +1334,7 @@ namespace OpenSim.Tests.Common | |||
1334 | { | 1334 | { |
1335 | } | 1335 | } |
1336 | 1336 | ||
1337 | public void Disconnect() | 1337 | public void Disconnect() |
1338 | { | 1338 | { |
1339 | } | 1339 | } |
1340 | 1340 | ||
@@ -1343,19 +1343,19 @@ namespace OpenSim.Tests.Common | |||
1343 | if (OnReceivedSendRebakeAvatarTextures != null) | 1343 | if (OnReceivedSendRebakeAvatarTextures != null) |
1344 | OnReceivedSendRebakeAvatarTextures(textureID); | 1344 | OnReceivedSendRebakeAvatarTextures(textureID); |
1345 | } | 1345 | } |
1346 | 1346 | ||
1347 | public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) | 1347 | public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) |
1348 | { | 1348 | { |
1349 | } | 1349 | } |
1350 | 1350 | ||
1351 | public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt) | 1351 | public void SendGroupAccountingDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID, int amt) |
1352 | { | 1352 | { |
1353 | } | 1353 | } |
1354 | 1354 | ||
1355 | public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier) | 1355 | public void SendGroupAccountingSummary(IClientAPI sender,UUID groupID, uint moneyAmt, int totalTier, int usedTier) |
1356 | { | 1356 | { |
1357 | } | 1357 | } |
1358 | 1358 | ||
1359 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) | 1359 | public void SendGroupTransactionsSummaryDetails(IClientAPI sender,UUID groupID, UUID transactionID, UUID sessionID,int amt) |
1360 | { | 1360 | { |
1361 | } | 1361 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs index bc30945..3e00d82 100644 --- a/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs +++ b/OpenSim/Tests/Common/Mock/TestEventQueueGetModule.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Tests.Common | |||
46 | { | 46 | { |
47 | public class TestEventQueueGetModule : IEventQueue, INonSharedRegionModule | 47 | public class TestEventQueueGetModule : IEventQueue, INonSharedRegionModule |
48 | { | 48 | { |
49 | public class Event | 49 | public class Event |
50 | { | 50 | { |
51 | public string Name { get; set; } | 51 | public string Name { get; set; } |
52 | public object[] Args { get; set; } | 52 | public object[] Args { get; set; } |
@@ -64,7 +64,7 @@ namespace OpenSim.Tests.Common | |||
64 | 64 | ||
65 | public void Close() {} | 65 | public void Close() {} |
66 | 66 | ||
67 | public void AddRegion(Scene scene) | 67 | public void AddRegion(Scene scene) |
68 | { | 68 | { |
69 | Events = new Dictionary<UUID, List<Event>>(); | 69 | Events = new Dictionary<UUID, List<Event>>(); |
70 | scene.RegisterModuleInterface<IEventQueue>(this); | 70 | scene.RegisterModuleInterface<IEventQueue>(this); |
@@ -138,12 +138,12 @@ namespace OpenSim.Tests.Common | |||
138 | } | 138 | } |
139 | 139 | ||
140 | public void ChatterboxInvitation( | 140 | public void ChatterboxInvitation( |
141 | UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName, | 141 | UUID sessionID, string sessionName, UUID fromAgent, string message, UUID toAgent, string fromName, |
142 | byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, | 142 | byte dialog, uint timeStamp, bool offline, int parentEstateID, Vector3 position, uint ttl, |
143 | UUID transactionID, bool fromGroup, byte[] binaryBucket) | 143 | UUID transactionID, bool fromGroup, byte[] binaryBucket) |
144 | { | 144 | { |
145 | AddEvent( | 145 | AddEvent( |
146 | toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, | 146 | toAgent, "ChatterboxInvitation", sessionID, sessionName, fromAgent, message, toAgent, fromName, dialog, |
147 | timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket); | 147 | timeStamp, offline, parentEstateID, position, ttl, transactionID, fromGroup, binaryBucket); |
148 | } | 148 | } |
149 | 149 | ||
diff --git a/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs b/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs index be437dc..7b20b8c 100644 --- a/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs +++ b/OpenSim/Tests/Common/Mock/TestHttpClientContext.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common | |||
43 | /// Bodies of responses from the server. | 43 | /// Bodies of responses from the server. |
44 | /// </summary> | 44 | /// </summary> |
45 | public string ResponseBody | 45 | public string ResponseBody |
46 | { | 46 | { |
47 | get { return Encoding.UTF8.GetString(m_responseStream.ToArray()); } | 47 | get { return Encoding.UTF8.GetString(m_responseStream.ToArray()); } |
48 | } | 48 | } |
49 | 49 | ||
@@ -56,8 +56,8 @@ namespace OpenSim.Tests.Common | |||
56 | 56 | ||
57 | public bool IsSecured { get; set; } | 57 | public bool IsSecured { get; set; } |
58 | 58 | ||
59 | public bool Secured | 59 | public bool Secured |
60 | { | 60 | { |
61 | get { return IsSecured; } | 61 | get { return IsSecured; } |
62 | set { IsSecured = value; } | 62 | set { IsSecured = value; } |
63 | } | 63 | } |
@@ -67,7 +67,7 @@ namespace OpenSim.Tests.Common | |||
67 | Secured = secured; | 67 | Secured = secured; |
68 | } | 68 | } |
69 | 69 | ||
70 | public void Disconnect(SocketError error) | 70 | public void Disconnect(SocketError error) |
71 | { | 71 | { |
72 | // Console.WriteLine("TestHttpClientContext.Disconnect Received disconnect with status {0}", error); | 72 | // Console.WriteLine("TestHttpClientContext.Disconnect Received disconnect with status {0}", error); |
73 | } | 73 | } |
@@ -76,18 +76,18 @@ namespace OpenSim.Tests.Common | |||
76 | public void Respond(string httpVersion, HttpStatusCode statusCode, string reason) {Console.WriteLine("xx");} | 76 | public void Respond(string httpVersion, HttpStatusCode statusCode, string reason) {Console.WriteLine("xx");} |
77 | public void Respond(string body) { Console.WriteLine("xxx");} | 77 | public void Respond(string body) { Console.WriteLine("xxx");} |
78 | 78 | ||
79 | public void Send(byte[] buffer) | 79 | public void Send(byte[] buffer) |
80 | { | 80 | { |
81 | // Getting header data here | 81 | // Getting header data here |
82 | // Console.WriteLine("xxxx: Got {0}", Encoding.UTF8.GetString(buffer)); | 82 | // Console.WriteLine("xxxx: Got {0}", Encoding.UTF8.GetString(buffer)); |
83 | } | 83 | } |
84 | 84 | ||
85 | public void Send(byte[] buffer, int offset, int size) | 85 | public void Send(byte[] buffer, int offset, int size) |
86 | { | 86 | { |
87 | // Util.PrintCallStack(); | 87 | // Util.PrintCallStack(); |
88 | // | 88 | // |
89 | // Console.WriteLine( | 89 | // Console.WriteLine( |
90 | // "TestHttpClientContext.Send(byte[], int, int) got offset={0}, size={1}, buffer={2}", | 90 | // "TestHttpClientContext.Send(byte[], int, int) got offset={0}, size={1}, buffer={2}", |
91 | // offset, size, Encoding.UTF8.GetString(buffer)); | 91 | // offset, size, Encoding.UTF8.GetString(buffer)); |
92 | 92 | ||
93 | m_responseStream.Write(buffer, offset, size); | 93 | m_responseStream.Write(buffer, offset, size); |
diff --git a/OpenSim/Tests/Common/Mock/TestHttpRequest.cs b/OpenSim/Tests/Common/Mock/TestHttpRequest.cs index d07287d..4c5ea4a 100644 --- a/OpenSim/Tests/Common/Mock/TestHttpRequest.cs +++ b/OpenSim/Tests/Common/Mock/TestHttpRequest.cs | |||
@@ -37,85 +37,85 @@ namespace OpenSim.Tests.Common | |||
37 | public class TestHttpRequest: IHttpRequest | 37 | public class TestHttpRequest: IHttpRequest |
38 | { | 38 | { |
39 | private string _uriPath; | 39 | private string _uriPath; |
40 | public bool BodyIsComplete | 40 | public bool BodyIsComplete |
41 | { | 41 | { |
42 | get { return true; } | 42 | get { return true; } |
43 | } | 43 | } |
44 | public string[] AcceptTypes | 44 | public string[] AcceptTypes |
45 | { | 45 | { |
46 | get {return _acceptTypes; } | 46 | get {return _acceptTypes; } |
47 | } | 47 | } |
48 | private string[] _acceptTypes; | 48 | private string[] _acceptTypes; |
49 | public Stream Body | 49 | public Stream Body |
50 | { | 50 | { |
51 | get { return _body; } | 51 | get { return _body; } |
52 | set { _body = value;} | 52 | set { _body = value;} |
53 | } | 53 | } |
54 | private Stream _body; | 54 | private Stream _body; |
55 | public ConnectionType Connection | 55 | public ConnectionType Connection |
56 | { | 56 | { |
57 | get { return _connection; } | 57 | get { return _connection; } |
58 | set { _connection = value; } | 58 | set { _connection = value; } |
59 | } | 59 | } |
60 | private ConnectionType _connection; | 60 | private ConnectionType _connection; |
61 | public int ContentLength | 61 | public int ContentLength |
62 | { | 62 | { |
63 | get { return _contentLength; } | 63 | get { return _contentLength; } |
64 | set { _contentLength = value; } | 64 | set { _contentLength = value; } |
65 | } | 65 | } |
66 | private int _contentLength; | 66 | private int _contentLength; |
67 | public NameValueCollection Headers | 67 | public NameValueCollection Headers |
68 | { | 68 | { |
69 | get { return _headers; } | 69 | get { return _headers; } |
70 | } | 70 | } |
71 | private NameValueCollection _headers = new NameValueCollection(); | 71 | private NameValueCollection _headers = new NameValueCollection(); |
72 | 72 | ||
73 | public string HttpVersion { get; set; } | 73 | public string HttpVersion { get; set; } |
74 | 74 | ||
75 | public string Method | 75 | public string Method |
76 | { | 76 | { |
77 | get { return _method; } | 77 | get { return _method; } |
78 | set { _method = value; } | 78 | set { _method = value; } |
79 | } | 79 | } |
80 | private string _method = null; | 80 | private string _method = null; |
81 | public HttpInput QueryString | 81 | public HttpInput QueryString |
82 | { | 82 | { |
83 | get { return _queryString; } | 83 | get { return _queryString; } |
84 | } | 84 | } |
85 | private HttpInput _queryString = null; | 85 | private HttpInput _queryString = null; |
86 | public Uri Uri | 86 | public Uri Uri |
87 | { | 87 | { |
88 | get { return _uri; } | 88 | get { return _uri; } |
89 | set { _uri = value; } | 89 | set { _uri = value; } |
90 | } | 90 | } |
91 | private Uri _uri = null; | 91 | private Uri _uri = null; |
92 | public string[] UriParts | 92 | public string[] UriParts |
93 | { | 93 | { |
94 | get { return _uri.Segments; } | 94 | get { return _uri.Segments; } |
95 | } | 95 | } |
96 | public HttpParam Param | 96 | public HttpParam Param |
97 | { | 97 | { |
98 | get { return null; } | 98 | get { return null; } |
99 | } | 99 | } |
100 | public HttpForm Form | 100 | public HttpForm Form |
101 | { | 101 | { |
102 | get { return null; } | 102 | get { return null; } |
103 | } | 103 | } |
104 | public bool IsAjax | 104 | public bool IsAjax |
105 | { | 105 | { |
106 | get { return false; } | 106 | get { return false; } |
107 | } | 107 | } |
108 | public RequestCookies Cookies | 108 | public RequestCookies Cookies |
109 | { | 109 | { |
110 | get { return null; } | 110 | get { return null; } |
111 | } | 111 | } |
112 | 112 | ||
113 | public TestHttpRequest() | 113 | public TestHttpRequest() |
114 | { | 114 | { |
115 | HttpVersion = "HTTP/1.1"; | 115 | HttpVersion = "HTTP/1.1"; |
116 | } | 116 | } |
117 | 117 | ||
118 | public TestHttpRequest(string contentEncoding, string contentType, string userAgent, | 118 | public TestHttpRequest(string contentEncoding, string contentType, string userAgent, |
119 | string remoteAddr, string remotePort, string[] acceptTypes, | 119 | string remoteAddr, string remotePort, string[] acceptTypes, |
120 | ConnectionType connectionType, int contentLength, Uri uri) : base() | 120 | ConnectionType connectionType, int contentLength, Uri uri) : base() |
121 | { | 121 | { |
@@ -137,7 +137,7 @@ namespace OpenSim.Tests.Common | |||
137 | { | 137 | { |
138 | _headers.Add(name, value); | 138 | _headers.Add(name, value); |
139 | } | 139 | } |
140 | public int AddToBody(byte[] bytes, int offset, int length) | 140 | public int AddToBody(byte[] bytes, int offset, int length) |
141 | { | 141 | { |
142 | return 0; | 142 | return 0; |
143 | } | 143 | } |
@@ -168,7 +168,7 @@ namespace OpenSim.Tests.Common | |||
168 | set | 168 | set |
169 | { | 169 | { |
170 | _uriPath = value; | 170 | _uriPath = value; |
171 | 171 | ||
172 | } | 172 | } |
173 | } | 173 | } |
174 | } | 174 | } |
diff --git a/OpenSim/Tests/Common/Mock/TestHttpResponse.cs b/OpenSim/Tests/Common/Mock/TestHttpResponse.cs index c344fb8..190f6d5 100644 --- a/OpenSim/Tests/Common/Mock/TestHttpResponse.cs +++ b/OpenSim/Tests/Common/Mock/TestHttpResponse.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Tests.Common | |||
36 | /* | 36 | /* |
37 | public class TestHttpResponse: IHttpResponse | 37 | public class TestHttpResponse: IHttpResponse |
38 | { | 38 | { |
39 | public Stream Body | 39 | public Stream Body |
40 | { | 40 | { |
41 | get { return _body; } | 41 | get { return _body; } |
42 | 42 | ||
@@ -44,14 +44,14 @@ namespace OpenSim.Tests.Common | |||
44 | } | 44 | } |
45 | private Stream _body; | 45 | private Stream _body; |
46 | 46 | ||
47 | public string ProtocolVersion | 47 | public string ProtocolVersion |
48 | { | 48 | { |
49 | get { return _protocolVersion; } | 49 | get { return _protocolVersion; } |
50 | set { _protocolVersion = value; } | 50 | set { _protocolVersion = value; } |
51 | } | 51 | } |
52 | private string _protocolVersion; | 52 | private string _protocolVersion; |
53 | 53 | ||
54 | public bool Chunked | 54 | public bool Chunked |
55 | { | 55 | { |
56 | get { return _chunked; } | 56 | get { return _chunked; } |
57 | 57 | ||
@@ -59,7 +59,7 @@ namespace OpenSim.Tests.Common | |||
59 | } | 59 | } |
60 | private bool _chunked; | 60 | private bool _chunked; |
61 | 61 | ||
62 | public ConnectionType Connection | 62 | public ConnectionType Connection |
63 | { | 63 | { |
64 | get { return _connection; } | 64 | get { return _connection; } |
65 | 65 | ||
@@ -67,7 +67,7 @@ namespace OpenSim.Tests.Common | |||
67 | } | 67 | } |
68 | private ConnectionType _connection; | 68 | private ConnectionType _connection; |
69 | 69 | ||
70 | public Encoding Encoding | 70 | public Encoding Encoding |
71 | { | 71 | { |
72 | get { return _encoding; } | 72 | get { return _encoding; } |
73 | 73 | ||
@@ -75,7 +75,7 @@ namespace OpenSim.Tests.Common | |||
75 | } | 75 | } |
76 | private Encoding _encoding; | 76 | private Encoding _encoding; |
77 | 77 | ||
78 | public int KeepAlive | 78 | public int KeepAlive |
79 | { | 79 | { |
80 | get { return _keepAlive; } | 80 | get { return _keepAlive; } |
81 | 81 | ||
@@ -83,7 +83,7 @@ namespace OpenSim.Tests.Common | |||
83 | } | 83 | } |
84 | private int _keepAlive; | 84 | private int _keepAlive; |
85 | 85 | ||
86 | public HttpStatusCode Status | 86 | public HttpStatusCode Status |
87 | { | 87 | { |
88 | get { return _status; } | 88 | get { return _status; } |
89 | 89 | ||
@@ -91,7 +91,7 @@ namespace OpenSim.Tests.Common | |||
91 | } | 91 | } |
92 | private HttpStatusCode _status; | 92 | private HttpStatusCode _status; |
93 | 93 | ||
94 | public string Reason | 94 | public string Reason |
95 | { | 95 | { |
96 | get { return _reason; } | 96 | get { return _reason; } |
97 | 97 | ||
@@ -99,7 +99,7 @@ namespace OpenSim.Tests.Common | |||
99 | } | 99 | } |
100 | private string _reason; | 100 | private string _reason; |
101 | 101 | ||
102 | public long ContentLength | 102 | public long ContentLength |
103 | { | 103 | { |
104 | get { return _contentLength; } | 104 | get { return _contentLength; } |
105 | 105 | ||
@@ -107,7 +107,7 @@ namespace OpenSim.Tests.Common | |||
107 | } | 107 | } |
108 | private long _contentLength; | 108 | private long _contentLength; |
109 | 109 | ||
110 | public string ContentType | 110 | public string ContentType |
111 | { | 111 | { |
112 | get { return _contentType; } | 112 | get { return _contentType; } |
113 | 113 | ||
@@ -115,19 +115,19 @@ namespace OpenSim.Tests.Common | |||
115 | } | 115 | } |
116 | private string _contentType; | 116 | private string _contentType; |
117 | 117 | ||
118 | public bool HeadersSent | 118 | public bool HeadersSent |
119 | { | 119 | { |
120 | get { return _headersSent; } | 120 | get { return _headersSent; } |
121 | } | 121 | } |
122 | private bool _headersSent; | 122 | private bool _headersSent; |
123 | 123 | ||
124 | public bool Sent | 124 | public bool Sent |
125 | { | 125 | { |
126 | get { return _sent; } | 126 | get { return _sent; } |
127 | } | 127 | } |
128 | private bool _sent; | 128 | private bool _sent; |
129 | 129 | ||
130 | public ResponseCookies Cookies | 130 | public ResponseCookies Cookies |
131 | { | 131 | { |
132 | get { return _cookies; } | 132 | get { return _cookies; } |
133 | } | 133 | } |
@@ -141,26 +141,26 @@ namespace OpenSim.Tests.Common | |||
141 | 141 | ||
142 | public void AddHeader(string name, string value) {} | 142 | public void AddHeader(string name, string value) {} |
143 | 143 | ||
144 | public void Send() | 144 | public void Send() |
145 | { | 145 | { |
146 | if (!_headersSent) SendHeaders(); | 146 | if (!_headersSent) SendHeaders(); |
147 | if (_sent) throw new InvalidOperationException("stuff already sent"); | 147 | if (_sent) throw new InvalidOperationException("stuff already sent"); |
148 | _sent = true; | 148 | _sent = true; |
149 | } | 149 | } |
150 | 150 | ||
151 | public void SendBody(byte[] buffer, int offset, int count) | 151 | public void SendBody(byte[] buffer, int offset, int count) |
152 | { | 152 | { |
153 | if (!_headersSent) SendHeaders(); | 153 | if (!_headersSent) SendHeaders(); |
154 | _sent = true; | 154 | _sent = true; |
155 | } | 155 | } |
156 | 156 | ||
157 | public void SendBody(byte[] buffer) | 157 | public void SendBody(byte[] buffer) |
158 | { | 158 | { |
159 | if (!_headersSent) SendHeaders(); | 159 | if (!_headersSent) SendHeaders(); |
160 | _sent = true; | 160 | _sent = true; |
161 | } | 161 | } |
162 | 162 | ||
163 | public void SendHeaders() | 163 | public void SendHeaders() |
164 | { | 164 | { |
165 | if (_headersSent) throw new InvalidOperationException("headers already sent"); | 165 | if (_headersSent) throw new InvalidOperationException("headers already sent"); |
166 | _headersSent = true; | 166 | _headersSent = true; |
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs index c97a765..0ff6f7f 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs | |||
@@ -43,7 +43,7 @@ namespace OpenSim.Tests.Common | |||
43 | public class TestInventoryDataPlugin : IInventoryDataPlugin | 43 | public class TestInventoryDataPlugin : IInventoryDataPlugin |
44 | { | 44 | { |
45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | /// <value> | 47 | /// <value> |
48 | /// Inventory folders | 48 | /// Inventory folders |
49 | /// </value> | 49 | /// </value> |
@@ -85,9 +85,9 @@ namespace OpenSim.Tests.Common | |||
85 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) | 85 | public List<InventoryItemBase> getInventoryInFolder(UUID folderID) |
86 | { | 86 | { |
87 | // InventoryFolderBase folder = m_folders[folderID]; | 87 | // InventoryFolderBase folder = m_folders[folderID]; |
88 | 88 | ||
89 | // m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID); | 89 | // m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID); |
90 | 90 | ||
91 | List<InventoryItemBase> items = new List<InventoryItemBase>(); | 91 | List<InventoryItemBase> items = new List<InventoryItemBase>(); |
92 | 92 | ||
93 | foreach (InventoryItemBase item in m_items.Values) | 93 | foreach (InventoryItemBase item in m_items.Values) |
@@ -98,7 +98,7 @@ namespace OpenSim.Tests.Common | |||
98 | items.Add(item); | 98 | items.Add(item); |
99 | } | 99 | } |
100 | } | 100 | } |
101 | 101 | ||
102 | return items; | 102 | return items; |
103 | } | 103 | } |
104 | 104 | ||
@@ -107,7 +107,7 @@ namespace OpenSim.Tests.Common | |||
107 | public InventoryFolderBase getUserRootFolder(UUID user) | 107 | public InventoryFolderBase getUserRootFolder(UUID user) |
108 | { | 108 | { |
109 | // m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user); | 109 | // m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user); |
110 | 110 | ||
111 | InventoryFolderBase folder = null; | 111 | InventoryFolderBase folder = null; |
112 | m_rootFolders.TryGetValue(user, out folder); | 112 | m_rootFolders.TryGetValue(user, out folder); |
113 | 113 | ||
@@ -117,9 +117,9 @@ namespace OpenSim.Tests.Common | |||
117 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) | 117 | public List<InventoryFolderBase> getInventoryFolders(UUID parentID) |
118 | { | 118 | { |
119 | // InventoryFolderBase parentFolder = m_folders[parentID]; | 119 | // InventoryFolderBase parentFolder = m_folders[parentID]; |
120 | 120 | ||
121 | // m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID); | 121 | // m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID); |
122 | 122 | ||
123 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); | 123 | List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); |
124 | 124 | ||
125 | foreach (InventoryFolderBase folder in m_folders.Values) | 125 | foreach (InventoryFolderBase folder in m_folders.Values) |
@@ -127,9 +127,9 @@ namespace OpenSim.Tests.Common | |||
127 | if (folder.ParentID == parentID) | 127 | if (folder.ParentID == parentID) |
128 | { | 128 | { |
129 | // m_log.DebugFormat( | 129 | // m_log.DebugFormat( |
130 | // "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", | 130 | // "[MOCK INV DB]: Found folder {0} {1} in {2} {3}", |
131 | // folder.Name, folder.ID, parentFolder.Name, parentFolder.ID); | 131 | // folder.Name, folder.ID, parentFolder.Name, parentFolder.ID); |
132 | 132 | ||
133 | folders.Add(folder); | 133 | folders.Add(folder); |
134 | } | 134 | } |
135 | } | 135 | } |
@@ -153,9 +153,9 @@ namespace OpenSim.Tests.Common | |||
153 | public void addInventoryFolder(InventoryFolderBase folder) | 153 | public void addInventoryFolder(InventoryFolderBase folder) |
154 | { | 154 | { |
155 | // m_log.DebugFormat( | 155 | // m_log.DebugFormat( |
156 | // "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", | 156 | // "[MOCK INV DB]: Adding inventory folder {0} {1} type {2}", |
157 | // folder.Name, folder.ID, (AssetType)folder.Type); | 157 | // folder.Name, folder.ID, (AssetType)folder.Type); |
158 | 158 | ||
159 | m_folders[folder.ID] = folder; | 159 | m_folders[folder.ID] = folder; |
160 | 160 | ||
161 | if (folder.ParentID == UUID.Zero) | 161 | if (folder.ParentID == UUID.Zero) |
@@ -183,30 +183,30 @@ namespace OpenSim.Tests.Common | |||
183 | m_folders.Remove(folderId); | 183 | m_folders.Remove(folderId); |
184 | } | 184 | } |
185 | 185 | ||
186 | public void addInventoryItem(InventoryItemBase item) | 186 | public void addInventoryItem(InventoryItemBase item) |
187 | { | 187 | { |
188 | InventoryFolderBase folder = m_folders[item.Folder]; | 188 | InventoryFolderBase folder = m_folders[item.Folder]; |
189 | 189 | ||
190 | // m_log.DebugFormat( | 190 | // m_log.DebugFormat( |
191 | // "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID); | 191 | // "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID); |
192 | 192 | ||
193 | m_items[item.ID] = item; | 193 | m_items[item.ID] = item; |
194 | } | 194 | } |
195 | 195 | ||
196 | public void updateInventoryItem(InventoryItemBase item) { addInventoryItem(item); } | 196 | public void updateInventoryItem(InventoryItemBase item) { addInventoryItem(item); } |
197 | 197 | ||
198 | public void deleteInventoryItem(UUID itemId) | 198 | public void deleteInventoryItem(UUID itemId) |
199 | { | 199 | { |
200 | if (m_items.ContainsKey(itemId)) | 200 | if (m_items.ContainsKey(itemId)) |
201 | m_items.Remove(itemId); | 201 | m_items.Remove(itemId); |
202 | } | 202 | } |
203 | 203 | ||
204 | public InventoryItemBase getInventoryItem(UUID itemId) | 204 | public InventoryItemBase getInventoryItem(UUID itemId) |
205 | { | 205 | { |
206 | if (m_items.ContainsKey(itemId)) | 206 | if (m_items.ContainsKey(itemId)) |
207 | return m_items[itemId]; | 207 | return m_items[itemId]; |
208 | else | 208 | else |
209 | return null; | 209 | return null; |
210 | } | 210 | } |
211 | 211 | ||
212 | public InventoryItemBase queryInventoryItem(UUID item) | 212 | public InventoryItemBase queryInventoryItem(UUID item) |
diff --git a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs index b2c6a8c..388b56b 100644 --- a/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs +++ b/OpenSim/Tests/Common/Mock/TestLLUDPServer.cs | |||
@@ -73,7 +73,7 @@ namespace OpenSim.Tests.Common | |||
73 | //// /// The chunks of data to pass to the LLUDPServer when it calls EndReceive | 73 | //// /// The chunks of data to pass to the LLUDPServer when it calls EndReceive |
74 | //// /// </summary> | 74 | //// /// </summary> |
75 | //// protected Queue<ChunkSenderTuple> m_chunksToLoad = new Queue<ChunkSenderTuple>(); | 75 | //// protected Queue<ChunkSenderTuple> m_chunksToLoad = new Queue<ChunkSenderTuple>(); |
76 | // | 76 | // |
77 | //// protected override void BeginReceive() | 77 | //// protected override void BeginReceive() |
78 | //// { | 78 | //// { |
79 | //// if (m_chunksToLoad.Count > 0 && m_chunksToLoad.Peek().BeginReceiveException) | 79 | //// if (m_chunksToLoad.Count > 0 && m_chunksToLoad.Peek().BeginReceiveException) |
@@ -83,29 +83,29 @@ namespace OpenSim.Tests.Common | |||
83 | //// throw new SocketException(); | 83 | //// throw new SocketException(); |
84 | //// } | 84 | //// } |
85 | //// } | 85 | //// } |
86 | // | 86 | // |
87 | //// protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender) | 87 | //// protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender) |
88 | //// { | 88 | //// { |
89 | //// numBytes = 0; | 89 | //// numBytes = 0; |
90 | //// | 90 | //// |
91 | //// //m_log.Debug("Queue size " + m_chunksToLoad.Count); | 91 | //// //m_log.Debug("Queue size " + m_chunksToLoad.Count); |
92 | //// | 92 | //// |
93 | //// if (m_chunksToLoad.Count <= 0) | 93 | //// if (m_chunksToLoad.Count <= 0) |
94 | //// return false; | 94 | //// return false; |
95 | //// | 95 | //// |
96 | //// ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); | 96 | //// ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); |
97 | //// RecvBuffer = tuple.Data; | 97 | //// RecvBuffer = tuple.Data; |
98 | //// numBytes = tuple.Data.Length; | 98 | //// numBytes = tuple.Data.Length; |
99 | //// epSender = tuple.Sender; | 99 | //// epSender = tuple.Sender; |
100 | //// | 100 | //// |
101 | //// return true; | 101 | //// return true; |
102 | //// } | 102 | //// } |
103 | // | 103 | // |
104 | //// public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode) | 104 | //// public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode) |
105 | //// { | 105 | //// { |
106 | //// // Don't do anything just yet | 106 | //// // Don't do anything just yet |
107 | //// } | 107 | //// } |
108 | // | 108 | // |
109 | // /// <summary> | 109 | // /// <summary> |
110 | // /// Signal that this chunk should throw an exception on Socket.BeginReceive() | 110 | // /// Signal that this chunk should throw an exception on Socket.BeginReceive() |
111 | // /// </summary> | 111 | // /// </summary> |
@@ -116,7 +116,7 @@ namespace OpenSim.Tests.Common | |||
116 | // tuple.BeginReceiveException = true; | 116 | // tuple.BeginReceiveException = true; |
117 | // m_chunksToLoad.Enqueue(tuple); | 117 | // m_chunksToLoad.Enqueue(tuple); |
118 | // } | 118 | // } |
119 | // | 119 | // |
120 | // /// <summary> | 120 | // /// <summary> |
121 | // /// Load some data to be received by the LLUDPServer on the next receive call | 121 | // /// Load some data to be received by the LLUDPServer on the next receive call |
122 | // /// </summary> | 122 | // /// </summary> |
@@ -126,7 +126,7 @@ namespace OpenSim.Tests.Common | |||
126 | // { | 126 | // { |
127 | // m_chunksToLoad.Enqueue(new ChunkSenderTuple(data, epSender)); | 127 | // m_chunksToLoad.Enqueue(new ChunkSenderTuple(data, epSender)); |
128 | // } | 128 | // } |
129 | // | 129 | // |
130 | // /// <summary> | 130 | // /// <summary> |
131 | // /// Load a packet to be received by the LLUDPServer on the next receive call | 131 | // /// Load a packet to be received by the LLUDPServer on the next receive call |
132 | // /// </summary> | 132 | // /// </summary> |
@@ -135,7 +135,7 @@ namespace OpenSim.Tests.Common | |||
135 | // { | 135 | // { |
136 | // LoadReceive(packet.ToBytes(), epSender); | 136 | // LoadReceive(packet.ToBytes(), epSender); |
137 | // } | 137 | // } |
138 | // | 138 | // |
139 | // /// <summary> | 139 | // /// <summary> |
140 | // /// Calls the protected asynchronous result method. This fires out all data chunks currently queued for send | 140 | // /// Calls the protected asynchronous result method. This fires out all data chunks currently queued for send |
141 | // /// </summary> | 141 | // /// </summary> |
@@ -147,7 +147,7 @@ namespace OpenSim.Tests.Common | |||
147 | //// OnReceivedData(result); | 147 | //// OnReceivedData(result); |
148 | // } | 148 | // } |
149 | } | 149 | } |
150 | 150 | ||
151 | /// <summary> | 151 | /// <summary> |
152 | /// Record the data and sender tuple | 152 | /// Record the data and sender tuple |
153 | /// </summary> | 153 | /// </summary> |
@@ -156,13 +156,13 @@ namespace OpenSim.Tests.Common | |||
156 | public byte[] Data; | 156 | public byte[] Data; |
157 | public EndPoint Sender; | 157 | public EndPoint Sender; |
158 | public bool BeginReceiveException; | 158 | public bool BeginReceiveException; |
159 | 159 | ||
160 | public ChunkSenderTuple(byte[] data, EndPoint sender) | 160 | public ChunkSenderTuple(byte[] data, EndPoint sender) |
161 | { | 161 | { |
162 | Data = data; | 162 | Data = data; |
163 | Sender = sender; | 163 | Sender = sender; |
164 | } | 164 | } |
165 | 165 | ||
166 | public ChunkSenderTuple(EndPoint sender) | 166 | public ChunkSenderTuple(EndPoint sender) |
167 | { | 167 | { |
168 | Sender = sender; | 168 | Sender = sender; |
diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs index 23258ad..3d44a33 100644 --- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs +++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Tests.Common | |||
65 | { | 65 | { |
66 | return m_parcels; | 66 | return m_parcels; |
67 | } | 67 | } |
68 | 68 | ||
69 | public void Clear(bool setupDefaultParcel) | 69 | public void Clear(bool setupDefaultParcel) |
70 | { | 70 | { |
71 | m_parcels.Clear(); | 71 | m_parcels.Clear(); |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 1a93c9f..0b3d446 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -41,7 +41,7 @@ namespace OpenSim.Tests.Common | |||
41 | public class TestScene : Scene | 41 | public class TestScene : Scene |
42 | { | 42 | { |
43 | public TestScene( | 43 | public TestScene( |
44 | RegionInfo regInfo, AgentCircuitManager authen, | 44 | RegionInfo regInfo, AgentCircuitManager authen, |
45 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 45 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
46 | IConfigSource config, string simulatorVersion) | 46 | IConfigSource config, string simulatorVersion) |
47 | : base(regInfo, authen, simDataService, estateDataService, | 47 | : base(regInfo, authen, simDataService, estateDataService, |
@@ -54,7 +54,7 @@ namespace OpenSim.Tests.Common | |||
54 | //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName); | 54 | //Console.WriteLine("TestScene destructor called for {0}", RegionInfo.RegionName); |
55 | Console.WriteLine("TestScene destructor called"); | 55 | Console.WriteLine("TestScene destructor called"); |
56 | } | 56 | } |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Temporarily override session authentication for tests (namely teleport). | 59 | /// Temporarily override session authentication for tests (namely teleport). |
60 | /// </summary> | 60 | /// </summary> |
@@ -68,7 +68,7 @@ namespace OpenSim.Tests.Common | |||
68 | reason = String.Empty; | 68 | reason = String.Empty; |
69 | return true; | 69 | return true; |
70 | } | 70 | } |
71 | 71 | ||
72 | public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter | 72 | public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter |
73 | { | 73 | { |
74 | get { return m_asyncSceneObjectDeleter; } | 74 | get { return m_asyncSceneObjectDeleter; } |
diff --git a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs index 2b272e6..77f1793 100644 --- a/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestXInventoryDataPlugin.cs | |||
@@ -89,7 +89,7 @@ namespace OpenSim.Tests.Common | |||
89 | m_allItems[item.inventoryID] = item.Clone(); | 89 | m_allItems[item.inventoryID] = item.Clone(); |
90 | 90 | ||
91 | // Console.WriteLine( | 91 | // Console.WriteLine( |
92 | // "Added item {0} {1}, folder {2}, creator {3}, owner {4}", | 92 | // "Added item {0} {1}, folder {2}, creator {3}, owner {4}", |
93 | // item.inventoryName, item.inventoryID, item.parentFolderID, item.creatorID, item.avatarID); | 93 | // item.inventoryName, item.inventoryID, item.parentFolderID, item.creatorID, item.avatarID); |
94 | 94 | ||
95 | return true; | 95 | return true; |
@@ -123,8 +123,8 @@ namespace OpenSim.Tests.Common | |||
123 | 123 | ||
124 | public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); } | 124 | public bool MoveItem(string id, string newParent) { throw new NotImplementedException(); } |
125 | 125 | ||
126 | public bool MoveFolder(string id, string newParent) | 126 | public bool MoveFolder(string id, string newParent) |
127 | { | 127 | { |
128 | // Don't use GetFolders() here - it takes a clone! | 128 | // Don't use GetFolders() here - it takes a clone! |
129 | XInventoryFolder folder = m_allFolders[new UUID(id)]; | 129 | XInventoryFolder folder = m_allFolders[new UUID(id)]; |
130 | 130 | ||
@@ -133,11 +133,11 @@ namespace OpenSim.Tests.Common | |||
133 | 133 | ||
134 | folder.parentFolderID = new UUID(newParent); | 134 | folder.parentFolderID = new UUID(newParent); |
135 | 135 | ||
136 | // XInventoryFolder[] newParentFolders | 136 | // XInventoryFolder[] newParentFolders |
137 | // = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() }); | 137 | // = GetFolders(new string[] { "folderID" }, new string[] { folder.parentFolderID.ToString() }); |
138 | 138 | ||
139 | // Console.WriteLine( | 139 | // Console.WriteLine( |
140 | // "Moved folder {0} {1}, to {2} {3}", | 140 | // "Moved folder {0} {1}, to {2} {3}", |
141 | // folder.folderName, folder.folderID, newParentFolders[0].folderName, folder.parentFolderID); | 141 | // folder.folderName, folder.folderID, newParentFolders[0].folderName, folder.parentFolderID); |
142 | 142 | ||
143 | // TODO: Really need to implement folder version incrementing, though this should be common code anyway, | 143 | // TODO: Really need to implement folder version incrementing, though this should be common code anyway, |
diff --git a/OpenSim/Tests/Common/TestHelpers.cs b/OpenSim/Tests/Common/TestHelpers.cs index 6bf23f8..2b2af34 100644 --- a/OpenSim/Tests/Common/TestHelpers.cs +++ b/OpenSim/Tests/Common/TestHelpers.cs | |||
@@ -81,9 +81,9 @@ namespace OpenSim.Tests.Common | |||
81 | 81 | ||
82 | return false; | 82 | return false; |
83 | } | 83 | } |
84 | 84 | ||
85 | /// <summary> | 85 | /// <summary> |
86 | /// A debugging method that can be used to print out which test method you are in | 86 | /// A debugging method that can be used to print out which test method you are in |
87 | /// </summary> | 87 | /// </summary> |
88 | public static void InMethod() | 88 | public static void InMethod() |
89 | { | 89 | { |
@@ -129,7 +129,7 @@ namespace OpenSim.Tests.Common | |||
129 | { | 129 | { |
130 | string rawUuid = stem.PadRight(32, '0'); | 130 | string rawUuid = stem.PadRight(32, '0'); |
131 | 131 | ||
132 | return UUID.Parse(rawUuid); | 132 | return UUID.Parse(rawUuid); |
133 | } | 133 | } |
134 | 134 | ||
135 | /// <summary> | 135 | /// <summary> |
@@ -158,7 +158,7 @@ namespace OpenSim.Tests.Common | |||
158 | { | 158 | { |
159 | string rawUuid = stem.PadLeft(32, '0'); | 159 | string rawUuid = stem.PadLeft(32, '0'); |
160 | 160 | ||
161 | return UUID.Parse(rawUuid); | 161 | return UUID.Parse(rawUuid); |
162 | } | 162 | } |
163 | } | 163 | } |
164 | } | 164 | } |