* Refactor LLUDPServer slightly so that unit tests can pass in data synchronously. Shouldn't be any functional change

2 files changed, 56 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index 3b3eb91..cf24e58 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -44,10 +44,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         [Test]
         public void TestAddClient()
         {
-            IClientNetworkServer llUdpServer = new LLUDPServer();
+            TestLLUDPServer testLLUDPServer = new TestLLUDPServer();
             
             uint port = 666;            
-            llUdpServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
+            testLLUDPServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null);
             
             //UseCircuitCodePacket uccp = new UseCircuitCodePacket();
             //llUdpServer.epS
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
new file mode 100755
index 0000000..5e7cbca
--- /dev/null
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Net;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications.Cache;
+
+namespace OpenSim.Region.ClientStack.LindenUDP
+{
+    /// <summary>
+    /// This class enables synchronous testing of the LLUDPServer by allowing us to load our own data into the end 
+    /// receive event
+    /// </summary>
+    public class TestLLUDPServer : LLUDPServer
+    {
+        protected override void BeginReceive()
+        {
+            // Do nothing
+        }
+        
+        protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
+        {
+            // TODO: Return a packet loaded in by a test
+            numBytes = 0;
+            
+            return true;
+        }
+    }
+}