OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use common part1 creation in ArchiverTests.TestLoadOarV0_2()

mysql-performance
Justin Clark-Casey (justincc) 2010-01-29 21:27:14 +00:00
parent 115e66218e
commit 75dcd721de
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
View File

@ -55,8 +55,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
protected TestScene m_scene; protected TestScene m_scene;
protected ArchiverModule m_archiverModule; protected ArchiverModule m_archiverModule;
protected SceneObjectPart m_part1;
[SetUp] [SetUp]
public void SetUp() public void SetUp()
@ -92,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
} }
} }
protected void AddSceneObject1() protected SceneObjectPart CreateSceneObjectPart1()
{ {
string partName = "My Little Pony"; string partName = "My Little Pony";
UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000015"); UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000015");
@ -101,10 +99,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
Vector3 offsetPosition = new Vector3(5, 10, 15); Vector3 offsetPosition = new Vector3(5, 10, 15);
m_part1 return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
= new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
m_scene.AddNewSceneObject(new SceneObjectGroup(m_part1), false);
} }
/// <summary> /// <summary>
@ -116,7 +111,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
TestHelper.InMethod(); TestHelper.InMethod();
//log4net.Config.XmlConfigurator.Configure(); //log4net.Config.XmlConfigurator.Configure();
AddSceneObject1(); SceneObjectPart part1 = CreateSceneObjectPart1();
m_scene.AddNewSceneObject(new SceneObjectGroup(part1), false);
SceneObjectPart part2; SceneObjectPart part2;
@ -163,9 +159,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
bool gotObject2File = false; bool gotObject2File = false;
string expectedObject1FileName = string.Format( string expectedObject1FileName = string.Format(
"{0}_{1:000}-{2:000}-{3:000}__{4}.xml", "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
m_part1.Name, part1.Name,
Math.Round(m_part1.GroupPosition.X), Math.Round(m_part1.GroupPosition.Y), Math.Round(m_part1.GroupPosition.Z), Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
m_part1.UUID); part1.UUID);
string expectedObject2FileName = string.Format( string expectedObject2FileName = string.Format(
"{0}_{1:000}-{2:000}-{3:000}__{4}.xml", "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
part2.Name, part2.Name,
@ -185,7 +181,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
{ {
string fileName = filePath.Remove(0, ArchiveConstants.OBJECTS_PATH.Length); string fileName = filePath.Remove(0, ArchiveConstants.OBJECTS_PATH.Length);
if (fileName.StartsWith(m_part1.Name)) if (fileName.StartsWith(part1.Name))
{ {
Assert.That(fileName, Is.EqualTo(expectedObject1FileName)); Assert.That(fileName, Is.EqualTo(expectedObject1FileName));
gotObject1File = true; gotObject1File = true;
@ -226,19 +222,21 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile()); tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile());
AddSceneObject1(); SceneObjectPart part1 = CreateSceneObjectPart1();
string part1Name = "object1";
PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
Vector3 groupPosition = new Vector3(90, 80, 70);
Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
Vector3 offsetPosition = new Vector3(20, 25, 30);
SceneObjectPart part1
= new SceneObjectPart(
UUID.Zero, shape, groupPosition, rotationOffset, offsetPosition);
part1.Name = part1Name;
SceneObjectGroup object1 = new SceneObjectGroup(part1); SceneObjectGroup object1 = new SceneObjectGroup(part1);
// string part1Name = "object1";
// PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
// Vector3 groupPosition = new Vector3(90, 80, 70);
// Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
// Vector3 offsetPosition = new Vector3(20, 25, 30);
//
// SceneObjectPart part1
// = new SceneObjectPart(
// UUID.Zero, shape, groupPosition, rotationOffset, offsetPosition);
// part1.Name = part1Name;
// SceneObjectGroup object1 = new SceneObjectGroup(part1);
// Let's put some inventory items into our object // Let's put some inventory items into our object
string soundItemName = "sound-item1"; string soundItemName = "sound-item1";
UUID soundItemUuid = UUID.Parse("00000000-0000-0000-0000-000000000002"); UUID soundItemUuid = UUID.Parse("00000000-0000-0000-0000-000000000002");
@ -283,8 +281,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
string object1FileName = string.Format( string object1FileName = string.Format(
"{0}_{1:000}-{2:000}-{3:000}__{4}.xml", "{0}_{1:000}-{2:000}-{3:000}__{4}.xml",
part1Name, part1.Name,
Math.Round(groupPosition.X), Math.Round(groupPosition.Y), Math.Round(groupPosition.Z), Math.Round(part1.GroupPosition.X), Math.Round(part1.GroupPosition.Y), Math.Round(part1.GroupPosition.Z),
part1.UUID); part1.UUID);
tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1)); tar.WriteFile(ArchiveConstants.OBJECTS_PATH + object1FileName, SceneObjectSerializer.ToXml2Format(object1));
@ -300,15 +298,15 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
Assert.That(m_lastErrorMessage, Is.Null); Assert.That(m_lastErrorMessage, Is.Null);
SceneObjectPart object1PartLoaded = m_scene.GetSceneObjectPart(part1Name); SceneObjectPart object1PartLoaded = m_scene.GetSceneObjectPart(part1.Name);
Assert.That(object1PartLoaded, Is.Not.Null, "object1 was not loaded"); Assert.That(object1PartLoaded, Is.Not.Null, "object1 was not loaded");
Assert.That(object1PartLoaded.Name, Is.EqualTo(part1Name), "object1 names not identical"); Assert.That(object1PartLoaded.Name, Is.EqualTo(part1.Name), "object1 names not identical");
Assert.That(object1PartLoaded.GroupPosition, Is.EqualTo(groupPosition), "object1 group position not equal"); Assert.That(object1PartLoaded.GroupPosition, Is.EqualTo(part1.GroupPosition), "object1 group position not equal");
Assert.That( Assert.That(
object1PartLoaded.RotationOffset, Is.EqualTo(rotationOffset), "object1 rotation offset not equal"); object1PartLoaded.RotationOffset, Is.EqualTo(part1.RotationOffset), "object1 rotation offset not equal");
Assert.That( Assert.That(
object1PartLoaded.OffsetPosition, Is.EqualTo(offsetPosition), "object1 offset position not equal"); object1PartLoaded.OffsetPosition, Is.EqualTo(part1.OffsetPosition), "object1 offset position not equal");
TaskInventoryItem loadedSoundItem = object1PartLoaded.Inventory.GetInventoryItems(soundItemName)[0]; TaskInventoryItem loadedSoundItem = object1PartLoaded.Inventory.GetInventoryItems(soundItemName)[0];
Assert.That(loadedSoundItem, Is.Not.Null, "loaded sound item was null"); Assert.That(loadedSoundItem, Is.Not.Null, "loaded sound item was null");