Move some previously common code back into separate tests. Remove unused region handle from test.
parent
0bbf7c21d7
commit
d3c10e609e
|
@ -55,7 +55,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
|
|||
public Scene scene;
|
||||
public UUID agent1;
|
||||
public static Random random;
|
||||
public ulong region1;
|
||||
public AgentCircuitData acd1;
|
||||
public SceneObjectGroup sog1, sog2;
|
||||
|
||||
|
@ -73,11 +72,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
|
|||
random = new Random();
|
||||
sog1 = NewSOG(UUID.Random(), scene, agent1);
|
||||
sog2 = NewSOG(UUID.Random(), scene, agent1);
|
||||
|
||||
//ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
|
||||
region1 = scene.RegionInfo.RegionHandle;
|
||||
|
||||
SceneHelpers.AddScenePresence(scene, agent1);
|
||||
}
|
||||
|
||||
[Test]
|
||||
|
@ -85,8 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
|
|||
{
|
||||
TestHelpers.InMethod();
|
||||
|
||||
ScenePresence presence = scene.GetScenePresence(agent1);
|
||||
|
||||
ScenePresence presence = SceneHelpers.AddScenePresence(scene, agent1);
|
||||
presence.AddAttachment(sog1);
|
||||
presence.AddAttachment(sog2);
|
||||
|
||||
|
@ -99,7 +92,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
|
|||
{
|
||||
TestHelpers.InMethod();
|
||||
|
||||
ScenePresence presence = scene.GetScenePresence(agent1);
|
||||
ScenePresence presence = SceneHelpers.AddScenePresence(scene, agent1);
|
||||
presence.AddAttachment(sog1);
|
||||
presence.AddAttachment(sog2);
|
||||
presence.RemoveAttachment(sog1);
|
||||
|
@ -107,6 +100,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests
|
|||
Assert.That(presence.HasAttachments(), Is.False);
|
||||
}
|
||||
|
||||
// [Test]
|
||||
// public void TestRezAttachmentsOnAvatarEntrance()
|
||||
// {
|
||||
// ScenePresence presence = scene.GetScenePresence(agent1);
|
||||
// }
|
||||
|
||||
// I'm commenting this test because scene setup NEEDS InventoryService to
|
||||
// be non-null
|
||||
//[Test]
|
||||
|
|
Loading…
Reference in New Issue