diff options
| author | Justin Clark-Casey (justincc) | 2011-05-21 00:07:24 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-05-21 00:07:24 +0100 |
| commit | 3fed61a5d5e65c36791317cec85dc130bba1cc82 (patch) | |
| tree | ef1f5d28371a82343dc3f5b8c845945663fa668e /OpenSim | |
| parent | minor: remove mono compiler warning (diff) | |
| download | opensim-SC-3fed61a5d5e65c36791317cec85dc130bba1cc82.zip opensim-SC-3fed61a5d5e65c36791317cec85dc130bba1cc82.tar.gz opensim-SC-3fed61a5d5e65c36791317cec85dc130bba1cc82.tar.bz2 opensim-SC-3fed61a5d5e65c36791317cec85dc130bba1cc82.tar.xz | |
refactor: in TaskInventoryTests, use UserProfileTestUtils.CreateUserWithInvetory()
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs index 222710f..4f5018a 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs | |||
| @@ -53,15 +53,6 @@ namespace OpenSim.Region.Framework.Tests | |||
| 53 | [TestFixture] | 53 | [TestFixture] |
| 54 | public class TaskInventoryTests | 54 | public class TaskInventoryTests |
| 55 | { | 55 | { |
| 56 | protected UserAccount CreateUser(Scene scene) | ||
| 57 | { | ||
| 58 | string userFirstName = "Jock"; | ||
| 59 | string userLastName = "Stirrup"; | ||
| 60 | string userPassword = "troll"; | ||
| 61 | UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); | ||
| 62 | return UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword); | ||
| 63 | } | ||
| 64 | |||
| 65 | protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId) | 56 | protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId) |
| 66 | { | 57 | { |
| 67 | string part1Name = "part1"; | 58 | string part1Name = "part1"; |
| @@ -98,7 +89,7 @@ namespace OpenSim.Region.Framework.Tests | |||
| 98 | // log4net.Config.XmlConfigurator.Configure(); | 89 | // log4net.Config.XmlConfigurator.Configure(); |
| 99 | 90 | ||
| 100 | Scene scene = SceneSetupHelpers.SetupScene(); | 91 | Scene scene = SceneSetupHelpers.SetupScene(); |
| 101 | UserAccount user1 = CreateUser(scene); | 92 | UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene); |
| 102 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); | 93 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); |
| 103 | SceneObjectPart sop1 = sog1.RootPart; | 94 | SceneObjectPart sop1 = sog1.RootPart; |
| 104 | 95 | ||
| @@ -148,7 +139,7 @@ namespace OpenSim.Region.Framework.Tests | |||
| 148 | // log4net.Config.XmlConfigurator.Configure(); | 139 | // log4net.Config.XmlConfigurator.Configure(); |
| 149 | 140 | ||
| 150 | Scene scene = SceneSetupHelpers.SetupScene(); | 141 | Scene scene = SceneSetupHelpers.SetupScene(); |
| 151 | UserAccount user1 = CreateUser(scene); | 142 | UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene); |
| 152 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); | 143 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); |
| 153 | SceneObjectPart sop1 = sog1.RootPart; | 144 | SceneObjectPart sop1 = sog1.RootPart; |
| 154 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); | 145 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); |
| @@ -174,7 +165,7 @@ namespace OpenSim.Region.Framework.Tests | |||
| 174 | // log4net.Config.XmlConfigurator.Configure(); | 165 | // log4net.Config.XmlConfigurator.Configure(); |
| 175 | 166 | ||
| 176 | Scene scene = SceneSetupHelpers.SetupScene(); | 167 | Scene scene = SceneSetupHelpers.SetupScene(); |
| 177 | UserAccount user1 = CreateUser(scene); | 168 | UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene); |
| 178 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); | 169 | SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); |
| 179 | SceneObjectPart sop1 = sog1.RootPart; | 170 | SceneObjectPart sop1 = sog1.RootPart; |
| 180 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); | 171 | TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); |