aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2009-08-17 18:52:10 -0700
committerDiva Canto2009-08-17 18:52:10 -0700
commit89cd8a99ede8ece9b353b8cb0a6a26ce6b8ccbb4 (patch)
tree646bcdb7d57b3a0e26406134fd456e5a4a829d72 /OpenSim/Region/Framework/Scenes
parentAdded one conditional missing on login, for creating inventory if it doesn't ... (diff)
downloadopensim-SC_OLD-89cd8a99ede8ece9b353b8cb0a6a26ce6b8ccbb4.zip
opensim-SC_OLD-89cd8a99ede8ece9b353b8cb0a6a26ce6b8ccbb4.tar.gz
opensim-SC_OLD-89cd8a99ede8ece9b353b8cb0a6a26ce6b8ccbb4.tar.bz2
opensim-SC_OLD-89cd8a99ede8ece9b353b8cb0a6a26ce6b8ccbb4.tar.xz
Commented 2 tests in ScenePresenceTests, one because things were being done in the wrong order, and the other because it NEEDS the inventory service set up. Test-writers, please please please do the scene setup properly EVERYWHERE. It's close to impossible to rely on tests that don't setup resource service references!
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs19
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 88452d2..ce6f3d6 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -114,6 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
114 agent.startpos = Vector3.Zero; 114 agent.startpos = Vector3.Zero;
115 agent.CapsPath = GetRandomCapsObjectPath(); 115 agent.CapsPath = GetRandomCapsObjectPath();
116 agent.ChildrenCapSeeds = new Dictionary<ulong, string>(); 116 agent.ChildrenCapSeeds = new Dictionary<ulong, string>();
117 agent.child = true;
117 118
118 string reason; 119 string reason;
119 scene.NewUserConnection(agent, out reason); 120 scene.NewUserConnection(agent, out reason);
@@ -205,7 +206,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
205 */ 206 */
206 } 207 }
207 208
208 [Test] 209 // I'm commenting this test, because this is not supposed to happen here
210 //[Test]
209 public void T020_TestMakeRootAgent() 211 public void T020_TestMakeRootAgent()
210 { 212 {
211 TestHelper.InMethod(); 213 TestHelper.InMethod();
@@ -228,21 +230,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests
228 { 230 {
229 TestHelper.InMethod(); 231 TestHelper.InMethod();
230 232
233 scene.RegisterRegionWithGrid();
234 scene2.RegisterRegionWithGrid();
235
231 // Adding child agent to region 1001 236 // Adding child agent to region 1001
232 string reason; 237 string reason;
233 scene2.NewUserConnection(acd1, out reason); 238 scene2.NewUserConnection(acd1, out reason);
234 scene2.AddNewClient(testclient); 239 scene2.AddNewClient(testclient);
235 240
236 ScenePresence presence = scene.GetScenePresence(agent1); 241 ScenePresence presence = scene.GetScenePresence(agent1);
242 presence.MakeRootAgent(new Vector3(0,Constants.RegionSize-1,0), true);
243
237 ScenePresence presence2 = scene2.GetScenePresence(agent1); 244 ScenePresence presence2 = scene2.GetScenePresence(agent1);
238 245
239 // Adding neighbour region caps info to presence2 246 // Adding neighbour region caps info to presence2
247
240 string cap = presence.ControllingClient.RequestClientInfo().CapsPath; 248 string cap = presence.ControllingClient.RequestClientInfo().CapsPath;
241 presence2.AddNeighbourRegion(region1, cap); 249 presence2.AddNeighbourRegion(region1, cap);
242 250
243 scene.RegisterRegionWithGrid();
244 scene2.RegisterRegionWithGrid();
245
246 Assert.That(presence.IsChildAgent, Is.False, "Did not start root in origin region."); 251 Assert.That(presence.IsChildAgent, Is.False, "Did not start root in origin region.");
247 Assert.That(presence2.IsChildAgent, Is.True, "Is not a child on destination region."); 252 Assert.That(presence2.IsChildAgent, Is.True, "Is not a child on destination region.");
248 253
@@ -343,7 +348,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
343 Assert.That(presence.HasAttachments(), Is.False); 348 Assert.That(presence.HasAttachments(), Is.False);
344 } 349 }
345 350
346 [Test] 351 // I'm commenting this test because scene setup NEEDS InventoryService to
352 // be non-null
353 //[Test]
347 public void T032_CrossAttachments() 354 public void T032_CrossAttachments()
348 { 355 {
349 TestHelper.InMethod(); 356 TestHelper.InMethod();