diff options
author | Justin Clark-Casey (justincc) | 2011-08-27 00:15:21 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-27 00:15:21 +0100 |
commit | 33a894f3d2cc95a7a512b86f39f3c6a6afabb015 (patch) | |
tree | 064edbd623ea0bd7bb85c29dc28d2348feb8454b /OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |
parent | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar (diff) | |
download | opensim-SC_OLD-33a894f3d2cc95a7a512b86f39f3c6a6afabb015.zip opensim-SC_OLD-33a894f3d2cc95a7a512b86f39f3c6a6afabb015.tar.gz opensim-SC_OLD-33a894f3d2cc95a7a512b86f39f3c6a6afabb015.tar.bz2 opensim-SC_OLD-33a894f3d2cc95a7a512b86f39f3c6a6afabb015.tar.xz |
refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid pointless duplication of identical values
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index b7d21fd..790a651 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -110,6 +110,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
110 | Assert.That(attachments.Count, Is.EqualTo(1)); | 110 | Assert.That(attachments.Count, Is.EqualTo(1)); |
111 | SceneObjectGroup attSo = attachments[0]; | 111 | SceneObjectGroup attSo = attachments[0]; |
112 | Assert.That(attSo.Name, Is.EqualTo(attName)); | 112 | Assert.That(attSo.Name, Is.EqualTo(attName)); |
113 | Assert.That(attSo.AttachmentPoint, Is.EqualTo((byte)AttachmentPoint.Chest)); | ||
113 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); | 114 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); |
114 | Assert.That(attSo.IsAttachment); | 115 | Assert.That(attSo.IsAttachment); |
115 | Assert.That(attSo.UsesPhysics, Is.False); | 116 | Assert.That(attSo.UsesPhysics, Is.False); |
@@ -132,9 +133,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
132 | UUID attAssetId = TestHelpers.ParseTail(0x3); | 133 | UUID attAssetId = TestHelpers.ParseTail(0x3); |
133 | string attName = "att"; | 134 | string attName = "att"; |
134 | 135 | ||
135 | InventoryItemBase attItem | 136 | UserInventoryHelpers.CreateInventoryItem( |
136 | = UserInventoryHelpers.CreateInventoryItem( | 137 | scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object); |
137 | scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object); | ||
138 | 138 | ||
139 | m_attMod.RezSingleAttachmentFromInventory( | 139 | m_attMod.RezSingleAttachmentFromInventory( |
140 | m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); | 140 | m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); |
@@ -145,6 +145,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
145 | Assert.That(attachments.Count, Is.EqualTo(1)); | 145 | Assert.That(attachments.Count, Is.EqualTo(1)); |
146 | SceneObjectGroup attSo = attachments[0]; | 146 | SceneObjectGroup attSo = attachments[0]; |
147 | Assert.That(attSo.Name, Is.EqualTo(attName)); | 147 | Assert.That(attSo.Name, Is.EqualTo(attName)); |
148 | Assert.That(attSo.AttachmentPoint, Is.EqualTo((byte)AttachmentPoint.Chest)); | ||
148 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); | 149 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); |
149 | Assert.That(attSo.IsAttachment); | 150 | Assert.That(attSo.IsAttachment); |
150 | Assert.That(attSo.UsesPhysics, Is.False); | 151 | Assert.That(attSo.UsesPhysics, Is.False); |
@@ -166,9 +167,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
166 | UUID attAssetId = TestHelpers.ParseTail(0x3); | 167 | UUID attAssetId = TestHelpers.ParseTail(0x3); |
167 | string attName = "att"; | 168 | string attName = "att"; |
168 | 169 | ||
169 | InventoryItemBase attItem | 170 | UserInventoryHelpers.CreateInventoryItem( |
170 | = UserInventoryHelpers.CreateInventoryItem( | 171 | scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object); |
171 | scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object); | ||
172 | 172 | ||
173 | UUID attSoId = m_attMod.RezSingleAttachmentFromInventory( | 173 | UUID attSoId = m_attMod.RezSingleAttachmentFromInventory( |
174 | m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); | 174 | m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); |
@@ -198,9 +198,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
198 | UUID attAssetId = TestHelpers.ParseTail(0x3); | 198 | UUID attAssetId = TestHelpers.ParseTail(0x3); |
199 | string attName = "att"; | 199 | string attName = "att"; |
200 | 200 | ||
201 | InventoryItemBase attItem | 201 | UserInventoryHelpers.CreateInventoryItem( |
202 | = UserInventoryHelpers.CreateInventoryItem( | 202 | scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object); |
203 | scene, attName, attItemId, attAssetId, m_presence.UUID, InventoryType.Object); | ||
204 | 203 | ||
205 | m_attMod.RezSingleAttachmentFromInventory( | 204 | m_attMod.RezSingleAttachmentFromInventory( |
206 | m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); | 205 | m_presence.ControllingClient, attItemId, (uint)AttachmentPoint.Chest); |
@@ -242,6 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
242 | Assert.That(attachments.Count, Is.EqualTo(1)); | 241 | Assert.That(attachments.Count, Is.EqualTo(1)); |
243 | SceneObjectGroup attSo = attachments[0]; | 242 | SceneObjectGroup attSo = attachments[0]; |
244 | Assert.That(attSo.Name, Is.EqualTo(attName)); | 243 | Assert.That(attSo.Name, Is.EqualTo(attName)); |
244 | Assert.That(attSo.AttachmentPoint, Is.EqualTo((byte)AttachmentPoint.Chest)); | ||
245 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); | 245 | Assert.That(attSo.GetAttachmentPoint(), Is.EqualTo((byte)AttachmentPoint.Chest)); |
246 | Assert.That(attSo.IsAttachment); | 246 | Assert.That(attSo.IsAttachment); |
247 | Assert.That(attSo.UsesPhysics, Is.False); | 247 | Assert.That(attSo.UsesPhysics, Is.False); |