Fix tests where locale-dependent formatting of numbers is used

qgis · Feb 23, 2016 · 98713a9 · 98713a9
1 parent b34105d
commit 98713a9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -17,7 +17,6 @@
 #include <sqlite3.h>
 #include <QDir>
 #include <QString>
-#include <QLocale>
 #include <QObject>
 
 #include "qgis.h"
@@ -1094,7 +1093,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
       break;
   }
 
-  return QLocale::system().toString( value, 'f', decimals ) + unitLabel;
+  return QString( "%L1%2" ).arg( value, 0, 'f', decimals ).arg( unitLabel );
 }
 
 QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::AreaUnit unit, bool keepBaseUnit )
@@ -1229,7 +1228,7 @@ QString QgsDistanceArea::formatArea( double area, int decimals, QgsUnitTypes::Ar
     }
   }
 
-  return QLocale::system().toString( area, 'f', decimals ) + unitLabel;
+  return QString( "%L1%2" ).arg( area, 0, 'f', decimals ).arg( unitLabel );
 }
 
 void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measureUnits, QGis::UnitType displayUnits, bool isArea ) const

diff --git a/src/core/qgsunittypes.cpp b/src/core/qgsunittypes.cpp
@@ -16,7 +16,6 @@
 
 #include "qgsunittypes.h"
 #include <QCoreApplication>
-#include <QLocale>
 
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
@@ -938,7 +937,7 @@ QString QgsUnitTypes::formatAngle( double angle, int decimals, QgsUnitTypes::Ang
       break;
   }
 
-  return QLocale::system().toString( angle, 'f', decimals ) + unitLabel;
+  return QString( "%L1%2" ).arg( angle, 0, 'f', decimals ).arg( unitLabel );
 }
 
 // enable for QGIS 3.0

diff --git a/tests/src/app/testqgsmaptoolidentifyaction.cpp b/tests/src/app/testqgsmaptoolidentifyaction.cpp
@@ -55,6 +55,10 @@ void TestQgsMapToolIdentifyAction::initTestCase()
   QCoreApplication::setApplicationName( "QGIS-TEST" );
 
   QgsApplication::showSettings();
+
+  // enforce C locale because the tests expect it
+  // (decimal separators / thousand separators)
+  QLocale::setDefault( QLocale::c() );
 }
 
 void TestQgsMapToolIdentifyAction::cleanupTestCase()

diff --git a/tests/src/app/testqgsmeasuretool.cpp b/tests/src/app/testqgsmeasuretool.cpp
@@ -69,6 +69,10 @@ void TestQgsMeasureTool::initTestCase()
 
   mQgisApp = new QgisApp();
   mCanvas = new QgsMapCanvas();
+
+  // enforce C locale because the tests expect it
+  // (decimal separators / thousand separators)
+  QLocale::setDefault( QLocale::c() );
 }
 
 //runs after all tests

diff --git a/tests/src/python/test_qgsunittypes.py b/tests/src/python/test_qgsunittypes.py
@@ -20,6 +20,11 @@
     QGis,
     QgsSymbolV2
 )
+from PyQt4.QtCore import QLocale
+
+# enforce C locale because the tests expect it
+# (decimal separators / thousand separators)
+QLocale.setDefault(QLocale.c())
 
 
 class TestQgsUnitTypes(unittest.TestCase):