OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: in TaskInventoryTests, use UserProfileTestUtils.CreateUserWithInvetory()

bulletsim
Justin Clark-Casey (justincc) 2011-05-21 00:07:24 +01:00
parent bc43cef581
commit 3fed61a5d5
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
View File

@ -53,15 +53,6 @@ namespace OpenSim.Region.Framework.Tests
[TestFixture] [TestFixture]
public class TaskInventoryTests public class TaskInventoryTests
{ {
protected UserAccount CreateUser(Scene scene)
{
string userFirstName = "Jock";
string userLastName = "Stirrup";
string userPassword = "troll";
UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
return UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);
}
protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId) protected SceneObjectGroup CreateSO1(Scene scene, UUID ownerId)
{ {
string part1Name = "part1"; string part1Name = "part1";
@ -98,7 +89,7 @@ namespace OpenSim.Region.Framework.Tests
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneSetupHelpers.SetupScene(); Scene scene = SceneSetupHelpers.SetupScene();
UserAccount user1 = CreateUser(scene); UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene);
SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart; SceneObjectPart sop1 = sog1.RootPart;
@ -148,7 +139,7 @@ namespace OpenSim.Region.Framework.Tests
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneSetupHelpers.SetupScene(); Scene scene = SceneSetupHelpers.SetupScene();
UserAccount user1 = CreateUser(scene); UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene);
SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart; SceneObjectPart sop1 = sog1.RootPart;
TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);
@ -174,7 +165,7 @@ namespace OpenSim.Region.Framework.Tests
// log4net.Config.XmlConfigurator.Configure(); // log4net.Config.XmlConfigurator.Configure();
Scene scene = SceneSetupHelpers.SetupScene(); Scene scene = SceneSetupHelpers.SetupScene();
UserAccount user1 = CreateUser(scene); UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene);
SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
SceneObjectPart sop1 = sog1.RootPart; SceneObjectPart sop1 = sog1.RootPart;
TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);