[QGIS Commit] r12105 - trunk/qgis/tests/src/core
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 14 12:11:46 EST 2009
Author: wonder
Date: 2009-11-14 12:11:45 -0500 (Sat, 14 Nov 2009)
New Revision: 12105
Modified:
trunk/qgis/tests/src/core/CMakeLists.txt
trunk/qgis/tests/src/core/testqgspoint.cpp
Log:
Created a macro ADD_QGIS_TEST to make adding new tests easier.
(+ nearly fixed QgsPoint test)
Modified: trunk/qgis/tests/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/tests/src/core/CMakeLists.txt 2009-11-14 16:24:49 UTC (rev 12104)
+++ trunk/qgis/tests/src/core/CMakeLists.txt 2009-11-14 17:11:45 UTC (rev 12105)
@@ -63,281 +63,52 @@
#directly included in the sources
#and should not be compiled twice. Trying to include
#them in will cause an error at build time
-#############################################################
-# Tests:
-#
-# QgsApplication test
-#
-SET(qgis_applicationtest_SRCS testqgsapplication.cpp ${util_SRCS})
-SET(qgis_applicationtest_MOC_CPPS testqgsapplication.cpp)
-QT4_WRAP_CPP(qgis_applicationtest_MOC_SRCS ${qgis_applicationtest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_applicationtestmoc ALL DEPENDS ${qgis_applicationtest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_applicationtest ${qgis_applicationtest_SRCS})
-ADD_DEPENDENCIES(qgis_applicationtest qgis_applicationtestmoc)
-TARGET_LINK_LIBRARIES(qgis_applicationtest ${QT_LIBRARIES} qgis_core)
- #No relinking and full RPATH for the install tree
- #See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree
-SET_TARGET_PROPERTIES(qgis_applicationtest
- # skip the full RPATH for the build tree
- PROPERTIES SKIP_BUILD_RPATH TRUE
- )
-SET_TARGET_PROPERTIES(qgis_applicationtest
- # when building, use the install RPATH already
- # (so it doesn't need to relink when installing)
- PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE
- )
-SET_TARGET_PROPERTIES(qgis_applicationtest
- # the RPATH to be used when installing
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- )
-SET_TARGET_PROPERTIES(qgis_applicationtest
- # add the automatically determined parts of the RPATH
- # which point to directories outside the build tree to the install RPATH
- PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
- )
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_applicationtest ${CMAKE_INSTALL_PREFIX}/qgis_applicationtest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_applicationtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_applicationtest)
-ENDIF (APPLE)
-#
-# QgsFileWriter test
-#
-SET(qgis_filewritertest_SRCS testqgsvectorfilewriter.cpp ${util_SRCS})
-SET(qgis_filewritertest_MOC_CPPS testqgsvectorfilewriter.cpp)
-QT4_WRAP_CPP(qgis_filewritertest_MOC_SRCS ${qgis_filewritertest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_filewritertestmoc ALL DEPENDS ${qgis_filewritertest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_filewritertest ${qgis_filewritertest_SRCS})
-ADD_DEPENDENCIES(qgis_filewritertest qgis_filewritertestmoc)
-TARGET_LINK_LIBRARIES(qgis_filewritertest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_filewritertest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_filewritertest ${CMAKE_INSTALL_PREFIX}/qgis_filewritertest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_filewritertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_filewritertest)
-ENDIF (APPLE)
+#No relinking and full RPATH for the install tree
+#See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree
+MACRO (ADD_QGIS_TEST testname testsrc)
+ SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
+ SET(qgis_${testname}_MOC_CPPS ${testsrc})
+ QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
+ ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
+ ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
+ ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
+ TARGET_LINK_LIBRARIES(qgis_${testname} ${QT_LIBRARIES} qgis_core)
+ SET_TARGET_PROPERTIES(qgis_${testname}
+ PROPERTIES
+ # skip the full RPATH for the build tree
+ SKIP_BUILD_RPATH TRUE
+ # when building, use the install RPATH already
+ # (so it doesn't need to relink when installing)
+ BUILD_WITH_INSTALL_RPATH TRUE
+ # the RPATH to be used when installing
+ INSTALL_RPATH ${QGIS_LIB_DIR}
+ # add the automatically determined parts of the RPATH
+ # which point to directories outside the build tree to the install RPATH
+ INSTALL_RPATH_USE_LINK_PATH true)
+ IF (APPLE)
+ # For Mac OS X, the executable must be at the root of the bundle's executable folder
+ INSTALL(TARGETS qgis_${testname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
+ ADD_TEST(qgis_${testname} ${CMAKE_INSTALL_PREFIX}/qgis_${testname})
+ ELSE (APPLE)
+ INSTALL(TARGETS qgis_${testname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+ ADD_TEST(qgis_${testname} ${CMAKE_INSTALL_PREFIX}/bin/qgis_${testname})
+ ENDIF (APPLE)
+ENDMACRO (ADD_QGIS_TEST)
-#
-# Ticket 992 Regression992 test
-#
-SET(regression992_SRCS regression992.cpp ${util_SRCS})
-SET(regression992_MOC_CPPS regression992.cpp)
-QT4_WRAP_CPP(regression992_MOC_SRCS ${regression992_MOC_CPPS})
-ADD_CUSTOM_TARGET(regression992moc ALL DEPENDS ${regression992_MOC_SRCS})
-ADD_EXECUTABLE(regression992 ${regression992_SRCS})
-ADD_DEPENDENCIES(regression992 regression992moc)
-TARGET_LINK_LIBRARIES(regression992 ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(regression992
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
-# For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS regression992 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(regression992 ${CMAKE_INSTALL_PREFIX}/regression992)
-ELSE (APPLE)
- INSTALL(TARGETS regression992 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(regression992 ${CMAKE_INSTALL_PREFIX}/bin/regression992)
-ENDIF (APPLE)
-#
-# Ticket 1141 Regression1141 test
-#
-SET(regression1141_SRCS regression1141.cpp ${util_SRCS})
-SET(regression1141_MOC_CPPS regression1141.cpp)
-QT4_WRAP_CPP(regression1141_MOC_SRCS ${regression1141_MOC_CPPS})
-ADD_CUSTOM_TARGET(regression1141moc ALL DEPENDS ${regression1141_MOC_SRCS})
-ADD_EXECUTABLE(regression1141 ${regression1141_SRCS})
-ADD_DEPENDENCIES(regression1141 regression1141moc)
-TARGET_LINK_LIBRARIES(regression1141 ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(regression1141
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
-# For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS regression1141 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(regression1141 ${CMAKE_INSTALL_PREFIX}/regression1141)
-ELSE (APPLE)
- INSTALL(TARGETS regression1141 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(regression1141 ${CMAKE_INSTALL_PREFIX}/bin/regression1141)
-ENDIF (APPLE)
-#
-# QgsRasterLayer test
-#
-SET(qgis_rasterlayertest_SRCS testqgsrasterlayer.cpp ${util_SRCS})
-SET(qgis_rasterlayertest_MOC_CPPS testqgsrasterlayer.cpp)
-QT4_WRAP_CPP(qgis_rasterlayertest_MOC_SRCS ${qgis_rasterlayertest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_rasterlayertestmoc ALL DEPENDS ${qgis_rasterlayertest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_rasterlayertest ${qgis_rasterlayertest_SRCS})
-ADD_DEPENDENCIES(qgis_rasterlayertest qgis_rasterlayertestmoc)
-TARGET_LINK_LIBRARIES(qgis_rasterlayertest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_rasterlayertest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- ADD_TEST(qgis_rasterlayertest ${CMAKE_INSTALL_PREFIX}/qgis_rasterlayertest)
- INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
-ELSE (APPLE)
- ADD_TEST(qgis_rasterlayertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_rasterlayertest)
- INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-ENDIF (APPLE)
-#
-# Contrast Enhancements Test
-#
-SET(qgis_contrastenhancementtest_SRCS testcontrastenhancements.cpp)
-SET(qgis_contrastenhancementtest_MOC_CPPS testcontrastenhancements.cpp)
-QT4_WRAP_CPP(qgis_contrastenhancementtest_MOC_SRCS ${qgis_contrastenhancementtest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_contrastenhancementtestmoc ALL DEPENDS ${qgis_contrastenhancementtest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_contrastenhancementtest ${qgis_contrastenhancementtest_SRCS})
-ADD_DEPENDENCIES(qgis_contrastenhancementtest qgis_contrastenhancementtestmoc)
-TARGET_LINK_LIBRARIES(qgis_contrastenhancementtest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_contrastenhancementtest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- ADD_TEST(qgis_contrastenhancementtest ${CMAKE_INSTALL_PREFIX}/qgis_contrastenhancementtest)
- INSTALL(TARGETS qgis_contrastenhancementtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
-ELSE (APPLE)
- ADD_TEST(qgis_contrastenhancementtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_contrastenhancementtest)
- INSTALL(TARGETS qgis_contrastenhancementtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-ENDIF (APPLE)
-#
-# QgsMapLayer test
-#
-SET(qgis_maplayertest_SRCS testqgsmaplayer.cpp ${util_SRCS})
-SET(qgis_maplayertest_MOC_CPPS testqgsmaplayer.cpp)
-QT4_WRAP_CPP(qgis_maplayertest_MOC_SRCS ${qgis_maplayertest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_maplayertestmoc ALL DEPENDS ${qgis_maplayertest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_maplayertest ${qgis_maplayertest_SRCS})
-ADD_DEPENDENCIES(qgis_maplayertest qgis_maplayertestmoc)
-TARGET_LINK_LIBRARIES(qgis_maplayertest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_maplayertest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_maplayertest ${CMAKE_INSTALL_PREFIX}/qgis_maplayertest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_maplayertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_maplayertest)
-ENDIF (APPLE)
-#
-# Qgs Renderers test (qsinglesymbol renderer etc)
-#
-SET(qgis_rendererstest_SRCS testqgsrenderers.cpp ${util_SRCS})
-SET(qgis_rendererstest_MOC_CPPS testqgsrenderers.cpp)
-QT4_WRAP_CPP(qgis_rendererstest_MOC_SRCS ${qgis_rendererstest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_rendererstestmoc ALL DEPENDS ${qgis_rendererstest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_rendererstest ${qgis_rendererstest_SRCS})
-ADD_DEPENDENCIES(qgis_rendererstest qgis_rendererstestmoc)
-TARGET_LINK_LIBRARIES(qgis_rendererstest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_rendererstest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_rendererstest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_rendererstest ${CMAKE_INSTALL_PREFIX}/qgis_rendererstest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_rendererstest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_rendererstest ${CMAKE_INSTALL_PREFIX}/bin/qgis_rendererstest)
-ENDIF (APPLE)
-#
-# QgsMapRenderer test
-#
-SET(qgis_maprenderertest_SRCS testqgsmaprenderer.cpp ${util_SRCS})
-SET(qgis_maprenderertest_MOC_CPPS testqgsmaprenderer.cpp)
-QT4_WRAP_CPP(qgis_maprenderertest_MOC_SRCS ${qgis_maprenderertest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_maprenderertestmoc ALL DEPENDS ${qgis_maprenderertest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_maprenderertest ${qgis_maprenderertest_SRCS})
-ADD_DEPENDENCIES(qgis_maprenderertest qgis_maprenderertestmoc)
-TARGET_LINK_LIBRARIES(qgis_maprenderertest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_maprenderertest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_maprenderertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_maprenderertest ${CMAKE_INSTALL_PREFIX}/qgis_maprenderertest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_maprenderertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_maprenderertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_maprenderertest)
-ENDIF (APPLE)
-#
-# QgsGeometry test
-#
-SET(qgis_geometrytest_SRCS testqgsgeometry.cpp ${util_SRCS})
-SET(qgis_geometrytest_MOC_CPPS testqgsgeometry.cpp)
-QT4_WRAP_CPP(qgis_geometrytest_MOC_SRCS ${qgis_geometrytest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_geometrytestmoc ALL DEPENDS ${qgis_geometrytest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_geometrytest ${qgis_geometrytest_SRCS})
-ADD_DEPENDENCIES(qgis_geometrytest qgis_geometrytestmoc)
-TARGET_LINK_LIBRARIES(qgis_geometrytest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_geometrytest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_geometrytest ${CMAKE_INSTALL_PREFIX}/qgis_geometrytest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_geometrytest ${CMAKE_INSTALL_PREFIX}/bin/qgis_geometrytest)
-ENDIF (APPLE)
+#############################################################
+# Tests:
-
-#
-# testqgscoordinatereferencesystem
-#
-SET(qgis_coordinatereferencesystemtest_SRCS testqgscoordinatereferencesystem.cpp ${util_SRCS})
-SET(qgis_coordinatereferencesystemtest_MOC_CPPS testqgscoordinatereferencesystem.cpp)
-QT4_WRAP_CPP(qgis_coordinatereferencesystemtest_MOC_SRCS ${qgis_coordinatereferencesystemtest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_coordinatereferencesystemtestmoc ALL DEPENDS ${qgis_coordinatereferencesystemtest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_coordinatereferencesystemtest ${qgis_coordinatereferencesystemtest_SRCS})
-ADD_DEPENDENCIES(qgis_coordinatereferencesystemtest qgis_coordinatereferencesystemtestmoc)
-TARGET_LINK_LIBRARIES(qgis_coordinatereferencesystemtest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_coordinatereferencesystemtest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_coordinatereferencesystemtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_coordinatereferencesystemtest ${CMAKE_INSTALL_PREFIX}/qgis_coordinatereferencesystemtest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_coordinatereferencesystemtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_coordinatereferencesystemtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_coordinatereferencesystemtest)
-ENDIF (APPLE)
-
-#
-# testqgspoint
-#
-SET(qgis_pointtest_SRCS testqgspoint.cpp ${util_SRCS})
-SET(qgis_pointtest_MOC_CPPS testqgspoint.cpp)
-QT4_WRAP_CPP(qgis_pointtest_MOC_SRCS ${qgis_pointtest_MOC_CPPS})
-ADD_CUSTOM_TARGET(qgis_pointtestmoc ALL DEPENDS ${qgis_pointtest_MOC_SRCS})
-ADD_EXECUTABLE(qgis_pointtest ${qgis_pointtest_SRCS})
-ADD_DEPENDENCIES(qgis_pointtest qgis_pointtestmoc)
-TARGET_LINK_LIBRARIES(qgis_pointtest ${QT_LIBRARIES} qgis_core)
-SET_TARGET_PROPERTIES(qgis_pointtest
- PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
- INSTALL_RPATH_USE_LINK_PATH true)
-IF (APPLE)
- # For Mac OS X, the executable must be at the root of the bundle's executable folder
- INSTALL(TARGETS qgis_pointtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
- ADD_TEST(qgis_pointtest ${CMAKE_INSTALL_PREFIX}/qgis_pointtest)
-ELSE (APPLE)
- INSTALL(TARGETS qgis_pointtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
- ADD_TEST(qgis_pointtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_pointtest)
-ENDIF (APPLE)
-
+ADD_QGIS_TEST(applicationtest testqgsapplication.cpp)
+ADD_QGIS_TEST(filewritertest testqgsvectorfilewriter.cpp)
+ADD_QGIS_TEST(regression992 regression992.cpp)
+ADD_QGIS_TEST(regression1141 regression1141.cpp)
+ADD_QGIS_TEST(rasterlayertest testqgsrasterlayer.cpp)
+ADD_QGIS_TEST(contrastenhancementtest testcontrastenhancements.cpp)
+ADD_QGIS_TEST(maplayertest testqgsmaplayer.cpp)
+ADD_QGIS_TEST(rendererstest testqgsrenderers.cpp)
+ADD_QGIS_TEST(maprenderertest testqgsmaprenderer.cpp)
+ADD_QGIS_TEST(geometrytest testqgsgeometry.cpp)
+ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp)
+ADD_QGIS_TEST(pointtest testqgspoint.cpp)
Modified: trunk/qgis/tests/src/core/testqgspoint.cpp
===================================================================
--- trunk/qgis/tests/src/core/testqgspoint.cpp 2009-11-14 16:24:49 UTC (rev 12104)
+++ trunk/qgis/tests/src/core/testqgspoint.cpp 2009-11-14 17:11:45 UTC (rev 12105)
@@ -112,7 +112,7 @@
mReport += "<p>" + mPoint2.toDegreesMinutesSeconds( 2 ) + "</p>";
mReport += "<p>" + mPoint3.toDegreesMinutesSeconds( 2 ) + "</p>";
mReport += "<p>" + mPoint4.toDegreesMinutesSeconds( 2 ) + "</p>";
- QVERIFY( mPoint4.toString( 2 ) == QString("80°0'0.00\"E,20°0'0.00\"N") );
+ QVERIFY( mPoint4.toDegreesMinutesSeconds( 2 ) == QString("80°0'0.00\"E,20°0'0.00\"N") );
};
void TestQgsPoint::wellKnownText()
More information about the QGIS-commit
mailing list