aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-23 19:08:54 +0000
committerJustin Clarke Casey2008-10-23 19:08:54 +0000
commitf4ad99f89d4d04f71852e2ebadd36b9a993123f8 (patch)
tree1289eaa0136a305c110f409ec41df37eeb25379f
parent* Refactor LLUDPServer slightly so that unit tests can pass in data synchrono... (diff)
downloadopensim-SC_OLD-f4ad99f89d4d04f71852e2ebadd36b9a993123f8.zip
opensim-SC_OLD-f4ad99f89d4d04f71852e2ebadd36b9a993123f8.tar.gz
opensim-SC_OLD-f4ad99f89d4d04f71852e2ebadd36b9a993123f8.tar.bz2
opensim-SC_OLD-f4ad99f89d4d04f71852e2ebadd36b9a993123f8.tar.xz
* Introduce a basic udp circuit test for adding a client
* Temporarily disabled assert because it just picked up an existing bug. Yay for tests!
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs33
-rwxr-xr-xOpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs66
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs1
-rw-r--r--prebuild.xml5
4 files changed, 96 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index cf24e58..e32e423 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System.Net; 28using System.Net;
29using log4net;
29using NUnit.Framework; 30using NUnit.Framework;
30using OpenMetaverse.Packets; 31using OpenMetaverse.Packets;
31using OpenSim.Framework; 32using OpenSim.Framework;
@@ -33,7 +34,7 @@ using OpenSim.Framework.Communications;
33using OpenSim.Region.ClientStack; 34using OpenSim.Region.ClientStack;
34using OpenSim.Region.ClientStack.LindenUDP; 35using OpenSim.Region.ClientStack.LindenUDP;
35 36
36namespace OpenSim.Region.ClientStack.LindenUDP 37namespace OpenSim.Region.ClientStack.LindenUDP.Tests
37{ 38{
38 /// <summary> 39 /// <summary>
39 /// This will contain basic tests for the LindenUDP client stack 40 /// This will contain basic tests for the LindenUDP client stack
@@ -44,13 +45,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
44 [Test] 45 [Test]
45 public void TestAddClient() 46 public void TestAddClient()
46 { 47 {
47 TestLLUDPServer testLLUDPServer = new TestLLUDPServer(); 48 try
49 {
50 log4net.Config.XmlConfigurator.Configure();
51 }
52 catch
53 {
54 // I don't care, just leave log4net off
55 }
56
57 TestLLUDPServer testLLUDPServer = new TestLLUDPServer();
58 ClientStackUserSettings userSettings = new ClientStackUserSettings();
48 59
49 uint port = 666; 60 uint port = 666;
50 testLLUDPServer.Initialise(null, ref port, -1, false, new ClientStackUserSettings(), null, null); 61 testLLUDPServer.Initialise(null, ref port, 0, false, userSettings, null, null);
62 LLPacketServer packetServer = new LLPacketServer(testLLUDPServer, userSettings);
63 testLLUDPServer.LocalScene = new MockScene();
64
65 UseCircuitCodePacket uccp = new UseCircuitCodePacket();
66 UseCircuitCodePacket.CircuitCodeBlock uccpCcBlock
67 = new OpenMetaverse.Packets.UseCircuitCodePacket.CircuitCodeBlock();
68 uccpCcBlock.Code = 123456;
69 uccp.CircuitCode = uccpCcBlock;
70
71 EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999);
72
73 testLLUDPServer.LoadReceive(uccp, testEp);
74 testLLUDPServer.ReceiveData(null);
51 75
52 //UseCircuitCodePacket uccp = new UseCircuitCodePacket(); 76 //Assert.IsTrue(testLLUDPServer.HasCircuit(123456));
53 //llUdpServer.epS
54 } 77 }
55 } 78 }
56} 79}
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
index 5e7cbca..bd5b282 100755
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs
@@ -26,11 +26,13 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
29using System.Net; 30using System.Net;
31using OpenMetaverse.Packets;
30using OpenSim.Framework; 32using OpenSim.Framework;
31using OpenSim.Framework.Communications.Cache; 33using OpenSim.Framework.Communications.Cache;
32 34
33namespace OpenSim.Region.ClientStack.LindenUDP 35namespace OpenSim.Region.ClientStack.LindenUDP.Tests
34{ 36{
35 /// <summary> 37 /// <summary>
36 /// This class enables synchronous testing of the LLUDPServer by allowing us to load our own data into the end 38 /// This class enables synchronous testing of the LLUDPServer by allowing us to load our own data into the end
@@ -38,6 +40,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
38 /// </summary> 40 /// </summary>
39 public class TestLLUDPServer : LLUDPServer 41 public class TestLLUDPServer : LLUDPServer
40 { 42 {
43 /// <summary>
44 /// The chunks of data to pass to the LLUDPServer when it calls EndReceive
45 /// </summary>
46 protected Queue<ChunkSenderTuple> m_chunksToLoad = new Queue<ChunkSenderTuple>();
47
41 protected override void BeginReceive() 48 protected override void BeginReceive()
42 { 49 {
43 // Do nothing 50 // Do nothing
@@ -45,10 +52,63 @@ namespace OpenSim.Region.ClientStack.LindenUDP
45 52
46 protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender) 53 protected override bool EndReceive(out int numBytes, IAsyncResult result, ref EndPoint epSender)
47 { 54 {
48 // TODO: Return a packet loaded in by a test
49 numBytes = 0; 55 numBytes = 0;
50 56
57 if (m_chunksToLoad.Count <= 0)
58 return false;
59
60 ChunkSenderTuple tuple = m_chunksToLoad.Dequeue();
61 RecvBuffer = tuple.Data;
62 numBytes = tuple.Data.Length;
63 epSender = tuple.Sender;
64
51 return true; 65 return true;
52 } 66 }
67
68 /// <summary>
69 /// Load a packet to be received by the LLUDPServer on the next receive call
70 /// </summary>
71 /// <param name="packet"></param>
72 public void LoadReceive(Packet packet, EndPoint epSender)
73 {
74 m_chunksToLoad.Enqueue(new ChunkSenderTuple(packet.ToBytes(), epSender));
75 }
76
77 /// <summary>
78 /// Calls the protected asynchronous result method
79 /// </summary>
80 /// <param name="result"></param>
81 public void ReceiveData(IAsyncResult result)
82 {
83 OnReceivedData(result);
84 }
85
86 /// <summary>
87 /// Has a circuit with the given code been established?
88 /// </summary>
89 /// <param name="circuitCode"></param>
90 /// <returns></returns>
91 public bool HasCircuit(uint circuitCode)
92 {
93 lock (clientCircuits_reverse)
94 {
95 return clientCircuits_reverse.ContainsKey(circuitCode);
96 }
97 }
98 }
99
100 /// <summary>
101 /// Record the data and sender tuple
102 /// </summary>
103 public class ChunkSenderTuple
104 {
105 public byte[] Data;
106 public EndPoint Sender;
107
108 public ChunkSenderTuple(byte[] data, EndPoint sender)
109 {
110 Data = data;
111 Sender = sender;
112 }
53 } 113 }
54} 114} \ No newline at end of file
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 1406b47..7a3e58f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -179,6 +179,7 @@ namespace OpenSim.Region.Environment.Scenes
179 { 179 {
180 return false; 180 return false;
181 } 181 }
182
182 public abstract bool OtherRegionUp(RegionInfo thisRegion); 183 public abstract bool OtherRegionUp(RegionInfo thisRegion);
183 184
184 public virtual string GetSimulatorVersion() 185 public virtual string GetSimulatorVersion()
diff --git a/prebuild.xml b/prebuild.xml
index 702fefa..961a56e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -991,12 +991,15 @@
991 991
992 <ReferencePath>../../../../../bin/</ReferencePath> 992 <ReferencePath>../../../../../bin/</ReferencePath>
993 <Reference name="System"/> 993 <Reference name="System"/>
994 <Reference name="log4net.dll"/>
995 <Reference name="nunit.framework.dll" />
994 <Reference name="OpenMetaverse.dll"/> 996 <Reference name="OpenMetaverse.dll"/>
997 <Reference name="OpenMetaverseTypes.dll"/>
995 <Reference name="OpenSim.Framework"/> 998 <Reference name="OpenSim.Framework"/>
996 <Reference name="OpenSim.Framework.Communications"/> 999 <Reference name="OpenSim.Framework.Communications"/>
997 <Reference name="OpenSim.Region.ClientStack"/> 1000 <Reference name="OpenSim.Region.ClientStack"/>
998 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> 1001 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
999 <Reference name="nunit.framework.dll" /> 1002 <Reference name="OpenSim.Region.Environment"/>
1000 1003
1001 <Files> 1004 <Files>
1002 <Match pattern="*.cs" recurse="false"/> 1005 <Match pattern="*.cs" recurse="false"/>