[mapguide-commits] r8162 - in trunk/MgDev/UnitTest/WebTier/DotNet: . TestMapGuideApi

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-05-26 09:24:24 -0700 (Mon, 26 May 2014)
New Revision: 8162

Modified:
   trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs
   trunk/MgDev/UnitTest/WebTier/DotNet/prebuild.bat
Log:
DotNet test runner updates:
 - Fix prebuild.bat for x64 configuration
 - Normalize line endings on string results on comparisons to guard against incorrect line endings in expected test results entered in the SQLite GUI

Modified: trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs
===================================================================
--- trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs	2014-05-26 14:19:31 UTC (rev 8161)
+++ trunk/MgDev/UnitTest/WebTier/DotNet/TestMapGuideApi/MapGuideTestExecutorCollection.cs	2014-05-26 16:24:24 UTC (rev 8162)
@@ -412,7 +412,11 @@
                             {
                                 if (strExpectedResult != null && strResultData != null)
                                 {
-                                    bEqual = strResultData.Equals(strExpectedResult, StringComparison.InvariantCultureIgnoreCase);
+                                    //Normalize line endings on LF before comparsion (in case the SQLite GUI recorded CRLFs)
+                                    string normStrResultData = strResultData.Replace("\r\n", "\n");
+                                    string normStrExpectedResult = strExpectedResult.Replace("\r\n", "\n");
+
+                                    bEqual = normStrResultData.Equals(normStrExpectedResult, StringComparison.InvariantCultureIgnoreCase);
                                 }
                                 else if (bExpected != null && bActual != null)
                                 {

Modified: trunk/MgDev/UnitTest/WebTier/DotNet/prebuild.bat
===================================================================
--- trunk/MgDev/UnitTest/WebTier/DotNet/prebuild.bat	2014-05-26 14:19:31 UTC (rev 8161)
+++ trunk/MgDev/UnitTest/WebTier/DotNet/prebuild.bat	2014-05-26 16:24:24 UTC (rev 8162)
@@ -22,7 +22,7 @@
 goto done
 
 :copy
-if "%PLAT%"=="x64" (
+if %PLAT%=="x64" (
     echo Copying x64 binaries from %SLN_DIR%..\..\..\Web\bin\%CFG%64
     copy /Y %SLN_DIR%..\..\..\Web\bin\%CFG%64\*.* "%SLN_DIR%Libs\"
     echo Copying x64 SqliteDotNet.dll