* Reenable assert for the add circuit test

* This checks that a client circuit is established when the udp server is given a use client circuit code packet
* And checks that other circuit codes do not exist

2 files changed, 10 insertions, 3 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index e32e423..7d1d238 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             ClientStackUserSettings userSettings = new ClientStackUserSettings();
             
             uint port = 666;            
-            testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, null);
+            testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, new AgentCircuitManager());
             LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings);
             testLLUDPServer.LocalScene = new MockScene();
             
@@ -73,7 +73,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             testLLUDPServer.LoadReceive(uccp, testEp);            
             testLLUDPServer.ReceiveData(null);        
             
-            //Assert.IsTrue(testLLUDPServer.HasCircuit(123456));
+            Assert.IsFalse(testLLUDPServer.HasCircuit(101));
+            Assert.IsTrue(testLLUDPServer.HasCircuit(123456));
         }
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index bd5b282..252b2fc 100755
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Net;
+using System.Net.Sockets;
 using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
@@ -65,6 +66,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
             return true;
         }
         
+        public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode) 
+        {
+            // Don't do anything just yet
+        }
+        
         /// <summary>
         /// Load a packet to be received by the LLUDPServer on the next receive call
         /// </summary>
@@ -81,7 +87,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
         public void ReceiveData(IAsyncResult result)
         {
             OnReceivedData(result);
-        }
+        }                
         
         /// <summary>

         /// Has a circuit with the given code been established?