aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-23 19:51:10 +0000
committerJustin Clarke Casey2008-10-23 19:51:10 +0000
commitc379c66c7c3becdc56066b5f530b06e78117cfec (patch)
tree94586e7f624957bfb9b0c01bbcfdb1017405c002 /OpenSim
parent* Revert to executing existing setup if an added circuit did not already exist (diff)
downloadopensim-SC_OLD-c379c66c7c3becdc56066b5f530b06e78117cfec.zip
opensim-SC_OLD-c379c66c7c3becdc56066b5f530b06e78117cfec.tar.gz
opensim-SC_OLD-c379c66c7c3becdc56066b5f530b06e78117cfec.tar.bz2
opensim-SC_OLD-c379c66c7c3becdc56066b5f530b06e78117cfec.tar.xz
* 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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs5
-rwxr-xr-xOpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs8
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
58 ClientStackUserSettings userSettings = new ClientStackUserSettings(); 58 ClientStackUserSettings userSettings = new ClientStackUserSettings();
59 59
60 uint port = 666; 60 uint port = 666;
61 testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, null); 61 testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, new AgentCircuitManager());
62 LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings); 62 LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings);
63 testLLUDPServer.LocalScene = new MockScene(); 63 testLLUDPServer.LocalScene = new MockScene();
64 64
@@ -73,7 +73,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
73 testLLUDPServer.LoadReceive(uccp, testEp); 73 testLLUDPServer.LoadReceive(uccp, testEp);
74 testLLUDPServer.ReceiveData(null); 74 testLLUDPServer.ReceiveData(null);
75 75
76 //Assert.IsTrue(testLLUDPServer.HasCircuit(123456)); 76 Assert.IsFalse(testLLUDPServer.HasCircuit(101));
77 Assert.IsTrue(testLLUDPServer.HasCircuit(123456));
77 } 78 }
78 } 79 }
79} 80}
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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Net.Sockets;
31using OpenMetaverse.Packets; 32using OpenMetaverse.Packets;
32using OpenSim.Framework; 33using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 34using OpenSim.Framework.Communications.Cache;
@@ -65,6 +66,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
65 return true; 66 return true;
66 } 67 }
67 68
69 public override void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)
70 {
71 // Don't do anything just yet
72 }
73
68 /// <summary> 74 /// <summary>
69 /// Load a packet to be received by the LLUDPServer on the next receive call 75 /// Load a packet to be received by the LLUDPServer on the next receive call
70 /// </summary> 76 /// </summary>
@@ -81,7 +87,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
81 public void ReceiveData(IAsyncResult result) 87 public void ReceiveData(IAsyncResult result)
82 { 88 {
83 OnReceivedData(result); 89 OnReceivedData(result);
84 } 90 }
85 91
86 /// <summary> 92 /// <summary>
87 /// Has a circuit with the given code been established? 93 /// Has a circuit with the given code been established?