tests: make compareWkt more tolerant towards whitespaces

jef-n · jef-n · commit ab105599bb47 · 2014-02-28T22:30:29.000+01:00
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
@@ -911,7 +911,7 @@ def testDeleteVertex(self):
         polygon = QgsGeometry.fromWkt("POLYGON((0 0, 1 0, 1 1, 2 1, 2 2, 0 2, 0 0))")
 
         assert polygon.deleteVertex(2), "Delete vertex 2 failed"
-        print "FIXME: exportToWkt doesn't put a blanks behind the comma"
+        print "FIXME: exportToWkt doesn't put a blank behind the comma"
         expwkt = "POLYGON((0 0,1 0,2 1,2 2,0 2,0 0))"
         wkt = polygon.exportToWkt()
         assert compareWkt( expwkt, wkt ), "Expected:\n%s\nGot:\n%s\n" % (expwkt, wkt )
diff --git a/tests/src/python/utilities.py b/tests/src/python/utilities.py
@@ -47,7 +47,6 @@
 PARENT = None
 IFACE = None
 GEOCRS = 4326  # constant for EPSG:GEOCRS Geographic CRS id
-GOOGLECRS = 900913  # constant for EPSG:GOOGLECRS Google Mercator id
 
 FONTSLOADED = False
 
@@ -201,11 +200,12 @@ def writeShape(theMemoryLayer, theFileName):
 
 
 def compareWkt(a, b, tol=0.000001):
-    r = re.compile( "-?\d+(?:\.\d+)?(?:[eE]\d+)?" )
+    r0 = re.compile( "-?\d+(?:\.\d+)?(?:[eE]\d+)?" )
+    r1 = re.compile( "\s*,\s*" )
 
     # compare the structure
-    a0 = r.sub( "#", a )
-    b0 = r.sub( "#", b )
+    a0 = r1.sub( ",", r0.sub( "#", r ) )
+    b0 = r1.sub( ",", r0.sub( "#", b ) )
     if a0 != b0:
         return False
 
