Fix tests where locale-dependent formatting of numbers is used

wonder-sk · wonder-sk · commit 98713a94d4ca · 2016-02-23T13:49:28.000+08:00
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):

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`#include <sqlite3.h>`
`18`	`18`	`#include <QDir>`
`19`	`19`	`#include <QString>`
`20`		`-#include <QLocale>`
`21`	`20`	`#include <QObject>`
`22`	`21`
`23`	`22`	`#include "qgis.h"`
`@@ -1094,7 +1093,7 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,`
`1094`	`1093`	`break;`
`1095`	`1094`	`}`
`1096`	`1095`
`1097`		`- return QLocale::system().toString( value, 'f', decimals ) + unitLabel;`
	`1096`	`+ return QString( "%L1%2" ).arg( value, 0, 'f', decimals ).arg( unitLabel );`
`1098`	`1097`	`}`
`1099`	`1098`
`1100`	`1099`	`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`
`1229`	`1228`	`}`
`1230`	`1229`	`}`
`1231`	`1230`
`1232`		`- return QLocale::system().toString( area, 'f', decimals ) + unitLabel;`
	`1231`	`+ return QString( "%L1%2" ).arg( area, 0, 'f', decimals ).arg( unitLabel );`
`1233`	`1232`	`}`
`1234`	`1233`
`1235`	`1234`	`void QgsDistanceArea::convertMeasurement( double &measure, QGis::UnitType &measureUnits, QGis::UnitType displayUnits, bool isArea ) const`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`#include "qgsunittypes.h"`
`18`	`18`	`#include <QCoreApplication>`
`19`		`-#include <QLocale>`
`20`	`19`
`21`	`20`	`/***************************************************************************`
`22`	`21`	`* 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`
`938`	`937`	`break;`
`939`	`938`	`}`
`940`	`939`
`941`		`- return QLocale::system().toString( angle, 'f', decimals ) + unitLabel;`
	`940`	`+ return QString( "%L1%2" ).arg( angle, 0, 'f', decimals ).arg( unitLabel );`
`942`	`941`	`}`
`943`	`942`
`944`	`943`	`// enable for QGIS 3.0`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ void TestQgsMapToolIdentifyAction::initTestCase()`
`55`	`55`	`QCoreApplication::setApplicationName( "QGIS-TEST" );`
`56`	`56`
`57`	`57`	`QgsApplication::showSettings();`
	`58`	`+`
	`59`	`+ // enforce C locale because the tests expect it`
	`60`	`+ // (decimal separators / thousand separators)`
	`61`	`+ QLocale::setDefault( QLocale::c() );`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`void TestQgsMapToolIdentifyAction::cleanupTestCase()`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ void TestQgsMeasureTool::initTestCase()`
`69`	`69`
`70`	`70`	`mQgisApp = new QgisApp();`
`71`	`71`	`mCanvas = new QgsMapCanvas();`
	`72`	`+`
	`73`	`+ // enforce C locale because the tests expect it`
	`74`	`+ // (decimal separators / thousand separators)`
	`75`	`+ QLocale::setDefault( QLocale::c() );`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`//runs after all tests`