From 0491c27d09a77fd2d96ee73c0b07a8d2a8bcb1e9 Mon Sep 17 00:00:00 2001
From: Tim Sutton <tim@linfiniti.com>
Date: Sun, 26 Aug 2012 14:35:03 +0200
Subject: [PATCH] Added coordinate system python test and set cmake to copy
 qgis.db and srs.db into output dir so tests that rely on those can work

---
 tests/CMakeLists.txt                            | 5 +++++
 tests/src/python/test_qgscoordinatetransform.py | 5 +++--
 tests/src/python/utilities.py                   | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index abfb3c46841..7bdc410176f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,9 @@
 IF (ENABLE_TESTS)
+
+  # Install any resoure files needed here...
+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/srs.db DESTINATION ${QGIS_OUTPUT_DIRECTORY}/share/qgis/resources/)
+  INSTALL(FILES ${CMAKE_SOURCE_DIR}/resources/qgis.db DESTINATION ${QGIS_OUTPUT_DIRECTORY}/share/qgis/resources/)
+
   IF (APPLE)
     # override default data path, otherwise looks for Resources in app bundle
     SET (QGIS_DATA_SUBDIR    "${CMAKE_SOURCE_DIR}/resources")
diff --git a/tests/src/python/test_qgscoordinatetransform.py b/tests/src/python/test_qgscoordinatetransform.py
index 3c681526d3e..ce3eca1bc9e 100644
--- a/tests/src/python/test_qgscoordinatetransform.py
+++ b/tests/src/python/test_qgscoordinatetransform.py
@@ -21,12 +21,13 @@ class TestQgsCoordinateTransform(unittest.TestCase):
         myUtmCrs.createFromId(32756, QgsCoordinateReferenceSystem.EpsgCrsId)
         myXForm = QgsCoordinateTransform(myUtmCrs, myGeoCrs)
         myProjectedExtent = myXForm.transformBoundingBox(myExtent)
-        myExpectedExtent = ''
+        myExpectedExtent = ('150.1509239873580270,-35.7176936443908772 : '
+                            '150.1964384662953194,-35.6971885216629090')
         myMessage = ('Expected:\n%s\nGot:\n%s\n' %
                       ( myExpectedExtent,
                         myProjectedExtent.toString()))
                       
-        assert myExpectedExtent == myProjectedExtent, myMessage
+        self.assertEquals(myExpectedExtent, myProjectedExtent.toString(), myMessage)
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/tests/src/python/utilities.py b/tests/src/python/utilities.py
index 6a09d12d8a2..4f117f44eed 100644
--- a/tests/src/python/utilities.py
+++ b/tests/src/python/utilities.py
@@ -68,8 +68,8 @@ def getQgisTestApp():
     if QGISAPP is None:
         myGuiFlag = True  # All test will run qgis in gui mode
         QGISAPP = QgsApplication(sys.argv, myGuiFlag)
-        if 'QGISPATH' in os.environ:
-            myPath = os.environ['QGISPATH']
+        if 'QGIS_PREFIX_PATH' in os.environ:
+            myPath = os.environ['QGIS_PREFIX_PATH']
             myUseDefaultPathFlag = True
             QGISAPP.setPrefixPath(myPath, myUseDefaultPathFlag)