1 files changed, 53 insertions, 44 deletions

diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Server/Handlers/Simulation/Utils.cs
index 8272316..ed379da 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Server/Handlers/Simulation/Utils.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -26,69 +26,78 @@
  */
 
 using System;
-using NUnit.Framework;
-using OpenSim.Data.Tests;
-using log4net;
+using System.Collections.Generic;
 using System.Reflection;
-using OpenSim.Tests.Common;
-using MySql.Data.MySqlClient;
 
-namespace OpenSim.Data.MySQL.Tests
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+
+using log4net;
+
+namespace OpenSim.Server.Handlers.Simulation
 {
-    [TestFixture, DatabaseTest]
-    public class MySQLGridTest : BasicGridTest
+    public class Utils
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public string file;
-        public MySQLManager database;
-        public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;";
-
-        [TestFixtureSetUp]
-        public void Init()
+        /// <summary>
+        /// Extract the param from an uri.
+        /// </summary>
+        /// <param name="uri">Something like this: /agent/uuid/ or /agent/uuid/handle/release</param>
+        /// <param name="uri">uuid on uuid field</param>
+        /// <param name="action">optional action</param>
+        public static bool GetParams(string uri, out UUID uuid, out UUID regionID, out string action)
         {
-            SuperInit();
-            // If we manage to connect to the database with the user
-            // and password above it is our test database, and run
-            // these tests.  If anything goes wrong, ignore these
-            // tests.
-            try
+            uuid = UUID.Zero;
+            regionID = UUID.Zero;
+            action = "";
+
+            uri = uri.Trim(new char[] { '/' });
+            string[] parts = uri.Split('/');
+            if (parts.Length <= 1)
             {
-                database = new MySQLManager(connect);
-                db = new MySQLGridData();
-                db.Initialise(connect);
+                return false;
             }
-            catch (Exception e)
+            else
             {
-                m_log.Error("Exception {0}", e);
-                Assert.Ignore();
-            }
+                if (!UUID.TryParse(parts[1], out uuid))
+                    return false;
 
-            // This actually does the roll forward assembly stuff
-            Assembly assem = GetType().Assembly;
+                if (parts.Length >= 3)
+                    UUID.TryParse(parts[2], out regionID);
+                if (parts.Length >= 4)
+                    action = parts[3];
 
-            using (MySqlConnection dbcon = new MySqlConnection(connect))
-            {
-                dbcon.Open();
-                Migration m = new Migration(dbcon, assem, "AssetStore");
-                m.Update();
+                return true;
             }
         }
 
-        [TestFixtureTearDown]
-        public void Cleanup()
+        public static OSDMap GetOSDMap(string data)
         {
-            m_log.Warn("Cleaning up.");
-            if (db != null)
+            OSDMap args = null;
+            try
             {
-                db.Dispose();
+                OSD buffer;
+                // We should pay attention to the content-type, but let's assume we know it's Json
+                buffer = OSDParser.DeserializeJson(data);
+                if (buffer.Type == OSDType.Map)
+                {
+                    args = (OSDMap)buffer;
+                    return args;
+                }
+                else
+                {
+                    // uh?
+                    m_log.Debug(("[REST COMMS]: Got OSD of unexpected type " + buffer.Type.ToString()));
+                    return null;
+                }
             }
-            // if a new table is added, it has to be dropped here
-            if (database != null)
+            catch (Exception ex)
             {
-                database.ExecuteSql("drop table migrations");
-                database.ExecuteSql("drop table regions");
+                m_log.Debug("[REST COMMS]: exception on parse of REST message " + ex.Message);
+                return null;
             }
         }
+
     }
 }