Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to OSSL_ApiNpcTests
This is a more intuitive location.0.7.4-extended
Justin Clark-Casey (justincc)
parent
614e5b52b8
commit
7235a5fed4
|
|
@ -75,76 +75,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
||||||
m_engine.AddRegion(m_scene);
|
m_engine.AddRegion(m_scene);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Test creation of an NPC where the appearance data comes from a notecard
|
|
||||||
/// </summary>
|
|
||||||
[Test]
|
|
||||||
public void TestOsNpcCreateUsingAppearanceFromNotecard()
|
|
||||||
{
|
|
||||||
TestHelpers.InMethod();
|
|
||||||
// log4net.Config.XmlConfigurator.Configure();
|
|
||||||
|
|
||||||
// Store an avatar with a different height from default in a notecard.
|
|
||||||
UUID userId = TestHelpers.ParseTail(0x1);
|
|
||||||
float newHeight = 1.9f;
|
|
||||||
|
|
||||||
ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
|
|
||||||
sp.Appearance.AvatarHeight = newHeight;
|
|
||||||
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
|
|
||||||
SceneObjectPart part = so.RootPart;
|
|
||||||
m_scene.AddSceneObject(so);
|
|
||||||
|
|
||||||
OSSL_Api osslApi = new OSSL_Api();
|
|
||||||
osslApi.Initialize(m_engine, part, null);
|
|
||||||
|
|
||||||
string notecardName = "appearanceNc";
|
|
||||||
osslApi.osOwnerSaveAppearance(notecardName);
|
|
||||||
|
|
||||||
// Try creating a bot using the appearance in the notecard.
|
|
||||||
string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName);
|
|
||||||
Assert.That(npcRaw, Is.Not.Null);
|
|
||||||
|
|
||||||
UUID npcId = new UUID(npcRaw);
|
|
||||||
ScenePresence npc = m_scene.GetScenePresence(npcId);
|
|
||||||
Assert.That(npc, Is.Not.Null);
|
|
||||||
Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Test creation of an NPC where the appearance data comes from an avatar already in the region.
|
|
||||||
/// </summary>
|
|
||||||
[Test]
|
|
||||||
public void TestOsNpcCreateUsingAppearanceFromAvatar()
|
|
||||||
{
|
|
||||||
TestHelpers.InMethod();
|
|
||||||
// TestHelpers.EnableLogging();
|
|
||||||
|
|
||||||
// Store an avatar with a different height from default in a notecard.
|
|
||||||
UUID userId = TestHelpers.ParseTail(0x1);
|
|
||||||
float newHeight = 1.9f;
|
|
||||||
|
|
||||||
ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
|
|
||||||
sp.Appearance.AvatarHeight = newHeight;
|
|
||||||
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
|
|
||||||
SceneObjectPart part = so.RootPart;
|
|
||||||
m_scene.AddSceneObject(so);
|
|
||||||
|
|
||||||
OSSL_Api osslApi = new OSSL_Api();
|
|
||||||
osslApi.Initialize(m_engine, part, null);
|
|
||||||
|
|
||||||
string notecardName = "appearanceNc";
|
|
||||||
osslApi.osOwnerSaveAppearance(notecardName);
|
|
||||||
|
|
||||||
// Try creating a bot using the existing avatar's appearance
|
|
||||||
string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), sp.UUID.ToString());
|
|
||||||
Assert.That(npcRaw, Is.Not.Null);
|
|
||||||
|
|
||||||
UUID npcId = new UUID(npcRaw);
|
|
||||||
ScenePresence npc = m_scene.GetScenePresence(npcId);
|
|
||||||
Assert.That(npc, Is.Not.Null);
|
|
||||||
Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
|
|
||||||
}
|
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void TestOsOwnerSaveAppearance()
|
public void TestOsOwnerSaveAppearance()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -78,6 +78,75 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
|
||||||
m_engine.AddRegion(m_scene);
|
m_engine.AddRegion(m_scene);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Test creation of an NPC where the appearance data comes from a notecard
|
||||||
|
/// </summary>
|
||||||
|
[Test]
|
||||||
|
public void TestOsNpcCreateUsingAppearanceFromNotecard()
|
||||||
|
{
|
||||||
|
TestHelpers.InMethod();
|
||||||
|
|
||||||
|
// Store an avatar with a different height from default in a notecard.
|
||||||
|
UUID userId = TestHelpers.ParseTail(0x1);
|
||||||
|
float newHeight = 1.9f;
|
||||||
|
|
||||||
|
ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
|
||||||
|
sp.Appearance.AvatarHeight = newHeight;
|
||||||
|
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
|
||||||
|
SceneObjectPart part = so.RootPart;
|
||||||
|
m_scene.AddSceneObject(so);
|
||||||
|
|
||||||
|
OSSL_Api osslApi = new OSSL_Api();
|
||||||
|
osslApi.Initialize(m_engine, part, null);
|
||||||
|
|
||||||
|
string notecardName = "appearanceNc";
|
||||||
|
osslApi.osOwnerSaveAppearance(notecardName);
|
||||||
|
|
||||||
|
// Try creating a bot using the appearance in the notecard.
|
||||||
|
string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName);
|
||||||
|
Assert.That(npcRaw, Is.Not.Null);
|
||||||
|
|
||||||
|
UUID npcId = new UUID(npcRaw);
|
||||||
|
ScenePresence npc = m_scene.GetScenePresence(npcId);
|
||||||
|
Assert.That(npc, Is.Not.Null);
|
||||||
|
Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Test creation of an NPC where the appearance data comes from an avatar already in the region.
|
||||||
|
/// </summary>
|
||||||
|
[Test]
|
||||||
|
public void TestOsNpcCreateUsingAppearanceFromAvatar()
|
||||||
|
{
|
||||||
|
TestHelpers.InMethod();
|
||||||
|
// TestHelpers.EnableLogging();
|
||||||
|
|
||||||
|
// Store an avatar with a different height from default in a notecard.
|
||||||
|
UUID userId = TestHelpers.ParseTail(0x1);
|
||||||
|
float newHeight = 1.9f;
|
||||||
|
|
||||||
|
ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
|
||||||
|
sp.Appearance.AvatarHeight = newHeight;
|
||||||
|
SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
|
||||||
|
SceneObjectPart part = so.RootPart;
|
||||||
|
m_scene.AddSceneObject(so);
|
||||||
|
|
||||||
|
OSSL_Api osslApi = new OSSL_Api();
|
||||||
|
osslApi.Initialize(m_engine, part, null);
|
||||||
|
|
||||||
|
string notecardName = "appearanceNc";
|
||||||
|
osslApi.osOwnerSaveAppearance(notecardName);
|
||||||
|
|
||||||
|
// Try creating a bot using the existing avatar's appearance
|
||||||
|
string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), sp.UUID.ToString());
|
||||||
|
Assert.That(npcRaw, Is.Not.Null);
|
||||||
|
|
||||||
|
UUID npcId = new UUID(npcRaw);
|
||||||
|
ScenePresence npc = m_scene.GetScenePresence(npcId);
|
||||||
|
Assert.That(npc, Is.Not.Null);
|
||||||
|
Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Test removal of an owned NPC.
|
/// Test removal of an owned NPC.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue