aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-01-29 21:42:27 +0000
committerJustin Clark-Casey (justincc)2010-01-29 21:42:27 +0000
commit68c7218fa1557a8e00c3f74829b91a5b43d94069 (patch)
treea17725faba7d385dd41b6bb7694f1ce9221a1be4
parentuse common part1 createio nin TestMergeOarV0_2() (diff)
downloadopensim-SC_OLD-68c7218fa1557a8e00c3f74829b91a5b43d94069.zip
opensim-SC_OLD-68c7218fa1557a8e00c3f74829b91a5b43d94069.tar.gz
opensim-SC_OLD-68c7218fa1557a8e00c3f74829b91a5b43d94069.tar.bz2
opensim-SC_OLD-68c7218fa1557a8e00c3f74829b91a5b43d94069.tar.xz
make TestSaveOarV0_2() use a common part2 construction
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs32
1 files changed, 14 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index dea8a45..ae4aece 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -102,6 +102,18 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
102 return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName }; 102 return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
103 } 103 }
104 104
105 protected SceneObjectPart CreateSceneObjectPart2()
106 {
107 string partName = "Action Man";
108 UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000016");
109 PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
110 Vector3 groupPosition = new Vector3(90, 80, 70);
111 Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
112 Vector3 offsetPosition = new Vector3(20, 25, 30);
113
114 return new SceneObjectPart(ownerId, shape, groupPosition, rotationOffset, offsetPosition) { Name = partName };
115 }
116
105 /// <summary> 117 /// <summary>
106 /// Test saving a V0.2 OpenSim Region Archive. 118 /// Test saving a V0.2 OpenSim Region Archive.
107 /// </summary> 119 /// </summary>
@@ -114,24 +126,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
114 SceneObjectPart part1 = CreateSceneObjectPart1(); 126 SceneObjectPart part1 = CreateSceneObjectPart1();
115 m_scene.AddNewSceneObject(new SceneObjectGroup(part1), false); 127 m_scene.AddNewSceneObject(new SceneObjectGroup(part1), false);
116 128
117 SceneObjectPart part2; 129 SceneObjectPart part2 = CreateSceneObjectPart2();
118 130 m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
119 // Create and add prim 2
120 {
121 string partName = "Action Man";
122 UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000016");
123 PrimitiveBaseShape shape = PrimitiveBaseShape.CreateCylinder();
124 Vector3 groupPosition = new Vector3(90, 80, 70);
125 Quaternion rotationOffset = new Quaternion(60, 70, 80, 90);
126 Vector3 offsetPosition = new Vector3(20, 25, 30);
127
128 part2
129 = new SceneObjectPart(
130 ownerId, shape, groupPosition, rotationOffset, offsetPosition);
131 part2.Name = partName;
132
133 m_scene.AddNewSceneObject(new SceneObjectGroup(part2), false);
134 }
135 131
136 MemoryStream archiveWriteStream = new MemoryStream(); 132 MemoryStream archiveWriteStream = new MemoryStream();
137 m_scene.EventManager.OnOarFileSaved += SaveCompleted; 133 m_scene.EventManager.OnOarFileSaved += SaveCompleted;