[mapguide-commits] r9210 - sandbox/jng/geoprocessing/Server/src/UnitTesting

[svn_mapguide at osgeo.org]

Author: jng
Date: 2017-06-10 09:56:30 -0700 (Sat, 10 Jun 2017)
New Revision: 9210

Modified:
   sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.cpp
   sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.h
Log:
Disable prepared geometry perf test by default

Modified: sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.cpp
===================================================================
--- sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.cpp	2017-06-10 16:16:13 UTC (rev 9209)
+++ sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.cpp	2017-06-10 16:56:30 UTC (rev 9210)
@@ -42,6 +42,7 @@
 void TestGeometry::TestStart()
 {
     ACE_DEBUG((LM_INFO, ACE_TEXT("\nRunning Geometry tests. (Mentor)\n")));
+#ifdef TEST_PREPARED_GEOMETRY_PERF
     try
     {
         MgServiceManager* serviceManager = MgServiceManager::GetInstance();
@@ -90,11 +91,13 @@
         SAFE_RELEASE(e);
         CPPUNIT_FAIL(MG_WCHAR_TO_CHAR(message.c_str()));
     }
+#endif
 }
 
 
 void TestGeometry::TestEnd()
 {
+#ifdef TEST_PREPARED_GEOMETRY_PERF
     try
     {
         MgServiceManager* serviceManager = MgServiceManager::GetInstance();
@@ -129,6 +132,7 @@
     {
         throw;
     }
+#endif
     ACE_DEBUG((LM_INFO, ACE_TEXT("\nGeometry tests completed.\n\n")));
 }
 

Modified: sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.h
===================================================================
--- sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.h	2017-06-10 16:16:13 UTC (rev 9209)
+++ sandbox/jng/geoprocessing/Server/src/UnitTesting/TestGeometry.h	2017-06-10 16:56:30 UTC (rev 9210)
@@ -20,6 +20,8 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
+//#define TEST_PREPARED_GEOMETRY_PERF
+
 #ifndef _WIN32
 //Linux: different naming for string functions
 #define stricmp strcasecmp
@@ -68,7 +70,9 @@
     CPPUNIT_TEST(TestCase_Simplify_DP);
     CPPUNIT_TEST(TestCase_Simplify_TP);
 
+#ifdef TEST_PREPARED_GEOMETRY_PERF
     CPPUNIT_TEST(TestCase_PreparedGeometryPerformance);
+#endif
 
     CPPUNIT_TEST(TestEnd); // This must be the very last unit test
     CPPUNIT_TEST_SUITE_END();