From 74ef1ed36f234d93aa3d58b1602344bcb3e00d6e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 May 2010 19:36:39 +0100
Subject: add prim item and test asset save in save oar unit test

---
 OpenSim/Tests/Common/Setup/AssetHelpers.cs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index 1fc3cb5..1beafcf 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -38,12 +38,20 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Create an asset from the given data
         /// </summary>
-        public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID)
+        public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, byte[] data, UUID creatorID)
         {
-            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID.ToString());
-            asset.Data = Encoding.ASCII.GetBytes(data);
+            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)assetType, creatorID.ToString());
+            asset.Data = data;
             return asset;
         }
+
+        /// <summary>
+        /// Create an asset from the given data
+        /// </summary>
+        public static AssetBase CreateAsset(UUID assetUuid, AssetType assetType, string data, UUID creatorID)
+        {
+            return CreateAsset(assetUuid, assetType, Encoding.ASCII.GetBytes(data), creatorID);
+        }
         
         /// <summary>
         /// Create an asset from the given scene object
-- 
cgit v1.1


From 682efe94635943fbfadc19204d77602fd30b3861 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 May 2010 19:41:00 +0100
Subject: minor: refactor CreateAsset to eliminate dupe code

---
 OpenSim/Tests/Common/Setup/AssetHelpers.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index 1beafcf..6dc993f 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -61,9 +61,11 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog)
         {
-            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID.ToString());
-            asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog));
-            return asset;
+            return CreateAsset(
+                assetUuid, 
+                AssetType.Object, 
+                Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog)), 
+                sog.OwnerID);
         }
     }
 }
-- 
cgit v1.1


From 8d968249ec02808db18b0d96d94383a7e2b05b03 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 21 May 2010 21:38:47 +0100
Subject: extend TestAddSceneObject() to check Scene.AddNewSceneObject() return
 boolean improve test to retrieve object by known uuid rather than dynamically
 assigned local id

---
 OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index ef8ea50..91cf323 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -32,7 +32,6 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
@@ -115,7 +114,6 @@ namespace OpenSim.Tests.Common.Setup
             return SetupScene(name, id, x, y,"");
         }
 
-
         /// <summary>
         /// Set up a scene. If it's more then one scene, use the same CommunicationsManager to link regions
         /// or a different, to get a brand new scene with new shared region modules.
-- 
cgit v1.1


From 93ef65c69055157e0b7d51e544abe5a1035f40f0 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 21 May 2010 13:55:36 -0700
Subject: * Moving all of the prioritization/reprioritization code into a new
 file Prioritizer.cs * Simplified the interest management code to make it
 easier to add new policies. Prioritization and reprioritization share code
 paths now * Improved the distance and front back policies to always give your
 avatar the highest priority

---
 OpenSim/Tests/Common/Mock/TestClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index edb7642..6b0efe9 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -641,7 +641,7 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void ReprioritizeUpdates(UpdatePriorityHandler handler)
+        public void ReprioritizeUpdates()
         {
         }
 
-- 
cgit v1.1