diff options
author | Justin Clark-Casey (justincc) | 2011-05-21 00:15:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-05-21 00:15:22 +0100 |
commit | 0050bb438c7138d1deb36609faef8dcbe25348e4 (patch) | |
tree | 3d098ec0431cf90dcebcaf20134ad4737021f82a /OpenSim/Region/Framework/Scenes | |
parent | rename UserProfileTestUtils to UserAccountHelpers to be consistent with other... (diff) | |
download | opensim-SC_OLD-0050bb438c7138d1deb36609faef8dcbe25348e4.zip opensim-SC_OLD-0050bb438c7138d1deb36609faef8dcbe25348e4.tar.gz opensim-SC_OLD-0050bb438c7138d1deb36609faef8dcbe25348e4.tar.bz2 opensim-SC_OLD-0050bb438c7138d1deb36609faef8dcbe25348e4.tar.xz |
refactor: use SceneSetupHelpers.CreateSceneObject()
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index e830500..717517b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |||
@@ -53,16 +53,6 @@ namespace OpenSim.Region.Framework.Tests | |||
53 | [TestFixture] | 53 | [TestFixture] |
54 | public class TaskInventoryTests | 54 | public class TaskInventoryTests |
55 | { | 55 | { |
56 | protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId) | ||
57 | { | ||
58 | string part1Name = "part1"; | ||
59 | UUID part1Id = UUID.Parse("10000000-0000-0000-0000-000000000000"); | ||
60 | SceneObjectPart part1 | ||
61 | = new SceneObjectPart(ownerId, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) | ||
62 | { Name = part1Name, UUID = part1Id }; | ||
63 | return new SceneObjectGroup(part1); | ||
64 | } | ||
65 | |||
66 | protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part) | 56 | protected TaskInventoryItem CreateSOItem1(Scene scene, SceneObjectPart part) |
67 | { | 57 | { |
68 | AssetNotecard nc = new AssetNotecard(); | 58 | AssetNotecard nc = new AssetNotecard(); |
@@ -90,7 +80,7 @@ namespace OpenSim.Region.Framework.Tests | |||
90 | 80 | ||
91 | Scene scene = SceneSetupHelpers.SetupScene(); | 81 | Scene scene = SceneSetupHelpers.SetupScene(); |
92 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 82 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
93 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); | 83 | SceneObjectGroup sog1 = SceneSetupHelpers.CreateSceneObject(1, user1.PrincipalID); |
94 | SceneObjectPart sop1 = sog1.RootPart; | 84 | SceneObjectPart sop1 = sog1.RootPart; |
95 | 85 | ||
96 | // Create an object embedded inside the first | 86 | // Create an object embedded inside the first |
@@ -140,7 +130,7 @@ namespace OpenSim.Region.Framework.Tests | |||
140 | 130 | ||
141 | Scene scene = SceneSetupHelpers.SetupScene(); | 131 | Scene scene = SceneSetupHelpers.SetupScene(); |
142 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 132 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
143 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); | 133 | SceneObjectGroup sog1 = SceneSetupHelpers.CreateSceneObject(1, user1.PrincipalID); |
144 | SceneObjectPart sop1 = sog1.RootPart; | 134 | SceneObjectPart sop1 = sog1.RootPart; |
145 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); | 135 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); |
146 | InventoryFolderBase folder | 136 | InventoryFolderBase folder |
@@ -166,7 +156,7 @@ namespace OpenSim.Region.Framework.Tests | |||
166 | 156 | ||
167 | Scene scene = SceneSetupHelpers.SetupScene(); | 157 | Scene scene = SceneSetupHelpers.SetupScene(); |
168 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); | 158 | UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene); |
169 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); | 159 | SceneObjectGroup sog1 = SceneSetupHelpers.CreateSceneObject(1, user1.PrincipalID); |
170 | SceneObjectPart sop1 = sog1.RootPart; | 160 | SceneObjectPart sop1 = sog1.RootPart; |
171 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); | 161 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); |
172 | 162 | ||