aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r--OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs3
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs10
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs26
-rw-r--r--OpenSim/Tests/Performance/NPCPerformanceTests.cs2
4 files changed, 32 insertions, 9 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
index 4a15cf2..5bab62c 100644
--- a/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetDataPlugin.cs
@@ -54,9 +54,10 @@ namespace OpenSim.Tests.Common.Mock
54 return assets.Find(x=>x.FullID == uuid); 54 return assets.Find(x=>x.FullID == uuid);
55 } 55 }
56 56
57 public void StoreAsset(AssetBase asset) 57 public bool StoreAsset(AssetBase asset)
58 { 58 {
59 assets.Add(asset); 59 assets.Add(asset);
60 return true;
60 } 61 }
61 62
62 public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); } 63 public List<AssetMetadata> FetchAssetMetadataSet(int start, int count) { return new List<AssetMetadata>(count); }
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index ed29c39..5c1ec0b 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -128,6 +128,11 @@ namespace OpenSim.Data.Null
128 m_store.RemoveRegionEnvironmentSettings(regionUUID); 128 m_store.RemoveRegionEnvironmentSettings(regionUUID);
129 } 129 }
130 130
131 public UUID[] GetObjectIDs(UUID regionID)
132 {
133 return new UUID[0];
134 }
135
131 public void SaveExtra(UUID regionID, string name, string value) 136 public void SaveExtra(UUID regionID, string name, string value)
132 { 137 {
133 } 138 }
@@ -332,6 +337,11 @@ namespace OpenSim.Data.Null
332 { 337 {
333 } 338 }
334 339
340 public UUID[] GetObjectIDs(UUID regionID)
341 {
342 return new UUID[0];
343 }
344
335 public void SaveExtra(UUID regionID, string name, string value) 345 public void SaveExtra(UUID regionID, string name, string value)
336 { 346 {
337 } 347 }
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 182f4d9..2714429 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Tests.Common.Mock
69 public event MoneyTransferRequest OnMoneyTransferRequest; 69 public event MoneyTransferRequest OnMoneyTransferRequest;
70 public event ParcelBuy OnParcelBuy; 70 public event ParcelBuy OnParcelBuy;
71 public event Action<IClientAPI> OnConnectionClosed; 71 public event Action<IClientAPI> OnConnectionClosed;
72 72 public event MoveItemsAndLeaveCopy OnMoveItemsAndLeaveCopy;
73 public event ImprovedInstantMessage OnInstantMessage; 73 public event ImprovedInstantMessage OnInstantMessage;
74 public event ChatMessage OnChatFromClient; 74 public event ChatMessage OnChatFromClient;
75 public event TextureRequest OnRequestTexture; 75 public event TextureRequest OnRequestTexture;
@@ -86,6 +86,7 @@ namespace OpenSim.Tests.Common.Mock
86 public event ObjectDrop OnObjectDrop; 86 public event ObjectDrop OnObjectDrop;
87 public event StartAnim OnStartAnim; 87 public event StartAnim OnStartAnim;
88 public event StopAnim OnStopAnim; 88 public event StopAnim OnStopAnim;
89 public event ChangeAnim OnChangeAnim;
89 public event LinkObjects OnLinkObjects; 90 public event LinkObjects OnLinkObjects;
90 public event DelinkObjects OnDelinkObjects; 91 public event DelinkObjects OnDelinkObjects;
91 public event RequestMapBlocks OnRequestMapBlocks; 92 public event RequestMapBlocks OnRequestMapBlocks;
@@ -133,6 +134,7 @@ namespace OpenSim.Tests.Common.Mock
133 public event GenericCall7 OnObjectMaterial; 134 public event GenericCall7 OnObjectMaterial;
134 public event UpdatePrimFlags OnUpdatePrimFlags; 135 public event UpdatePrimFlags OnUpdatePrimFlags;
135 public event UpdatePrimTexture OnUpdatePrimTexture; 136 public event UpdatePrimTexture OnUpdatePrimTexture;
137 public event ClientChangeObject onClientChangeObject;
136 public event UpdateVector OnUpdatePrimGroupPosition; 138 public event UpdateVector OnUpdatePrimGroupPosition;
137 public event UpdateVector OnUpdatePrimSinglePosition; 139 public event UpdateVector OnUpdatePrimSinglePosition;
138 public event UpdatePrimRotation OnUpdatePrimGroupRotation; 140 public event UpdatePrimRotation OnUpdatePrimGroupRotation;
@@ -274,7 +276,7 @@ namespace OpenSim.Tests.Common.Mock
274 public event ClassifiedInfoRequest OnClassifiedInfoRequest; 276 public event ClassifiedInfoRequest OnClassifiedInfoRequest;
275 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate; 277 public event ClassifiedInfoUpdate OnClassifiedInfoUpdate;
276 public event ClassifiedDelete OnClassifiedDelete; 278 public event ClassifiedDelete OnClassifiedDelete;
277 public event ClassifiedDelete OnClassifiedGodDelete; 279 public event ClassifiedGodDelete OnClassifiedGodDelete;
278 280
279 public event EventNotificationAddRequest OnEventNotificationAddRequest; 281 public event EventNotificationAddRequest OnEventNotificationAddRequest;
280 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest; 282 public event EventNotificationRemoveRequest OnEventNotificationRemoveRequest;
@@ -313,11 +315,12 @@ namespace OpenSim.Tests.Common.Mock
313 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest; 315 public event GroupVoteHistoryRequest OnGroupVoteHistoryRequest;
314 public event SimWideDeletesDelegate OnSimWideDeletes; 316 public event SimWideDeletesDelegate OnSimWideDeletes;
315 public event SendPostcard OnSendPostcard; 317 public event SendPostcard OnSendPostcard;
318 public event ChangeInventoryItemFlags OnChangeInventoryItemFlags;
316 public event MuteListEntryUpdate OnUpdateMuteListEntry; 319 public event MuteListEntryUpdate OnUpdateMuteListEntry;
317 public event MuteListEntryRemove OnRemoveMuteListEntry; 320 public event MuteListEntryRemove OnRemoveMuteListEntry;
318 public event GodlikeMessage onGodlikeMessage; 321 public event GodlikeMessage onGodlikeMessage;
319 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate; 322 public event GodUpdateRegionInfoUpdate OnGodUpdateRegionInfoUpdate;
320 323 public event GenericCall2 OnUpdateThrottles;
321#pragma warning restore 67 324#pragma warning restore 67
322 325
323 /// <value> 326 /// <value>
@@ -518,6 +521,12 @@ namespace OpenSim.Tests.Common.Mock
518 public virtual void SetChildAgentThrottle(byte[] throttle) 521 public virtual void SetChildAgentThrottle(byte[] throttle)
519 { 522 {
520 } 523 }
524
525 public void SetAgentThrottleSilent(int throttle, int setting)
526 {
527
528
529 }
521 public byte[] GetThrottlesPacked(float multiplier) 530 public byte[] GetThrottlesPacked(float multiplier)
522 { 531 {
523 return new byte[0]; 532 return new byte[0];
@@ -709,6 +718,10 @@ namespace OpenSim.Tests.Common.Mock
709 { 718 {
710 } 719 }
711 720
721 public void SendInventoryItemCreateUpdate(InventoryItemBase Item, UUID transactionID, uint callbackId)
722 {
723 }
724
712 public virtual void SendRemoveInventoryItem(UUID itemID) 725 public virtual void SendRemoveInventoryItem(UUID itemID)
713 { 726 {
714 } 727 }
@@ -725,7 +738,7 @@ namespace OpenSim.Tests.Common.Mock
725 { 738 {
726 } 739 }
727 740
728 public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data) 741 public virtual void SendXferPacket(ulong xferID, uint packet, byte[] data, bool isTaskInventory)
729 { 742 {
730 } 743 }
731 744
@@ -930,10 +943,10 @@ namespace OpenSim.Tests.Common.Mock
930 943
931 public void Close() 944 public void Close()
932 { 945 {
933 Close(false); 946 Close(true, false);
934 } 947 }
935 948
936 public void Close(bool force) 949 public void Close(bool sendStop, bool force)
937 { 950 {
938 // Fire the callback for this connection closing 951 // Fire the callback for this connection closing
939 // This is necesary to get the presence detector to notice that a client has logged out. 952 // This is necesary to get the presence detector to notice that a client has logged out.
@@ -1280,6 +1293,5 @@ namespace OpenSim.Tests.Common.Mock
1280 public void SendPartPhysicsProprieties(ISceneEntity entity) 1293 public void SendPartPhysicsProprieties(ISceneEntity entity)
1281 { 1294 {
1282 } 1295 }
1283
1284 } 1296 }
1285} 1297}
diff --git a/OpenSim/Tests/Performance/NPCPerformanceTests.cs b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
index 2026a88..fde1b91 100644
--- a/OpenSim/Tests/Performance/NPCPerformanceTests.cs
+++ b/OpenSim/Tests/Performance/NPCPerformanceTests.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Tests.Performance
144 // ScenePresence.SendInitialData() to reset our entire appearance. 144 // ScenePresence.SendInitialData() to reset our entire appearance.
145 scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId)); 145 scene.AssetService.Store(AssetHelpers.CreateNotecardAsset(originalFace8TextureId));
146 146
147 afm.SetAppearance(sp, originalTe, null); 147 afm.SetAppearance(sp, originalTe, null, new WearableCacheItem[0]);
148 148
149 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>(); 149 INPCModule npcModule = scene.RequestModuleInterface<INPCModule>();
150 150