Merge branch 'master' into careminster-presence-refactor

OpenSim/Tests/Common/Helpers/AssetHelpers.cs

@@ -36,6 +36,15 @@ namespace OpenSim.Tests.Common
 {
     public class AssetHelpers
     {
+        /// <summary>
+        /// Create a notecard asset with a random uuids and dummy text.
+        /// </summary>
+        /// <returns></returns>
+        public static AssetBase CreateAsset()
+        {
+            return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random());
+        }
+
         /// <summary>
         /// Create a notecard asset with a random uuid and dummy text.
         /// </summary>

OpenSim/Tests/Common/TestHelper.cs

@@ -28,6 +28,7 @@
 using System;
 using System.Diagnostics;
 using NUnit.Framework;
+using OpenMetaverse;
 
 namespace OpenSim.Tests.Common
 {
@@ -56,5 +57,15 @@ namespace OpenSim.Tests.Common
             Console.WriteLine();
             Console.WriteLine("===> In Test Method : {0} <===", stackTrace.GetFrame(1).GetMethod().Name);
         }
+
+        /// <summary>
+        /// Parse tail section into full UUID.
+        /// </summary>
+        /// <param name="tail"></param>
+        /// <returns></returns>
+        public static UUID ParseTail(int tail)
+        {
+            return new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", tail));
+        }
     }
 }