aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications/Tests
diff options
context:
space:
mode:
authorlbsa712009-02-12 09:53:12 +0000
committerlbsa712009-02-12 09:53:12 +0000
commit801da4346aeb3c08969c4845f5c595135a64470a (patch)
tree2f06e24c72e0d513c8e4c6aa9b75cd2c7b50f393 /OpenSim/Framework/Communications/Tests
parentThanks Kitto Flora for a patch that adds automatic min fly height to ODE - Ma... (diff)
downloadopensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.zip
opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.gz
opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.bz2
opensim-SC-801da4346aeb3c08969c4845f5c595135a64470a.tar.xz
* optimized usings.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs7
-rw-r--r--OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs2
-rw-r--r--OpenSim/Framework/Communications/Tests/LoginServiceTests.cs10
3 files changed, 6 insertions, 13 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index 86d85b1..cda9d5c 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -25,16 +25,13 @@
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28using System;
29using log4net;
30using NUnit.Framework; 28using NUnit.Framework;
31using NUnit.Framework.SyntaxHelpers; 29using NUnit.Framework.SyntaxHelpers;
32using OpenMetaverse; 30using OpenMetaverse;
33//using OpenSim.Framework; 31using OpenSim.Data;
34using OpenSim.Framework.Communications.Cache; 32using OpenSim.Framework.Communications.Cache;
35using OpenSim.Region.Communications.Local;
36using OpenSim.Tests.Common.Mock; 33using OpenSim.Tests.Common.Mock;
37using OpenSim.Data; 34//using OpenSim.Framework;
38 35
39namespace OpenSim.Framework.Communications.Tests 36namespace OpenSim.Framework.Communications.Tests
40{ 37{
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
index cf07ae5..85cc940 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileTestUtils.cs
@@ -26,10 +26,8 @@
26 */ 26 */
27 27
28using OpenMetaverse; 28using OpenMetaverse;
29using OpenSim.Framework.Communications;
30using OpenSim.Framework.Communications.Cache; 29using OpenSim.Framework.Communications.Cache;
31using OpenSim.Region.Communications.Local; 30using OpenSim.Region.Communications.Local;
32using OpenSim.Tests.Common.Mock;
33 31
34namespace OpenSim.Framework.Communications.Tests 32namespace OpenSim.Framework.Communications.Tests
35{ 33{
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index ffa3c5f..57ed0f5 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -29,8 +29,6 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Net; 30using System.Net;
31using System.Text.RegularExpressions; 31using System.Text.RegularExpressions;
32using System.Xml;
33using Nini;
34using NUnit.Framework; 32using NUnit.Framework;
35using NUnit.Framework.SyntaxHelpers; 33using NUnit.Framework.SyntaxHelpers;
36using Nwc.XmlRpc; 34using Nwc.XmlRpc;
@@ -61,7 +59,7 @@ namespace OpenSim.Framework.Communications.Tests
61 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 59 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
62 60
63 CommunicationsManager commsManager 61 CommunicationsManager commsManager
64 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); 62 = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
65 63
66 commsManager.GridService.RegisterRegion( 64 commsManager.GridService.RegisterRegion(
67 new RegionInfo(42, 43, capsEndPoint, regionExternalName)); 65 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -89,7 +87,7 @@ namespace OpenSim.Framework.Communications.Tests
89 Assert.That(responseData["first_name"], Is.EqualTo(firstName)); 87 Assert.That(responseData["first_name"], Is.EqualTo(firstName));
90 Assert.That(responseData["last_name"], Is.EqualTo(lastName)); 88 Assert.That(responseData["last_name"], Is.EqualTo(lastName));
91 Assert.That( 89 Assert.That(
92 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); 90 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
93 91
94 Regex capsSeedPattern 92 Regex capsSeedPattern
95 = new Regex("^http://" 93 = new Regex("^http://"
@@ -108,7 +106,7 @@ namespace OpenSim.Framework.Communications.Tests
108 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123); 106 IPEndPoint capsEndPoint = new IPEndPoint(IPAddress.Loopback, 9123);
109 107
110 CommunicationsManager commsManager 108 CommunicationsManager commsManager
111 = new TestCommunicationsManager(new OpenSim.Framework.NetworkServersInfo(42, 43)); 109 = new TestCommunicationsManager(new NetworkServersInfo(42, 43));
112 110
113 commsManager.GridService.RegisterRegion( 111 commsManager.GridService.RegisterRegion(
114 new RegionInfo(42, 43, capsEndPoint, regionExternalName)); 112 new RegionInfo(42, 43, capsEndPoint, regionExternalName));
@@ -159,7 +157,7 @@ namespace OpenSim.Framework.Communications.Tests
159 Hashtable invlibroothash = (Hashtable) invlibroot[0]; 157 Hashtable invlibroothash = (Hashtable) invlibroot[0];
160 Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000")); 158 Assert.That(invlibroothash["folder_id"],Is.EqualTo("00000112-000f-0000-0000-000100bba000"));
161 Assert.That( 159 Assert.That(
162 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(System.Int32.MaxValue)); 160 responseData["circuit_code"], Is.GreaterThanOrEqualTo(0) & Is.LessThanOrEqualTo(Int32.MaxValue));
163 Assert.That(responseData["message"], Is.EqualTo("Hello folks")); 161 Assert.That(responseData["message"], Is.EqualTo("Hello folks"));
164 Assert.That(responseData["buddy-list"], Is.Empty); 162 Assert.That(responseData["buddy-list"], Is.Empty);
165 Assert.That(responseData["start_location"], Is.EqualTo("last")); 163 Assert.That(responseData["start_location"], Is.EqualTo("last"));