aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-06 02:38:38 +0100
committerJustin Clark-Casey (justincc)2011-08-06 02:38:38 +0100
commiteec54adac5b6745c147ac7f7db947dba16e39d06 (patch)
tree9e3d429de624e7ede6315e492d257bea3d563c58 /OpenSim/Region
parentAdd a test to check that ScenePresence and circuit go away when a root agent ... (diff)
downloadopensim-SC-eec54adac5b6745c147ac7f7db947dba16e39d06.zip
opensim-SC-eec54adac5b6745c147ac7f7db947dba16e39d06.tar.gz
opensim-SC-eec54adac5b6745c147ac7f7db947dba16e39d06.tar.bz2
opensim-SC-eec54adac5b6745c147ac7f7db947dba16e39d06.tar.xz
remove some obsolete tests that are now done elsewhere
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs106
1 files changed, 53 insertions, 53 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
index 6cf905a..dd2c717 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceAgentTests.cs
@@ -135,64 +135,64 @@ namespace OpenSim.Region.Framework.Scenes.Tests
135 135
136 SceneHelpers.AddScenePresence(myScene1, agent1Id); 136 SceneHelpers.AddScenePresence(myScene1, agent1Id);
137// ScenePresence childPresence = myScene2.GetScenePresence(agent1); 137// ScenePresence childPresence = myScene2.GetScenePresence(agent1);
138 138
139 // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents 139 // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents
140// Assert.That(childPresence, Is.Not.Null); 140// Assert.That(childPresence, Is.Not.Null);
141// Assert.That(childPresence.IsChildAgent, Is.True); 141// Assert.That(childPresence.IsChildAgent, Is.True);
142 } 142 }
143 143
144 /// <summary> 144// /// <summary>
145 /// Test adding a root agent to a scene. Doesn't yet actually complete crossing the agent into the scene. 145// /// Test adding a root agent to a scene. Doesn't yet actually complete crossing the agent into the scene.
146 /// </summary> 146// /// </summary>
147 [Test] 147// [Test]
148 public void T010_TestAddRootAgent() 148// public void T010_TestAddRootAgent()
149 { 149// {
150 TestHelpers.InMethod(); 150// TestHelpers.InMethod();
151 151//
152 string firstName = "testfirstname"; 152// string firstName = "testfirstname";
153 153//
154 AgentCircuitData agent = new AgentCircuitData(); 154// AgentCircuitData agent = new AgentCircuitData();
155 agent.AgentID = agent1; 155// agent.AgentID = agent1;
156 agent.firstname = firstName; 156// agent.firstname = firstName;
157 agent.lastname = "testlastname"; 157// agent.lastname = "testlastname";
158 agent.SessionID = UUID.Random(); 158// agent.SessionID = UUID.Random();
159 agent.SecureSessionID = UUID.Random(); 159// agent.SecureSessionID = UUID.Random();
160 agent.circuitcode = 123; 160// agent.circuitcode = 123;
161 agent.BaseFolder = UUID.Zero; 161// agent.BaseFolder = UUID.Zero;
162 agent.InventoryFolder = UUID.Zero; 162// agent.InventoryFolder = UUID.Zero;
163 agent.startpos = Vector3.Zero; 163// agent.startpos = Vector3.Zero;
164 agent.CapsPath = GetRandomCapsObjectPath(); 164// agent.CapsPath = GetRandomCapsObjectPath();
165 agent.ChildrenCapSeeds = new Dictionary<ulong, string>(); 165// agent.ChildrenCapSeeds = new Dictionary<ulong, string>();
166 agent.child = true; 166// agent.child = true;
167 167//
168 scene.PresenceService.LoginAgent(agent.AgentID.ToString(), agent.SessionID, agent.SecureSessionID); 168// scene.PresenceService.LoginAgent(agent.AgentID.ToString(), agent.SessionID, agent.SecureSessionID);
169 169//
170 string reason; 170// string reason;
171 scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason); 171// scene.NewUserConnection(agent, (uint)TeleportFlags.ViaLogin, out reason);
172 testclient = new TestClient(agent, scene); 172// testclient = new TestClient(agent, scene);
173 scene.AddNewClient(testclient); 173// scene.AddNewClient(testclient);
174 174//
175 ScenePresence presence = scene.GetScenePresence(agent1); 175// ScenePresence presence = scene.GetScenePresence(agent1);
176 176//
177 Assert.That(presence, Is.Not.Null, "presence is null"); 177// Assert.That(presence, Is.Not.Null, "presence is null");
178 Assert.That(presence.Firstname, Is.EqualTo(firstName), "First name not same"); 178// Assert.That(presence.Firstname, Is.EqualTo(firstName), "First name not same");
179 acd1 = agent; 179// acd1 = agent;
180 } 180// }
181 181//
182 /// <summary> 182// /// <summary>
183 /// Test removing an uncrossed root agent from a scene. 183// /// Test removing an uncrossed root agent from a scene.
184 /// </summary> 184// /// </summary>
185 [Test] 185// [Test]
186 public void T011_TestRemoveRootAgent() 186// public void T011_TestRemoveRootAgent()
187 { 187// {
188 TestHelpers.InMethod(); 188// TestHelpers.InMethod();
189 189//
190 scene.RemoveClient(agent1); 190// scene.RemoveClient(agent1);
191 191//
192 ScenePresence presence = scene.GetScenePresence(agent1); 192// ScenePresence presence = scene.GetScenePresence(agent1);
193 193//
194 Assert.That(presence, Is.Null, "presence is not null"); 194// Assert.That(presence, Is.Null, "presence is not null");
195 } 195// }
196 196
197 [Test] 197 [Test]
198 public void T012_TestAddNeighbourRegion() 198 public void T012_TestAddNeighbourRegion()