Fix copy/paste error, update unit tests

nyalldawson · nyalldawson · commit a77b5b651798 · 2017-12-19T09:11:39.000+10:00
diff --git a/src/core/qgsdatumtransform.cpp b/src/core/qgsdatumtransform.cpp
@@ -68,7 +68,7 @@ QList< QgsDatumTransform::TransformPair > QgsDatumTransform::datumTransformation
   }
 
   //add direct datum transformations
-  for ( int transform : qgis::as_const( directTransforms ) )
+  for ( int transform : qgis::as_const( reverseDirectTransforms ) )
   {
     transformations.push_back( QgsDatumTransform::TransformPair( -1, transform ) );
   }
diff --git a/tests/src/python/test_qgscoordinatetransform.py b/tests/src/python/test_qgscoordinatetransform.py
@@ -213,10 +213,21 @@ def testTransformInfo(self):
         transforms = QgsDatumTransform.datumTransformations(QgsCoordinateReferenceSystem(4613), QgsCoordinateReferenceSystem(4326))
         self.assertTrue(len(transforms) > 0)
         self.assertIn('+towgs84=-403,684,41', [QgsDatumTransform.datumTransformToProj(t.sourceTransformId) for t in transforms])
-        self.assertIn('+towgs84=-403,684,41', [QgsDatumTransform.datumTransformToProj(t.destinationTransformId) for t in transforms])
-        self.assertIn('EPSG:4613', [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).sourceCrsAuthId for t in
+        self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformToProj(t.destinationTransformId) for t in transforms])
+        self.assertIn('EPSG:4613', [QgsDatumTransform.datumTransformInfo(t.sourceTransformId).sourceCrsAuthId for t in
                                     transforms])
-        self.assertIn('EPSG:4326', [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).destinationCrsAuthId for t in
+        self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).destinationCrsAuthId for t in
+                                                  transforms])
+
+        # and the reverse
+        transforms = QgsDatumTransform.datumTransformations(QgsCoordinateReferenceSystem(4326), QgsCoordinateReferenceSystem(4613))
+        self.assertTrue(len(transforms) > 0)
+        self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformToProj(t.sourceTransformId) for t in transforms])
+        self.assertIn('+towgs84=-403,684,41',
+                      [QgsDatumTransform.datumTransformToProj(t.destinationTransformId) for t in transforms])
+        self.assertEqual([''] * len(transforms), [QgsDatumTransform.datumTransformInfo(t.sourceTransformId).destinationCrsAuthId for t in
+                                                  transforms])
+        self.assertIn('EPSG:4613', [QgsDatumTransform.datumTransformInfo(t.destinationTransformId).sourceCrsAuthId for t in
                                     transforms])
 
     def testStringToTransformId(self):

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ QList< QgsDatumTransform::TransformPair > QgsDatumTransform::datumTransformation`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`//add direct datum transformations`
`71`		`- for ( int transform : qgis::as_const( directTransforms ) )`
	`71`	`+ for ( int transform : qgis::as_const( reverseDirectTransforms ) )`
`72`	`72`	`{`
`73`	`73`	`transformations.push_back( QgsDatumTransform::TransformPair( -1, transform ) );`
`74`	`74`	`}`