1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index abca792..55fc1e7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -55,12 +55,12 @@ namespace OpenSim.Region.Framework.Tests
        [Test]
        public void TestGiveInventoryItem()
        {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
-            Scene scene = SceneSetupHelpers.SetupScene();
+            Scene scene = SceneHelpers.SetupScene();
-            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, 1001);
+            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
-            UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, 1002);
+            UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
            InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "item1", user1.PrincipalID);
            scene.GiveInventoryItem(user2.PrincipalID, user1.PrincipalID, item1.ID);
@@ -82,12 +82,12 @@ namespace OpenSim.Region.Framework.Tests
        [Test]
        public void TestGiveInventoryFolder()
        {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
            
-            Scene scene = SceneSetupHelpers.SetupScene();
+            Scene scene = SceneHelpers.SetupScene();
-            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, 1001);
+            UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
-            UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, 1002);
+            UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
            InventoryFolderBase folder1
                = UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, "folder1");

diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs index abca792..55fc1e7 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -55,12 +55,12 @@ namespace OpenSim.Region.Framework.Tests
55	[Test]	55	[Test]
56	public void TestGiveInventoryItem()	56	public void TestGiveInventoryItem()
57	{	57	{
58	TestHelper.InMethod();	58	TestHelpers.InMethod();
59	// log4net.Config.XmlConfigurator.Configure();	59	// log4net.Config.XmlConfigurator.Configure();
60		60
61	Scene scene = SceneSetupHelpers.SetupScene();	61	Scene scene = SceneHelpers.SetupScene();
62	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, 1001);	62	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
63	UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, 1002);	63	UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
64	InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "item1", user1.PrincipalID);	64	InventoryItemBase item1 = UserInventoryHelpers.CreateInventoryItem(scene, "item1", user1.PrincipalID);
65		65
66	scene.GiveInventoryItem(user2.PrincipalID, user1.PrincipalID, item1.ID);	66	scene.GiveInventoryItem(user2.PrincipalID, user1.PrincipalID, item1.ID);
@@ -82,12 +82,12 @@ namespace OpenSim.Region.Framework.Tests
82	[Test]	82	[Test]
83	public void TestGiveInventoryFolder()	83	public void TestGiveInventoryFolder()
84	{	84	{
85	TestHelper.InMethod();	85	TestHelpers.InMethod();
86	// log4net.Config.XmlConfigurator.Configure();	86	// log4net.Config.XmlConfigurator.Configure();
87		87
88	Scene scene = SceneSetupHelpers.SetupScene();	88	Scene scene = SceneHelpers.SetupScene();
89	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, 1001);	89	UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1001));
90	UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, 1002);	90	UserAccount user2 = UserAccountHelpers.CreateUserWithInventory(scene, TestHelpers.ParseTail(1002));
91	InventoryFolderBase folder1	91	InventoryFolderBase folder1
92	= UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, "folder1");	92	= UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, user1.PrincipalID, "folder1");
93		93