diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index ac8c32d..8961a26 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
99 | Assert.That(scene.AddNewSceneObject(so, false), Is.True); | 99 | Assert.That(scene.AddNewSceneObject(so, false), Is.True); |
100 | SceneObjectGroup retrievedSo = scene.GetSceneObjectGroup(so.UUID); | 100 | SceneObjectGroup retrievedSo = scene.GetSceneObjectGroup(so.UUID); |
101 | SceneObjectPart[] retrievedParts = retrievedSo.Parts; | 101 | SceneObjectPart[] retrievedParts = retrievedSo.Parts; |
102 | 102 | ||
103 | //m_log.Debug("retrievedPart : {0}", retrievedPart); | 103 | //m_log.Debug("retrievedPart : {0}", retrievedPart); |
104 | // If the parts have the same UUID then we will consider them as one and the same | 104 | // If the parts have the same UUID then we will consider them as one and the same |
105 | Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount)); | 105 | Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount)); |
@@ -126,19 +126,19 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
126 | UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001"); | 126 | UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001"); |
127 | 127 | ||
128 | SceneObjectPart part1 | 128 | SceneObjectPart part1 |
129 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 129 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
130 | { Name = obj1Name, UUID = objUuid }; | 130 | { Name = obj1Name, UUID = objUuid }; |
131 | 131 | ||
132 | Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True); | 132 | Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True); |
133 | 133 | ||
134 | SceneObjectPart part2 | 134 | SceneObjectPart part2 |
135 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 135 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
136 | { Name = obj2Name, UUID = objUuid }; | 136 | { Name = obj2Name, UUID = objUuid }; |
137 | 137 | ||
138 | Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part2), false), Is.False); | 138 | Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part2), false), Is.False); |
139 | 139 | ||
140 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid); | 140 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid); |
141 | 141 | ||
142 | //m_log.Debug("retrievedPart : {0}", retrievedPart); | 142 | //m_log.Debug("retrievedPart : {0}", retrievedPart); |
143 | // If the parts have the same UUID then we will consider them as one and the same | 143 | // If the parts have the same UUID then we will consider them as one and the same |
144 | Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name)); | 144 | Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name)); |
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
180 | Assert.That(scene.GetGroupByPrim(soid), Is.Null); | 180 | Assert.That(scene.GetGroupByPrim(soid), Is.Null); |
181 | Assert.That(scene.GetGroupByPrim(spid), Is.Null); | 181 | Assert.That(scene.GetGroupByPrim(spid), Is.Null); |
182 | } | 182 | } |
183 | 183 | ||
184 | /// <summary> | 184 | /// <summary> |
185 | /// Test deleting an object from a scene. | 185 | /// Test deleting an object from a scene. |
186 | /// </summary> | 186 | /// </summary> |
@@ -205,10 +205,10 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
205 | 205 | ||
206 | Assert.That(retrievedPart, Is.Null); | 206 | Assert.That(retrievedPart, Is.Null); |
207 | } | 207 | } |
208 | 208 | ||
209 | /// <summary> | 209 | /// <summary> |
210 | /// Changing a scene object uuid changes the root part uuid. This is a valid operation if the object is not | 210 | /// Changing a scene object uuid changes the root part uuid. This is a valid operation if the object is not |
211 | /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by | 211 | /// in a scene and is useful if one wants to supply a UUID directly rather than use the one generated by |
212 | /// OpenSim. | 212 | /// OpenSim. |
213 | /// </summary> | 213 | /// </summary> |
214 | [Test] | 214 | [Test] |
@@ -218,24 +218,24 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
218 | UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001"); | 218 | UUID rootPartUuid = new UUID("00000000-0000-0000-0000-000000000001"); |
219 | string childPartName = "childPart"; | 219 | string childPartName = "childPart"; |
220 | UUID childPartUuid = new UUID("00000000-0000-0000-0001-000000000000"); | 220 | UUID childPartUuid = new UUID("00000000-0000-0000-0001-000000000000"); |
221 | 221 | ||
222 | SceneObjectPart rootPart | 222 | SceneObjectPart rootPart |
223 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 223 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
224 | { Name = rootPartName, UUID = rootPartUuid }; | 224 | { Name = rootPartName, UUID = rootPartUuid }; |
225 | SceneObjectPart linkPart | 225 | SceneObjectPart linkPart |
226 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | 226 | = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) |
227 | { Name = childPartName, UUID = childPartUuid }; | 227 | { Name = childPartName, UUID = childPartUuid }; |
228 | 228 | ||
229 | SceneObjectGroup sog = new SceneObjectGroup(rootPart); | 229 | SceneObjectGroup sog = new SceneObjectGroup(rootPart); |
230 | sog.AddPart(linkPart); | 230 | sog.AddPart(linkPart); |
231 | 231 | ||
232 | Assert.That(sog.UUID, Is.EqualTo(rootPartUuid)); | 232 | Assert.That(sog.UUID, Is.EqualTo(rootPartUuid)); |
233 | Assert.That(sog.RootPart.UUID, Is.EqualTo(rootPartUuid)); | 233 | Assert.That(sog.RootPart.UUID, Is.EqualTo(rootPartUuid)); |
234 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); | 234 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); |
235 | 235 | ||
236 | UUID newRootPartUuid = new UUID("00000000-0000-0000-0000-000000000002"); | 236 | UUID newRootPartUuid = new UUID("00000000-0000-0000-0000-000000000002"); |
237 | sog.UUID = newRootPartUuid; | 237 | sog.UUID = newRootPartUuid; |
238 | 238 | ||
239 | Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid)); | 239 | Assert.That(sog.UUID, Is.EqualTo(newRootPartUuid)); |
240 | Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid)); | 240 | Assert.That(sog.RootPart.UUID, Is.EqualTo(newRootPartUuid)); |
241 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); | 241 | Assert.That(sog.Parts.Length, Is.EqualTo(2)); |