[mapguide-commits] r1168 - trunk/MgDev/Server/src/UnitTesting

[svn_mapguide at osgeo.org]

Author: waltweltonlair
Date: 2007-03-07 13:17:11 -0500 (Wed, 07 Mar 2007)
New Revision: 1168

Modified:
   trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
   trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h
Log:
Enable symbology unit tests for Linux.  The rendered images are
blank, so this needs to be investigated.


Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp	2007-03-07 17:37:01 UTC (rev 1167)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.cpp	2007-03-07 18:17:11 UTC (rev 1168)
@@ -564,8 +564,8 @@
         }
 
         // delete the files
-        MgFileUtil::DeleteFileW(L"../UnitTestFiles/MdfTestSimpleSymbolCopy1.sd", true);
-        MgFileUtil::DeleteFileW(L"../UnitTestFiles/MdfTestSimpleSymbolCopy2.sd", true);
+        MgFileUtil::DeleteFile(L"../UnitTestFiles/MdfTestSimpleSymbolCopy1.sd", true);
+        MgFileUtil::DeleteFile(L"../UnitTestFiles/MdfTestSimpleSymbolCopy2.sd", true);
 
         // ------------------------------------------------------
         // process symbol #2 - a compound symbol definition
@@ -610,8 +610,8 @@
         }
 
         // delete the files
-        MgFileUtil::DeleteFileW(L"../UnitTestFiles/MdfTestCompoundSymbolCopy1.sd", true);
-        MgFileUtil::DeleteFileW(L"../UnitTestFiles/MdfTestCompoundSymbolCopy2.sd", true);
+        MgFileUtil::DeleteFile(L"../UnitTestFiles/MdfTestCompoundSymbolCopy1.sd", true);
+        MgFileUtil::DeleteFile(L"../UnitTestFiles/MdfTestCompoundSymbolCopy2.sd", true);
 
         // ------------------------------------------------------
         // process layer definition with composite type style
@@ -656,8 +656,8 @@
         }
 
         // delete the files
-        MgFileUtil::DeleteFileW(L"../UnitTestFiles/MdfTestCompTypeStyleCopy1.ldf", true);
-        MgFileUtil::DeleteFileW(L"../UnitTestFiles/MdfTestCompTypeStyleCopy2.ldf", true);
+        MgFileUtil::DeleteFile(L"../UnitTestFiles/MdfTestCompTypeStyleCopy1.ldf", true);
+        MgFileUtil::DeleteFile(L"../UnitTestFiles/MdfTestCompTypeStyleCopy2.ldf", true);
     }
     catch (MgException* e)
     {
@@ -698,7 +698,7 @@
         // call the API
         Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
 
-        rdr->ToFile(L"C:\\SymbologyPoints.png");
+        rdr->ToFile(L"../UnitTestFiles/SymbologyPoints.png");
     }
     catch (MgException* e)
     {
@@ -739,7 +739,7 @@
         // call the API
         Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
 
-        rdr->ToFile(L"C:\\SymbologyPointsParam.png");
+        rdr->ToFile(L"../UnitTestFiles/SymbologyPointsParam.png");
     }
     catch (MgException* e)
     {
@@ -780,7 +780,7 @@
         // call the API
         Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
 
-        rdr->ToFile(L"C:\\SymbologyLines.png");
+        rdr->ToFile(L"../UnitTestFiles/SymbologyLines.png");
     }
     catch (MgException* e)
     {
@@ -820,7 +820,7 @@
         // call the API
         Ptr<MgByteReader> rdr = m_svcRendering->RenderMap(map, NULL, L"PNG");
 
-        rdr->ToFile(L"C:\\SymbologyLinesCrossTick.png");
+        rdr->ToFile(L"../UnitTestFiles/SymbologyLinesCrossTick.png");
     }
     catch (MgException* e)
     {

Modified: trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h	2007-03-07 17:37:01 UTC (rev 1167)
+++ trunk/MgDev/Server/src/UnitTesting/TestRenderingService.h	2007-03-07 18:17:11 UTC (rev 1168)
@@ -25,14 +25,11 @@
     CPPUNIT_TEST_SUITE(TestRenderingService);
     CPPUNIT_TEST(TestStart); // This must be the very first unit test
 
-// TODO - fix these for Linux
-#ifdef WIN32
     CPPUNIT_TEST(TestCase_SymbologyMdfModel);
     CPPUNIT_TEST(TestCase_SymbologyPoints);
     CPPUNIT_TEST(TestCase_SymbologyPointsParam);
     CPPUNIT_TEST(TestCase_SymbologyLines);
     CPPUNIT_TEST(TestCase_SymbologyLinesCrossTick);
-#endif
 
     CPPUNIT_TEST(TestCase_RenderDynamicOverlay);
     CPPUNIT_TEST(TestCase_RenderMap);