aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-05-07 21:56:14 -0700
committerDiva Canto2010-05-07 21:56:14 -0700
commitbfb7a4999010eb9449cd8855236daac67a469f11 (patch)
tree344730b8642855a53a79a7793cdd34551ed6274a
parentThese files are part of the GridUserService write-up. (diff)
downloadopensim-SC_OLD-bfb7a4999010eb9449cd8855236daac67a469f11.zip
opensim-SC_OLD-bfb7a4999010eb9449cd8855236daac67a469f11.tar.gz
opensim-SC_OLD-bfb7a4999010eb9449cd8855236daac67a469f11.tar.bz2
opensim-SC_OLD-bfb7a4999010eb9449cd8855236daac67a469f11.tar.xz
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs4
-rw-r--r--OpenSim/Services/Interfaces/IPresenceService.cs6
2 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
index e5ded5b..ef910f4 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -90,7 +90,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
90 PresenceInfo result = m_LocalConnector.GetAgent(session1); 90 PresenceInfo result = m_LocalConnector.GetAgent(session1);
91 Assert.IsNotNull(result, "Retrieved GetAgent is null"); 91 Assert.IsNotNull(result, "Retrieved GetAgent is null");
92 Assert.That(result.UserID, Is.EqualTo(user1), "Retrieved userID does not match"); 92 Assert.That(result.UserID, Is.EqualTo(user1), "Retrieved userID does not match");
93 Assert.IsTrue(result.Online, "Agent just logged in but is offline");
94 93
95 UUID region1 = UUID.Random(); 94 UUID region1 = UUID.Random();
96 bool r = m_LocalConnector.ReportAgent(session1, region1); 95 bool r = m_LocalConnector.ReportAgent(session1, region1);
@@ -107,8 +106,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
107 r = m_LocalConnector.LogoutAgent(session1); 106 r = m_LocalConnector.LogoutAgent(session1);
108 Assert.IsTrue(r, "LogoutAgent returned false"); 107 Assert.IsTrue(r, "LogoutAgent returned false");
109 result = m_LocalConnector.GetAgent(session1); 108 result = m_LocalConnector.GetAgent(session1);
110 Assert.IsNotNull(result, "Agent session disappeared from storage after logout"); 109 Assert.IsNull(result, "Agent session is still stored after logout");
111 Assert.IsFalse(result.Online, "Agent is reported to be Online after logout");
112 110
113 r = m_LocalConnector.ReportAgent(session1, region1); 111 r = m_LocalConnector.ReportAgent(session1, region1);
114 Assert.IsFalse(r, "ReportAgent of non-logged in user returned true"); 112 Assert.IsFalse(r, "ReportAgent of non-logged in user returned true");
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index 9687d22..abbae2c 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -55,10 +55,6 @@ namespace OpenSim.Services.Interfaces
55 UserID = kvp["UserID"].ToString(); 55 UserID = kvp["UserID"].ToString();
56 if (kvp.ContainsKey("RegionID")) 56 if (kvp.ContainsKey("RegionID"))
57 UUID.TryParse(kvp["RegionID"].ToString(), out RegionID); 57 UUID.TryParse(kvp["RegionID"].ToString(), out RegionID);
58 if (kvp.ContainsKey("lookAt"))
59 Vector3.TryParse(kvp["lookAt"].ToString(), out LookAt);
60 if (kvp.ContainsKey("position"))
61 Vector3.TryParse(kvp["position"].ToString(), out Position);
62 } 58 }
63 59
64 public Dictionary<string, object> ToKeyValuePairs() 60 public Dictionary<string, object> ToKeyValuePairs()
@@ -66,8 +62,6 @@ namespace OpenSim.Services.Interfaces
66 Dictionary<string, object> result = new Dictionary<string, object>(); 62 Dictionary<string, object> result = new Dictionary<string, object>();
67 result["UserID"] = UserID; 63 result["UserID"] = UserID;
68 result["RegionID"] = RegionID.ToString(); 64 result["RegionID"] = RegionID.ToString();
69 result["position"] = Position.ToString();
70 result["lookAt"] = LookAt.ToString();
71 65
72 return result; 66 return result;
73 } 67 }