diff options
author | Justin Clark-Casey (justincc) | 2010-01-29 21:37:25 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-01-29 21:37:25 +0000 |
commit | 0c3043a298070b95dd782a9193b9c245aa7894ee (patch) | |
tree | 4448bf480345dcd9bff290edaaaa14fbfeefeb2d /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |
parent | minor: swap which part uses the automatically set up scene in TestMergeOarV0_2() (diff) | |
download | opensim-SC_OLD-0c3043a298070b95dd782a9193b9c245aa7894ee.zip opensim-SC_OLD-0c3043a298070b95dd782a9193b9c245aa7894ee.tar.gz opensim-SC_OLD-0c3043a298070b95dd782a9193b9c245aa7894ee.tar.bz2 opensim-SC_OLD-0c3043a298070b95dd782a9193b9c245aa7894ee.tar.xz |
use common part1 createio nin TestMergeOarV0_2()
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 930ea1c..dea8a45 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -443,19 +443,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
443 | } | 443 | } |
444 | 444 | ||
445 | { | 445 | { |
446 | string part1Name = "objectExisting"; | 446 | SceneObjectPart part1 = CreateSceneObjectPart1(); |
447 | PrimitiveBaseShape part1Shape = PrimitiveBaseShape.CreateCylinder(); | 447 | m_scene.AddNewSceneObject(new SceneObjectGroup(part1), false); |
448 | Vector3 part1GroupPosition = new Vector3(80, 70, 60); | ||
449 | Quaternion part1RotationOffset = new Quaternion(50, 60, 70, 80); | ||
450 | Vector3 part1OffsetPosition = new Vector3(15, 20, 25); | ||
451 | |||
452 | SceneObjectPart part1 | ||
453 | = new SceneObjectPart( | ||
454 | UUID.Zero, part1Shape, part1GroupPosition, part1RotationOffset, part1OffsetPosition); | ||
455 | part1.Name = part1Name; | ||
456 | SceneObjectGroup object1 = new SceneObjectGroup(part1); | ||
457 | |||
458 | m_scene.AddNewSceneObject(object1, false); | ||
459 | 448 | ||
460 | // Merge in the archive we created earlier | 449 | // Merge in the archive we created earlier |
461 | byte[] archive = archiveWriteStream.ToArray(); | 450 | byte[] archive = archiveWriteStream.ToArray(); |
@@ -463,10 +452,10 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
463 | 452 | ||
464 | m_archiverModule.DearchiveRegion(archiveReadStream, true, Guid.Empty); | 453 | m_archiverModule.DearchiveRegion(archiveReadStream, true, Guid.Empty); |
465 | 454 | ||
466 | SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1Name); | 455 | SceneObjectPart object1Existing = m_scene.GetSceneObjectPart(part1.Name); |
467 | Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge"); | 456 | Assert.That(object1Existing, Is.Not.Null, "object1 was not present after merge"); |
468 | Assert.That(object1Existing.Name, Is.EqualTo(part1Name), "object1 names not identical after merge"); | 457 | Assert.That(object1Existing.Name, Is.EqualTo(part1.Name), "object1 names not identical after merge"); |
469 | Assert.That(object1Existing.GroupPosition, Is.EqualTo(part1GroupPosition), "object1 group position not equal after merge"); | 458 | Assert.That(object1Existing.GroupPosition, Is.EqualTo(part1.GroupPosition), "object1 group position not equal after merge"); |
470 | 459 | ||
471 | SceneObjectPart object2PartMerged = m_scene.GetSceneObjectPart(part2Name); | 460 | SceneObjectPart object2PartMerged = m_scene.GetSceneObjectPart(part2Name); |
472 | Assert.That(object2PartMerged, Is.Not.Null, "object2 was not present after merge"); | 461 | Assert.That(object2PartMerged, Is.Not.Null, "object2 was not present after merge"); |