diff options
author | Justin Clark-Casey (justincc) | 2011-02-18 23:05:56 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-02-18 23:05:56 +0000 |
commit | dd9efc183812a66b1654aaeb419945cf57650b08 (patch) | |
tree | bd1f2b5911538759979fe80535274884cb051cd0 /OpenSim/Region/Framework/Scenes/Tests | |
parent | On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for... (diff) | |
download | opensim-SC-dd9efc183812a66b1654aaeb419945cf57650b08.zip opensim-SC-dd9efc183812a66b1654aaeb419945cf57650b08.tar.gz opensim-SC-dd9efc183812a66b1654aaeb419945cf57650b08.tar.bz2 opensim-SC-dd9efc183812a66b1654aaeb419945cf57650b08.tar.xz |
extend TestChildAgentEstablished() test slightly to put in EntityTransferModule. Not yet enabled.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 92c73be..60bc86c 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -40,6 +40,7 @@ using OpenSim.Framework; | |||
40 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Region.Framework.Interfaces; | 42 | using OpenSim.Region.Framework.Interfaces; |
43 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; | ||
43 | using OpenSim.Region.CoreModules.World.Serialiser; | 44 | using OpenSim.Region.CoreModules.World.Serialiser; |
44 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 45 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
45 | using OpenSim.Tests.Common; | 46 | using OpenSim.Tests.Common; |
@@ -199,10 +200,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
199 | [Test] | 200 | [Test] |
200 | public void TestChildAgentEstablished() | 201 | public void TestChildAgentEstablished() |
201 | { | 202 | { |
203 | TestHelper.InMethod(); | ||
204 | log4net.Config.XmlConfigurator.Configure(); | ||
205 | |||
202 | UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 206 | UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
203 | 207 | ||
204 | TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); | 208 | TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000); |
205 | TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); | 209 | TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000); |
210 | |||
211 | EntityTransferModule etm = new EntityTransferModule(); | ||
212 | SceneSetupHelpers.SetupSceneModules(myScene1, etm); | ||
206 | 213 | ||
207 | SceneSetupHelpers.AddRootAgent(myScene1, agent1Id); | 214 | SceneSetupHelpers.AddRootAgent(myScene1, agent1Id); |
208 | ScenePresence childPresence = myScene2.GetScenePresence(agent1); | 215 | ScenePresence childPresence = myScene2.GetScenePresence(agent1); |