diff --git a/src/core/raster/qgsrasterchecker.cpp b/src/core/raster/qgsrasterchecker.cpp
index ee8e4688ee2..0e70c08394c 100644
--- a/src/core/raster/qgsrasterchecker.cpp
+++ b/src/core/raster/qgsrasterchecker.cpp
@@ -211,7 +211,7 @@ double QgsRasterChecker::tolerance( double val, int places )
QString QgsRasterChecker::compareHead()
{
QString html;
- html += QString( "
Param name | Verified value | Eexpected value | Difference | Tolerance |
" ).arg( mCellStyle );
+ html += QString( "Param name | Verified value | Expected value | Difference | Tolerance |
" ).arg( mCellStyle );
return html;
}
diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
index bc4af1283fe..ad7a10bb4bd 100644
--- a/tests/src/core/testqgsogcutils.cpp
+++ b/tests/src/core/testqgsogcutils.cpp
@@ -80,14 +80,14 @@ void TestQgsOgcUtils::testGeometryToGML()
QVERIFY( !elemPoint.isNull() );
doc.appendChild( elemPoint );
- QCOMPARE( doc.toString( -1 ), QString( "111.0,222.0" ) );
+ QCOMPARE( doc.toString( -1 ), QString( "111,222" ) );
doc.removeChild( elemPoint );
QDomElement elemLine = QgsOgcUtils::geometryToGML( geomLine, doc );
QVERIFY( !elemLine.isNull() );
doc.appendChild( elemLine );
- QCOMPARE( doc.toString( -1 ), QString( "111.0,222.0 222.0,222.0" ) );
+ QCOMPARE( doc.toString( -1 ), QString( "111,222 222,222" ) );
doc.removeChild( elemLine );
// Test GML3
@@ -98,14 +98,14 @@ void TestQgsOgcUtils::testGeometryToGML()
QVERIFY( !elemPoint.isNull() );
doc.appendChild( elemPoint );
- QCOMPARE( doc.toString( -1 ), QString( "111.0 222.0" ) );
+ QCOMPARE( doc.toString( -1 ), QString( "111 222" ) );
doc.removeChild( elemPoint );
elemLine = QgsOgcUtils::geometryToGML( geomLine, doc, "GML3" );
QVERIFY( !elemLine.isNull() );
doc.appendChild( elemLine );
- QCOMPARE( doc.toString( -1 ), QString( "111.0 222.0 222.0 222.0" ) );
+ QCOMPARE( doc.toString( -1 ), QString( "111 222 222 222" ) );
doc.removeChild( elemLine );
delete geomPoint;
@@ -315,15 +315,15 @@ void TestQgsOgcUtils::testExpressionToOgcFilter_data()
""
""
"geometry"
- "5.0,6.0"
+ "5,6"
""
"" );
- QTest::newRow( "contains + gml" ) << QString( "contains($geometry, geomFromGML('5.0,6.0'))" ) << QString(
+ QTest::newRow( "contains + gml" ) << QString( "contains($geometry, geomFromGML('5,6'))" ) << QString(
""
""
"geometry"
- "5.0,6.0"
+ "5,6"
""
"" );
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
index 41d3d1c9afc..c407bad282b 100644
--- a/tests/src/python/test_qgsgeometry.py
+++ b/tests/src/python/test_qgsgeometry.py
@@ -321,7 +321,7 @@ class TestQgsGeometry(TestCase):
#print 'Difference: %s' % myDifferenceGeometry.exportToWkt()
print 'Symmetrical: %s' % mySymmetricalGeometry.exportToWkt()
- myExpectedWkt = 'LINESTRING(20.0 20.0, 30.0 30.0)'
+ myExpectedWkt = 'LINESTRING(20 20, 30 30)'
# There should only be one feature that intersects this clip
# poly so this assertion should work.
self.assertEqual(myExpectedWkt,
diff --git a/tests/src/python/test_qgsrectangle.py b/tests/src/python/test_qgsrectangle.py
index 64e77314af5..6e1466cce23 100644
--- a/tests/src/python/test_qgsrectangle.py
+++ b/tests/src/python/test_qgsrectangle.py
@@ -179,8 +179,8 @@ class TestQgsRectangle(TestCase):
def testAsWktCoordinates(self):
"""Test that we can get a proper wkt representation fo the rect"""
rect1 = QgsRectangle( 0.0, 0.0, 5.0, 5.0)
- myExpectedWkt = ('0.0 0.0, '
- '5.0 5.0')
+ myExpectedWkt = ('0 0, '
+ '5 5')
myWkt = rect1.asWktCoordinates()
myMessage = ('Expected: %s\nGot: %s\n' %
(myExpectedWkt, myWkt))
@@ -189,11 +189,11 @@ class TestQgsRectangle(TestCase):
def testAsWktPolygon(self):
"""Test that we can get a proper rect wkt polygon representation for rect"""
rect1 = QgsRectangle( 0.0, 0.0, 5.0, 5.0)
- myExpectedWkt = ('POLYGON((0.0 0.0, '
- '5.0 0.0, '
- '5.0 5.0, '
- '0.0 5.0, '
- '0.0 0.0))')
+ myExpectedWkt = ('POLYGON((0 0, '
+ '5 0, '
+ '5 5, '
+ '0 5, '
+ '0 0))')
myWkt = rect1.asWktPolygon()
myMessage = ('Expected: %s\nGot: %s\n' %
(myExpectedWkt, myWkt))