Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().

The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.

2 files changed, 97 insertions, 22 deletions

diff --git a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
index b635d5c..7d7bd82 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/Tests/XEngineTest.cs
@@ -27,44 +27,100 @@
 
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using Nini.Config;
 using NUnit.Framework;
-using OpenSim.Tests.Common.Mock;
-using OpenSim.Region.Framework.Scenes;
 using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Scripting.WorldComm;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
 
 namespace OpenSim.Region.ScriptEngine.XEngine.Tests
 {
     /// <summary>
-    /// Scene presence tests
+    /// XEngine tests.
     /// </summary>
-    /// Commented out XEngineTests that don't do anything
-    /*
     [TestFixture]
     public class XEngineTest
     {
-        public Scene scene;
-        
-        public static Random random;
-        public TestClient testclient;
-        //TestCommunicationsManager cm;
+        private TestScene m_scene;
+        private XEngine m_xEngine;
+        private AutoResetEvent m_chatEvent = new AutoResetEvent(false);
+        private OSChatMessage m_osChatMessageReceived;
 
         [TestFixtureSetUp]
         public void Init()
         {
-            TestCommunicationsManager cm = new TestCommunicationsManager();
-            scene = SceneSetupHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, cm);
-            random = new Random();
+            //AppDomain.CurrentDomain.SetData("APPBASE", Environment.CurrentDirectory + "/bin");
+//            Console.WriteLine(AppDomain.CurrentDomain.BaseDirectory);
+            m_xEngine = new XEngine();
+
+            // Necessary to stop serialization complaining
+            WorldCommModule wcModule = new WorldCommModule();
+
+            IniConfigSource configSource = new IniConfigSource();
+            
+            IConfig startupConfig = configSource.AddConfig("Startup");
+            startupConfig.Set("DefaultScriptEngine", "XEngine");
+
+            IConfig xEngineConfig = configSource.AddConfig("XEngine");
+            xEngineConfig.Set("Enabled", "true");
+
+            // These tests will not run with AppDomainLoading = true, at least on mono.  For unknown reasons, the call
+            // to AssemblyResolver.OnAssemblyResolve fails.
+            xEngineConfig.Set("AppDomainLoading", "false");
+
+            m_scene = SceneHelpers.SetupScene("My Test", UUID.Random(), 1000, 1000, null, configSource);
+            SceneHelpers.SetupSceneModules(m_scene, configSource, m_xEngine, wcModule);
+            m_scene.StartScripts();
         }
-        
+
+        /// <summary>
+        /// Test compilation and starting of a script.
+        /// </summary>
+        /// <remarks>
+        /// This is a less than ideal regression test since it involves an asynchronous operation (in this case,
+        /// compilation of the script).
+        /// </remarks>
         [Test]
-        public void T001_XStart()
+        public void TestCompileAndStartScript()
         {
-            INonSharedRegionModule xengine = new XEngine();
-            SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), xengine);
-            xengine.RegionLoaded(scene);
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+//            UUID objectId = TestHelpers.ParseTail(0x2);
+//            UUID itemId = TestHelpers.ParseTail(0x3);
+            string itemName = "TestStartScript() Item";
+
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, "TestStartScriptPart_", 0x100);
+            m_scene.AddNewSceneObject(so, true);
+
+            InventoryItemBase itemTemplate = new InventoryItemBase();
+//            itemTemplate.ID = itemId;
+            itemTemplate.Name = itemName;
+            itemTemplate.Folder = so.UUID;
+            itemTemplate.InvType = (int)InventoryType.LSL;
+
+            m_scene.EventManager.OnChatFromWorld += OnChatFromWorld;
+
+            m_scene.RezNewScript(userId, itemTemplate);
+
+            m_chatEvent.WaitOne(60000);
+
+            Assert.That(m_osChatMessageReceived, Is.Not.Null, "No chat message received in TestStartScript()");
+            Assert.That(m_osChatMessageReceived.Message, Is.EqualTo("Script running"));
+        }
+
+        private void OnChatFromWorld(object sender, OSChatMessage oscm)
+        {
+//            Console.WriteLine("Got chat [{0}]", oscm.Message);
+
+            m_osChatMessageReceived = oscm;
+            m_chatEvent.Set();
         }
     }
-    */
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index f11987e..c68f03f 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -680,6 +680,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void OnRezScript(uint localID, UUID itemID, string script, int startParam, bool postOnRez, string engine, int stateSource)
         {
+//            m_log.DebugFormat(
+//                "[XEngine]: OnRezScript event triggered for script {0}, startParam {1}, postOnRez {2}, engine {3}, stateSource {4}, script\n{5}",
+//                 itemID, startParam, postOnRez, engine, stateSource, script);
+
             if (script.StartsWith("//MRM:"))
                 return;
 
@@ -761,6 +765,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     m_CompileDict[itemID] = 0;
                 }
 
+//                m_log.DebugFormat("[XEngine]: Added script {0} to compile queue", itemID);
+
                 if (m_CurrentCompile == null)
                 {
                     // NOTE: Although we use a lockless queue, the lock here
@@ -822,6 +828,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             bool postOnRez = (bool)p[4];
             StateSource stateSource = (StateSource)p[5];
 
+//            m_log.DebugFormat("[XEngine]: DoOnRezScript called for script {0}", itemID);
+
             lock (m_CompileDict)
             {
                 if (!m_CompileDict.ContainsKey(itemID))
@@ -870,7 +878,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             {
                 try
                 {
-                    lock (m_AddingAssemblies) 
+                    lock (m_AddingAssemblies)
                     {
                         m_Compiler.PerformScriptCompile(script, assetID.ToString(), item.OwnerID, out assembly, out linemap);
                         if (!m_AddingAssemblies.ContainsKey(assembly)) {
@@ -922,6 +930,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 }
                 catch (Exception e)
                 {
+//                    m_log.ErrorFormat("[XEngine]: Exception when rezzing script {0}{1}", e.Message, e.StackTrace);
+
     //                try
     //                {
                         if (!m_ScriptErrors.ContainsKey(itemID))
@@ -1132,7 +1142,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 handlerObjectRemoved(part.UUID);
             }
 
-
             ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
             if (handlerScriptRemoved != null)
                 handlerScriptRemoved(itemID);
@@ -1381,6 +1390,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 string path = Path.Combine(Directory.GetCurrentDirectory(),
                                            Path.Combine(s, assemblyName))+".dll";
 
+//                Console.WriteLine("[XEngine]: Trying to resolve {0}", path);
+
                 if (File.Exists(path))
                     return Assembly.LoadFrom(path);
             }
@@ -1863,16 +1874,24 @@ namespace OpenSim.Region.ScriptEngine.XEngine
 
         public void SuspendScript(UUID itemID)
         {
+//            m_log.DebugFormat("[XEngine]: Received request to suspend script with ID {0}", itemID);
+
             IScriptInstance instance = GetInstance(itemID);
             if (instance != null)
                 instance.Suspend();
+//            else
+//                m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID);
         }
 
         public void ResumeScript(UUID itemID)
         {
+//            m_log.DebugFormat("[XEngine]: Received request to resume script with ID {0}", itemID);
+
             IScriptInstance instance = GetInstance(itemID);
             if (instance != null)
                 instance.Resume();
+//            else
+//                m_log.DebugFormat("[XEngine]: Could not find script with ID {0} to resume", itemID);
         }
     }
 }
\ No newline at end of file