aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs21
1 files changed, 11 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 2903766..8801176 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Interfaces; 42using OpenSim.Region.Framework.Interfaces;
43using OpenSim.Region.CoreModules.ServiceConnectors.Interregion; 43using OpenSim.Region.CoreModules.ServiceConnectors.Interregion;
44using OpenSim.Region.CoreModules.World.Serialiser; 44using OpenSim.Region.CoreModules.World.Serialiser;
45using OpenSim.Tests.Common;
45using OpenSim.Tests.Common.Mock; 46using OpenSim.Tests.Common.Mock;
46using OpenSim.Tests.Common.Setup; 47using OpenSim.Tests.Common.Setup;
47 48
@@ -99,7 +100,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
99 [Test] 100 [Test]
100 public void T010_TestAddRootAgent() 101 public void T010_TestAddRootAgent()
101 { 102 {
102 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 103 TestHelper.InMethod();
103 104
104 string firstName = "testfirstname"; 105 string firstName = "testfirstname";
105 106
@@ -133,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
133 [Test] 134 [Test]
134 public void T011_TestRemoveRootAgent() 135 public void T011_TestRemoveRootAgent()
135 { 136 {
136 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 137 TestHelper.InMethod();
137 138
138 scene.RemoveClient(agent1); 139 scene.RemoveClient(agent1);
139 140
@@ -145,7 +146,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
145 [Test] 146 [Test]
146 public void T012_TestAddNeighbourRegion() 147 public void T012_TestAddNeighbourRegion()
147 { 148 {
148 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 149 TestHelper.InMethod();
149 150
150 string reason; 151 string reason;
151 scene.NewUserConnection(acd1, out reason); 152 scene.NewUserConnection(acd1, out reason);
@@ -167,7 +168,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
167 [Test] 168 [Test]
168 public void T013_TestRemoveNeighbourRegion() 169 public void T013_TestRemoveNeighbourRegion()
169 { 170 {
170 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 171 TestHelper.InMethod();
171 172
172 ScenePresence presence = scene.GetScenePresence(agent1); 173 ScenePresence presence = scene.GetScenePresence(agent1);
173 presence.RemoveNeighbourRegion(region3); 174 presence.RemoveNeighbourRegion(region3);
@@ -184,7 +185,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
184 [Test] 185 [Test]
185 public void T020_TestMakeRootAgent() 186 public void T020_TestMakeRootAgent()
186 { 187 {
187 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 188 TestHelper.InMethod();
188 189
189 ScenePresence presence = scene.GetScenePresence(agent1); 190 ScenePresence presence = scene.GetScenePresence(agent1);
190 Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent"); 191 Assert.That(presence.IsChildAgent, Is.False, "Starts out as a root agent");
@@ -202,7 +203,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
202 [Test] 203 [Test]
203 public void T021_TestCrossToNewRegion() 204 public void T021_TestCrossToNewRegion()
204 { 205 {
205 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 206 TestHelper.InMethod();
206 207
207 // Adding child agent to region 1001 208 // Adding child agent to region 1001
208 string reason; 209 string reason;
@@ -295,7 +296,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
295 [Test] 296 [Test]
296 public void T030_TestAddAttachments() 297 public void T030_TestAddAttachments()
297 { 298 {
298 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 299 TestHelper.InMethod();
299 300
300 ScenePresence presence = scene.GetScenePresence(agent1); 301 ScenePresence presence = scene.GetScenePresence(agent1);
301 302
@@ -310,7 +311,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
310 [Test] 311 [Test]
311 public void T031_RemoveAttachments() 312 public void T031_RemoveAttachments()
312 { 313 {
313 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 314 TestHelper.InMethod();
314 315
315 ScenePresence presence = scene.GetScenePresence(agent1); 316 ScenePresence presence = scene.GetScenePresence(agent1);
316 presence.RemoveAttachment(sog1); 317 presence.RemoveAttachment(sog1);
@@ -322,7 +323,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
322 [Test] 323 [Test]
323 public void T032_CrossAttachments() 324 public void T032_CrossAttachments()
324 { 325 {
325 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 326 TestHelper.InMethod();
326 327
327 ScenePresence presence = scene.GetScenePresence(agent1); 328 ScenePresence presence = scene.GetScenePresence(agent1);
328 ScenePresence presence2 = scene2.GetScenePresence(agent1); 329 ScenePresence presence2 = scene2.GetScenePresence(agent1);
@@ -342,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
342 343
343 public static string GetRandomCapsObjectPath() 344 public static string GetRandomCapsObjectPath()
344 { 345 {
345 Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); 346 TestHelper.InMethod();
346 347
347 UUID caps = UUID.Random(); 348 UUID caps = UUID.Random();
348 string capsPath = caps.ToString(); 349 string capsPath = caps.ToString();