diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs | 33 | ||||
-rwxr-xr-x | OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | 66 |
2 files changed, 91 insertions, 8 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 | ||
28 | using System.Net; | 28 | using System.Net; |
29 | using log4net; | ||
29 | using NUnit.Framework; | 30 | using NUnit.Framework; |
30 | using OpenMetaverse.Packets; | 31 | using OpenMetaverse.Packets; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -33,7 +34,7 @@ using OpenSim.Framework.Communications; | |||
33 | using OpenSim.Region.ClientStack; | 34 | using OpenSim.Region.ClientStack; |
34 | using OpenSim.Region.ClientStack.LindenUDP; | 35 | using OpenSim.Region.ClientStack.LindenUDP; |
35 | 36 | ||
36 | namespace OpenSim.Region.ClientStack.LindenUDP | 37 | namespace 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 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
29 | using System.Net; | 30 | using System.Net; |
31 | using OpenMetaverse.Packets; | ||
30 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
31 | using OpenSim.Framework.Communications.Cache; | 33 | using OpenSim.Framework.Communications.Cache; |
32 | 34 | ||
33 | namespace OpenSim.Region.ClientStack.LindenUDP | 35 | namespace 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 |