src/app/CMakeLists.txt

@@ -366,6 +366,13 @@ SET(IMAGE_RCCS ../../images/images.qrc)
 
 QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
 
+SET(TEST_RCC_SRCS)
+IF (ENABLE_TESTS)
+  # add test resources, e.g. standard test font
+  SET(TEST_RCCS ../../tests/testdata/testdata.qrc)
+  QT4_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS})
+ENDIF (ENABLE_TESTS)
+
 QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
 
 IF (WIN32)
@@ -444,9 +451,9 @@ ENDIF (POSTGRES_FOUND)
 
 #############
 IF (ANDROID)
-  ADD_LIBRARY(${QGIS_APP_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS})
+  ADD_LIBRARY(${QGIS_APP_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
 ELSE (ANDROID)
-  ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS})
+  ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
 ENDIF (ANDROID)
 
 TARGET_LINK_LIBRARIES(${QGIS_APP_NAME}

src/app/main.cpp

@@ -21,6 +21,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QFont>
+#include <QFontDatabase>
 #include <QPixmap>
 #include <QLocale>
 #include <QSettings>
@@ -810,6 +811,14 @@ int main( int argc, char *argv[] )
     }
   }
 
+  // load standard test font from testdata.qrc (for unit tests)
+  QFile testFont( ":/testdata/font/FreeSansQGIS.ttf" );
+  if ( testFont.open( QIODevice::ReadOnly ) )
+  {
+    int fontID = QFontDatabase::addApplicationFontFromData( testFont.readAll() );
+    QgsDebugMsg( QString( "Test font %1loaded from testdata.qrc" ).arg( fontID != -1 ? "" : "NOT " ) );
+  } // else app wasn't built with ENABLE_TESTS
+
   // Set the application style.  If it's not set QT will use the platform style except on Windows
   // as it looks really ugly so we use QPlastiqueStyle.
   QString style = mySettings.value( "/qgis/style" ).toString();

src/mapserver/CMakeLists.txt

@@ -66,11 +66,19 @@ QT4_WRAP_CPP (qgis_mapserv_MOC_SRCS  ${qgis_mapserv_MOC_HDRS})
 
 QT4_ADD_RESOURCES(qgis_mapserv_RCC_SRCS ${qgis_mapserv_RCCS})
 
+SET(qgis_mapserv_TESTRCC_SRCS)
+IF (ENABLE_TESTS)
+  # add test resources, e.g. standard test font
+  SET(qgis_mapserv_TESTRCCS ../../tests/testdata/testdata.qrc)
+  QT4_ADD_RESOURCES(qgis_mapserv_TESTRCC_SRCS ${qgis_mapserv_TESTRCCS})
+ENDIF(ENABLE_TESTS)
+
 ADD_EXECUTABLE(qgis_mapserv.fcgi
   ${qgis_mapserv_SRCS} 
   ${qgis_mapserv_MOC_SRCS} 
   ${qgis_mapserv_RCC_SRCS} 
   ${qgis_mapserv_UIS_H}
+  ${qgis_mapserv_TESTRCC_SRCS}
   )
 
 INCLUDE_DIRECTORIES(

src/mapserver/qgis_map_serv.cpp

@@ -240,9 +240,21 @@ int main( int argc, char * argv[] )
   QgsMapRenderer* theMapRenderer = new QgsMapRenderer();
   theMapRenderer->setLabelingEngine( new QgsPalLabeling() );
 
+  // load standard test font from testdata.qrc (for unit tests)
+  bool testFontLoaded = false;
+  QFile testFont( ":/testdata/font/FreeSansQGIS.ttf" );
+  if ( testFont.open( QIODevice::ReadOnly ) )
+  {
+    int fontID = QFontDatabase::addApplicationFontFromData( testFont.readAll() );
+    testFontLoaded = ( fontID != -1 );
+  } // else app wasn't built with ENABLE_TESTS or not GUI app
+
   while ( fcgi_accept() >= 0 )
   {
     printRequestInfos(); //print request infos if in debug mode
+#ifdef QGSMSDEBUG
+    QgsDebugMsg( QString( "Test font %1loaded from testdata.qrc" ).arg( testFontLoaded ? "" : "NOT " ) );
+#endif
 
     //use QgsGetRequestHandler in case of HTTP GET and QgsSOAPRequestHandler in case of HTTP POST
     QgsRequestHandler* theRequestHandler = 0;

tests/src/python/CMakeLists.txt

@@ -25,7 +25,7 @@ ADD_PYTHON_TEST(PyQgsExpression test_qgsexpression.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingBase test_qgspallabeling_base.py)
 ADD_PYTHON_TEST(PyQgsPalLabelingCanvas test_qgspallabeling_canvas.py)
 #ADD_PYTHON_TEST(PyQgsPalLabelingComposer test_qgspallabeling_composer.py)
-#ADD_PYTHON_TEST(PyQgsPalLabelingServer test_qgspallabeling_server.py)
+ADD_PYTHON_TEST(PyQgsPalLabelingServer test_qgspallabeling_server.py)
 ADD_PYTHON_TEST(PyQgsVectorFileWriter test_qgsvectorfilewriter.py)
 ADD_PYTHON_TEST(PyQgsSpatialiteProvider test_qgsspatialiteprovider.py)
 ADD_PYTHON_TEST(PyQgsZonalStatistics test_qgszonalstatistics.py)