python/core/qgsfontutils.sip

@@ -16,6 +16,14 @@ class QgsFontUtils
      */
     static bool fontFamilyOnSystem( const QString& family );
 
+    /** Check whether font family on system has specific style
+     * @param family The family to test
+     * @param style The style to test for
+     * @returns Whether family has style
+     * @note Added in QGIS 2.1
+     */
+    static bool fontFamilyHasStyle( const QString& family, const QString& style );
+
     /** Check whether font family is on system
      * @param family The family to test
      * @param chosen The actual family (possibly from different foundry) returned by system
@@ -33,4 +41,24 @@ class QgsFontUtils
      */
     static bool updateFontViaStyle( QFont& f, const QString& fontstyle, bool fallback = false );
 
+    /** Get standard test font family
+     * @note Added in QGIS 2.1
+     */
+    static QString standardTestFontFamily();
+
+    /** Loads standard test fonts from filesystem or qrc resource
+     * @param loadstyles List of styles to load, e.g. All, Roman, Oblique, Bold, Bold Oblique
+     * @returns Whether any font was loaded
+     * @note Done by default on debug app/server startup to ensure fonts available for unit tests (Roman and Bold)
+     * @note Added in QGIS 2.1
+     */
+    static bool loadStandardTestFonts( QStringList loadstyles );
+
+    /** Get standard test font with specific style
+     * @param style Style to load, e.g. Roman, Oblique, Bold, Bold Oblique
+     * @param pointsize Font point size to set
+     * @returns QFont
+     * @note Added in QGIS 2.1
+     */
+    static QFont getStandardTestFont( const QString& style = "Roman", int pointsize = 12 );
 };

src/app/CMakeLists.txt

@@ -373,12 +373,9 @@ 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)
+# add test resources, e.g. standard test font
+SET(TEST_RCCS ../../tests/testdata/testdata.qrc)
+QT4_ADD_RESOURCES(TEST_RCC_SRCS ${TEST_RCCS})
 
 QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
 

src/app/main.cpp

@@ -35,6 +35,7 @@
 #include <QMessageBox>
 
 #include "qgscustomization.h"
+#include "qgsfontutils.h"
 #include "qgspluginregistry.h"
 #include "qgsmessagelog.h"
 #include "qgspythonrunner.h"
@@ -736,14 +737,9 @@ 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() );
-    Q_UNUSED( fontID );
-    QgsDebugMsg( QString( "Test font %1loaded from testdata.qrc" ).arg( fontID != -1 ? "" : "NOT " ) );
-  } // else app wasn't built with ENABLE_TESTS
+#ifdef QGISDEBUG
+  QgsFontUtils::loadStandardTestFonts( QStringList() << "Roman" << "Bold" );
+#endif
 
   // 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.

src/core/qgsapplication.cpp

@@ -91,6 +91,7 @@ void QgsApplication::init( QString customConfigPath )
   qRegisterMetaType<QgsGeometry::Error>( "QgsGeometry::Error" );
 
   QString prefixPath( getenv( "QGIS_PREFIX_PATH" ) ? getenv( "QGIS_PREFIX_PATH" ) : applicationDirPath() );
+  // QgsDebugMsg( QString( "prefixPath(): %1" ).arg( prefixPath ) );
 
   // check if QGIS is run from build directory (not the install directory)
   QFile f;

src/core/qgsfontutils.cpp

@@ -15,7 +15,11 @@
 
 #include "qgsfontutils.h"
 
+#include "qgsapplication.h"
+#include "qgslogger.h"
+
 #include <QApplication>
+#include <QFile>
 #include <QFont>
 #include <QFontDatabase>
 #include <QFontInfo>
@@ -32,7 +36,13 @@ bool QgsFontUtils::fontFamilyOnSystem( const QString& family )
 {
   QFont tmpFont = QFont( family );
   // compare just beginning of family string in case 'family [foundry]' differs
-  return family.startsWith( tmpFont.family(), Qt::CaseInsensitive );
+  return tmpFont.family().startsWith( family, Qt::CaseInsensitive );
+}
+
+bool QgsFontUtils::fontFamilyHasStyle( const QString& family, const QString& style )
+{
+  QFontDatabase fontDB;
+  return ( fontFamilyOnSystem( family ) && fontDB.styles( family ).contains( style ) );
 }
 
 bool QgsFontUtils::fontFamilyMatchOnSystem( const QString& family, QString* chosen, bool* match )
@@ -191,3 +201,86 @@ bool QgsFontUtils::updateFontViaStyle( QFont& f, const QString& fontstyle, bool
 
   return false;
 }
+
+QString QgsFontUtils::standardTestFontFamily()
+{
+  return "QGIS Vera Sans";
+}
+
+bool QgsFontUtils::loadStandardTestFonts( QStringList loadstyles )
+{
+  // load standard test font from filesystem or testdata.qrc (for unit tests and general testing)
+  bool fontsLoaded = false;
+
+  QString fontFamily = standardTestFontFamily();
+  QMap<QString, QString> fontStyles;
+  fontStyles.insert( "Roman", "QGIS-Vera/QGIS-Vera.ttf" );
+  fontStyles.insert( "Oblique", "QGIS-Vera/QGIS-VeraIt.ttf" );
+  fontStyles.insert( "Bold", "QGIS-Vera/QGIS-VeraBd.ttf" );
+  fontStyles.insert( "Bold Oblique", "QGIS-Vera/QGIS-VeraBI.ttf" );
+
+  QMap<QString, QString>::const_iterator f = fontStyles.constBegin();
+  for ( ; f != fontStyles.constEnd(); ++f )
+  {
+    QString fontstyle( f.key() );
+    QString fontpath( f.value() );
+    if ( !( loadstyles.contains( fontstyle ) || loadstyles.contains( "All" ) ) )
+    {
+      continue;
+    }
+    QString familyStyle = QString( "%1 %2" ).arg( fontFamily ).arg( fontstyle );
+
+    if ( fontFamilyHasStyle( fontFamily, fontstyle ) )
+    {
+      fontsLoaded = ( fontsLoaded || false );
+      QgsDebugMsg( QString( "Test font '%1' already available" ).arg( familyStyle ) );
+    }
+    else
+    {
+      bool loaded = false;
+      if ( QgsApplication::isRunningFromBuildDir() )
+      {
+        // workaround for bugs with Qt 4.8.5 (other versions?) on Mac 10.9, where fonts
+        // from qrc resources load but fail to work and default font is substituted [LS]:
+        //   https://bugreports.qt-project.org/browse/QTBUG-30917
+        //   https://bugreports.qt-project.org/browse/QTBUG-32789
+        QString fontPath( QgsApplication::buildSourcePath() + "/tests/testdata/font/" + fontpath );
+        int fontID = QFontDatabase::addApplicationFont( fontPath );
+        loaded = ( fontID != -1 );
+        fontsLoaded = ( fontsLoaded || loaded );
+        QgsDebugMsg( QString( "Test font '%1' %2 from filesystem" )
+                     .arg( familyStyle ).arg( loaded ? "loaded" : "FAILED to load" ) );
+      }
+      else
+      {
+        QFile fontResource( ":/testdata/font/" + fontpath );
+        if ( fontResource.open( QIODevice::ReadOnly ) )
+        {
+          int fontID = QFontDatabase::addApplicationFontFromData( fontResource.readAll() );
+          loaded = ( fontID != -1 );
+          fontsLoaded = ( fontsLoaded || loaded );
+        }
+        QgsDebugMsg( QString( "Test font '%1' %2 from testdata.qrc" )
+                     .arg( familyStyle ).arg( loaded ? "loaded" : "FAILED to load" ) );
+      }
+    }
+  }
+
+  return fontsLoaded;
+}
+
+QFont QgsFontUtils::getStandardTestFont( const QString& style, int pointsize )
+{
+  QFontDatabase fontDB;
+  if ( ! fontFamilyHasStyle( standardTestFontFamily(), style ) )
+  {
+    loadStandardTestFonts( QStringList() << style );
+  }
+
+  QFont f = fontDB.font( standardTestFontFamily(), style, pointsize );
+  // in case above statement fails to set style
+  f.setBold( style.contains( "Bold" ) );
+  f.setItalic( style.contains( "Oblique" ) );
+
+  return f;
+}

src/core/qgsfontutils.h

@@ -34,6 +34,14 @@ class CORE_EXPORT QgsFontUtils
      */
     static bool fontFamilyOnSystem( const QString& family );
 
+    /** Check whether font family on system has specific style
+     * @param family The family to test
+     * @param style The style to test for
+     * @returns Whether family has style
+     * @note Added in QGIS 2.1
+     */
+    static bool fontFamilyHasStyle( const QString& family, const QString& style );
+
     /** Check whether font family is on system
      * @param family The family to test
      * @param chosen The actual family (possibly from different foundry) returned by system
@@ -51,6 +59,26 @@ class CORE_EXPORT QgsFontUtils
      */
     static bool updateFontViaStyle( QFont& f, const QString& fontstyle, bool fallback = false );
 
+    /** Get standard test font family
+     * @note Added in QGIS 2.1
+     */
+    static QString standardTestFontFamily();
+
+    /** Loads standard test fonts from filesystem or qrc resource
+     * @param loadstyles List of styles to load, e.g. All, Roman, Oblique, Bold, Bold Oblique
+     * @returns Whether any font was loaded
+     * @note Done by default on debug app/server startup to ensure fonts available for unit tests (Roman and Bold)
+     * @note Added in QGIS 2.1
+     */
+    static bool loadStandardTestFonts( QStringList loadstyles );
+
+    /** Get standard test font with specific style
+     * @param style Style to load, e.g. Roman, Oblique, Bold, Bold Oblique
+     * @param pointsize Font point size to set
+     * @returns QFont
+     * @note Added in QGIS 2.1
+     */
+    static QFont getStandardTestFont( const QString& style = "Roman", int pointsize = 12 );
 };
 
 #endif // QGSFONTUTILS_H

src/core/qgsrenderchecker.cpp

@@ -93,10 +93,10 @@ bool QgsRenderChecker::isKnownAnomaly( QString theDiffImageFile )
     QString myAnomalyHash = imageToHash( controlImagePath() + mControlName
                                          + QDir::separator() + myFile );
     QString myHashMessage = QString(
-                              "Checking if anomaly %1 (hash %2)" )
+                              "Checking if anomaly %1 (hash %2)<br>" )
                             .arg( myFile )
                             .arg( myAnomalyHash );
-    myHashMessage += QString( " matches %1 (hash %2)" )
+    myHashMessage += QString( "&nbsp; matches %1 (hash %2)" )
                      .arg( theDiffImageFile )
                      .arg( myImageHash );
     //foo CDash
@@ -246,8 +246,13 @@ bool QgsRenderChecker::compareImages( QString theTestName,
   mReport += "Actual Duration :  " + QString::number( mElapsedTime ) + "ms<br>";
 
   // limit image size in page to something reasonable
-  int imgWidth = qMin( myExpectedImage.width(), 400 );
-  int imgHeight = myExpectedImage.height() * imgWidth / myExpectedImage.width();
+  int imgWidth = 420;
+  int imgHeight = 280;
+  if ( ! myExpectedImage.isNull() )
+  {
+    imgWidth = qMin( myExpectedImage.width(), imgWidth );
+    imgHeight = myExpectedImage.height() * imgWidth / myExpectedImage.width();
+  }
   QString myImagesString = "</td></tr>"
                            "<tr><td>Test Result:</td><td>Expected Result:</td><td>Difference (all blue is good, any red is bad)</td></tr>\n"
                            "<tr><td><img width=" + QString::number( imgWidth ) +

src/mapserver/CMakeLists.txt

@@ -67,12 +67,9 @@ 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 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})
 
 ADD_EXECUTABLE(qgis_mapserv.fcgi
   ${qgis_mapserv_SRCS} 

src/mapserver/qgis_map_serv.cpp

@@ -20,6 +20,7 @@ map service syntax for SOAP/HTTP POST
 #include "qgsapplication.h"
 #include "qgscapabilitiescache.h"
 #include "qgsconfigcache.h"
+#include "qgsfontutils.h"
 #include "qgsgetrequesthandler.h"
 #include "qgspostrequesthandler.h"
 #include "qgssoaprequesthandler.h"
@@ -248,22 +249,12 @@ int main( int argc, char * argv[] )
   theMapRenderer->setLabelingEngine( new QgsPalLabeling() );
 
 #ifdef QGSMSDEBUG
-  // 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
+  QgsFontUtils::loadStandardTestFonts( QStringList() << "Roman" << "Bold" );
 #endif
 
   while ( fcgi_accept() >= 0 )
   {
     printRequestInfos(); //print request infos if in debug mode
-#ifdef QGSMSDEBUG
-    QgsDebugMsg( QString( "Test font %1 loaded 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

@@ -1,5 +1,7 @@
 INCLUDE(UsePythonTest)
 ADD_PYTHON_TEST(PyQgsApplication test_qgsapplication.py)
+ADD_PYTHON_TEST(PyQgsLocalServer test_qgis_local_server.py)
+ADD_PYTHON_TEST(PyQgsFontUtils test_qgsfontutils.py)
 ADD_PYTHON_TEST(PyQgsFeature test_qgsfeature.py)
 ADD_PYTHON_TEST(PyQgsFeatureIterator test_qgsfeatureiterator.py)
 ADD_PYTHON_TEST(PyQgsGeometry test_qgsgeometry.py)