From 9356963bd36e5c3b8c2b27bfcc2efa60ffbd02d6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Jan 2012 19:00:11 +0000
Subject: Add basic request and send image regression tests for LLImageManager

---
 OpenSim/Tests/Common/Mock/TestClient.cs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 37b90e1..2fc6572 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -44,9 +44,6 @@ namespace OpenSim.Tests.Common.Mock
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        // Mock testing variables
-        public List<ImageDataPacket> sentdatapkt = new List<ImageDataPacket>();
-        public List<ImagePacketPacket> sentpktpkt = new List<ImagePacketPacket>();
         EventWaitHandle wh = new EventWaitHandle (false, EventResetMode.AutoReset, "Crossing");
 
         // TODO: This is a really nasty (and temporary) means of telling the test client which scene to invoke setup
@@ -61,6 +58,9 @@ namespace OpenSim.Tests.Common.Mock
         public List<UUID> ReceivedOnlineNotifications { get; private set; }
         public List<UUID> ReceivedFriendshipTerminations { get; private set; }
 
+        public List<ImageDataPacket> SentImageDataPackets { get; private set; }
+        public List<ImagePacketPacket> SentImagePacketPackets { get; private set; }
+
 // disable warning: public events, part of the public API
 #pragma warning disable 67
 
@@ -452,6 +452,9 @@ namespace OpenSim.Tests.Common.Mock
             ReceivedOfflineNotifications = new List<UUID>();
             ReceivedOnlineNotifications = new List<UUID>();
             ReceivedFriendshipTerminations = new List<UUID>();
+
+            SentImageDataPackets = new List<ImageDataPacket>();
+            SentImagePacketPackets = new List<ImagePacketPacket>();
         }
 
         /// <summary>
@@ -804,7 +807,7 @@ namespace OpenSim.Tests.Common.Mock
             im.ImageData.Data = ImageData;
             im.ImageID.Codec = imageCodec;
             im.Header.Zerocoded = true;
-            sentdatapkt.Add(im);
+            SentImageDataPackets.Add(im);
         }
 
         public void SendImageNextPart(ushort partNumber, UUID imageUuid, byte[] imageData)
@@ -814,7 +817,7 @@ namespace OpenSim.Tests.Common.Mock
             im.ImageID.Packet = partNumber;
             im.ImageID.ID = imageUuid;
             im.ImageData.Data = imageData;
-            sentpktpkt.Add(im);
+            SentImagePacketPackets.Add(im);
         }
 
         public void SendImageNotFound(UUID imageid)
-- 
cgit v1.1


From d38e2c0c91b684d54974865d3ac2fb88c3354c21 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 19 Jan 2012 21:57:12 +0000
Subject: Add image not in database test for LLImageManager

---
 OpenSim/Tests/Common/Mock/TestClient.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 2fc6572..fad757a 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -60,6 +60,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public List<ImageDataPacket> SentImageDataPackets { get; private set; }
         public List<ImagePacketPacket> SentImagePacketPackets { get; private set; }
+        public List<ImageNotInDatabasePacket> SentImageNotInDatabasePackets { get; private set; }
 
 // disable warning: public events, part of the public API
 #pragma warning disable 67
@@ -455,6 +456,7 @@ namespace OpenSim.Tests.Common.Mock
 
             SentImageDataPackets = new List<ImageDataPacket>();
             SentImagePacketPackets = new List<ImagePacketPacket>();
+            SentImageNotInDatabasePackets = new List<ImageNotInDatabasePacket>();
         }
 
         /// <summary>
@@ -822,6 +824,10 @@ namespace OpenSim.Tests.Common.Mock
 
         public void SendImageNotFound(UUID imageid)
         {
+            ImageNotInDatabasePacket p = new ImageNotInDatabasePacket();
+            p.ImageID.ID = imageid;
+
+            SentImageNotInDatabasePackets.Add(p);
         }
 
         public void SendShutdownConnectionNotice()
-- 
cgit v1.1


From b6f3de5028ab9a288f60b020a0dffda079dc550d Mon Sep 17 00:00:00 2001
From: BlueWall
Date: Fri, 20 Jan 2012 23:50:37 -0500
Subject: Telehub Support:

	Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
---
 OpenSim/Tests/Common/Mock/TestClient.cs | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 2fc6572..8a71dfd 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -193,6 +193,7 @@ namespace OpenSim.Tests.Common.Mock
         public event RegionInfoRequest OnRegionInfoRequest;
         public event EstateCovenantRequest OnEstateCovenantRequest;
         public event EstateChangeInfo OnEstateChangeInfo;
+        public event EstateManageTelehub OnEstateManageTelehub;
 
         public event ObjectDuplicateOnRay OnObjectDuplicateOnRay;
 
@@ -945,6 +946,10 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
+        public void SendTelehubInfo(UUID ObjectID, string ObjectName, Vector3 ObjectPos, Quaternion ObjectRot, List<Vector3> SpawnPoint)
+        {
+        }
+
         public void SendEstateList(UUID invoice, int code, UUID[] Data, uint estateID)
         {
         }
-- 
cgit v1.1