Shuffle some code around

3 files changed, 22 insertions, 15 deletions

diff --git a/OpenSim/Tests/Permissions/Common.cs b/OpenSim/Tests/Permissions/Common.cs
index e62991b..f93c120 100644
--- a/OpenSim/Tests/Permissions/Common.cs
+++ b/OpenSim/Tests/Permissions/Common.cs
@@ -286,6 +286,26 @@ namespace OpenSim.Tests.Permissions
             return clone;
         }
 
+        public void DeleteObjectsFolders()
+        {
+            // Delete everything in A2 and A3's Objects folders, so we can restart
+            for (int i = 1; i < 3; i++)
+            {
+                InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(Common.TheScene.InventoryService, Common.TheAvatars[i].UUID, "Objects");
+                Assert.That(objsFolder, Is.Not.Null);
+
+                List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
+                List<UUID> ids = new List<UUID>();
+                foreach (InventoryItemBase it in items)
+                    ids.Add(it.ID);
+
+                Common.TheScene.InventoryService.DeleteItems(Common.TheAvatars[i].UUID, ids);
+                items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
+                Assert.That(items.Count, Is.EqualTo(0), "A" + (i + 1));
+            }
+
+        }
+
         public string IdStr(InventoryItemBase item)
         {
             return item.Owner.ToString().Substring(34) + " : " + item.Name;
diff --git a/OpenSim/Tests/Permissions/DirectTransferTests.cs b/OpenSim/Tests/Permissions/DirectTransferTests.cs
index 3b711a1..c68bbdf 100644
--- a/OpenSim/Tests/Permissions/DirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/DirectTransferTests.cs
@@ -44,6 +44,7 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
+            Common.TheInstance.DeleteObjectsFolders();
         }
 
         /// <summary>
diff --git a/OpenSim/Tests/Permissions/IndirectTransferTests.cs b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
index 6a6ba2f..7d8027f 100644
--- a/OpenSim/Tests/Permissions/IndirectTransferTests.cs
+++ b/OpenSim/Tests/Permissions/IndirectTransferTests.cs
@@ -46,21 +46,7 @@ namespace OpenSim.Tests.Permissions
         [SetUp]
         public void SetUp()
         {
-            // Delete everything in A2 and A3's Objects folders from previous tests
-            for (int i = 1; i < 3; i++)
-            {
-                InventoryFolderBase objsFolder = UserInventoryHelpers.GetInventoryFolder(Common.TheScene.InventoryService, Common.TheAvatars[i].UUID, "Objects");
-                Assert.That(objsFolder, Is.Not.Null);
-
-                List<InventoryItemBase> items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
-                List<UUID> ids = new List<UUID>();
-                foreach (InventoryItemBase it in items)
-                    ids.Add(it.ID);
-
-                Common.TheScene.InventoryService.DeleteItems(Common.TheAvatars[i].UUID, ids);
-                items = Common.TheScene.InventoryService.GetFolderItems(Common.TheAvatars[i].UUID, objsFolder.ID);
-                Assert.That(items.Count, Is.EqualTo(0), "A" + (i+1));
-            }
+            Common.TheInstance.DeleteObjectsFolders();
         }
 
         /// <summary>