[mapguide-commits] r7665 - in trunk/MgDev/UnitTest/WebTier/DotNet: MgTestRunner TestCommon TestMapGuideApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2013-07-06 10:52:51 -0700 (Sat, 06 Jul 2013)
New Revision: 7665

Modified:
   trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/Program.cs
   trunk/MgDev/UnitTest/WebTier/DotNet/TestCommon/CommonUtility.cs
   trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs
Log:
#2307: We are now down to 3 failures. These are all strictly issues relating to our binary comparison and/or pre-processing.

Modified: trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/Program.cs
===================================================================
--- trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/Program.cs	2013-07-06 16:46:47 UTC (rev 7664)
+++ trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/Program.cs	2013-07-06 17:52:51 UTC (rev 7665)
@@ -74,6 +74,7 @@
                 //"validate" is currently the only test execution mode supported
                 exec.Initialize("validate", dumpFile);
                 ret += exec.Execute(ref testsRun, logger, isEnterprise);
+                exec.Cleanup();
             }
             return ret;
         }

Modified: trunk/MgDev/UnitTest/WebTier/DotNet/TestCommon/CommonUtility.cs
===================================================================
--- trunk/MgDev/UnitTest/WebTier/DotNet/TestCommon/CommonUtility.cs	2013-07-06 16:46:47 UTC (rev 7664)
+++ trunk/MgDev/UnitTest/WebTier/DotNet/TestCommon/CommonUtility.cs	2013-07-06 17:52:51 UTC (rev 7665)
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
@@ -161,9 +162,17 @@
 
         public static string GetPath(string dbPath)
         {
-            return dbPath.Replace("\\", "/");
+            if (Path.IsPathRooted(dbPath))
+                return dbPath.Replace("\\", "/");
+            else
+                return Path.Combine(GetAssemblyPath(), dbPath).Replace("\\", "/");
         }
 
+        private static string GetAssemblyPath()
+        {
+            return Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+        }
+
         public static MgStringCollection StringToMgStringCollection(string str)
         {
             try

Modified: trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs
===================================================================
--- trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs	2013-07-06 16:46:47 UTC (rev 7664)
+++ trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs	2013-07-06 17:52:51 UTC (rev 7665)
@@ -461,7 +461,11 @@
 
         public override void Cleanup()
         {
-            
+            foreach (var exec in _executors.Values)
+            {
+                exec.Dispose();
+            }
+            _executors.Clear();
         }
 
         public override string ApiType