Skip to content

Commit d5a4eca

Browse files
author
wonder
committed
Created a macro ADD_QGIS_TEST to make adding new tests easier.
(+ nearly fixed QgsPoint test) git-svn-id: http://svn.osgeo.org/qgis/trunk@12105 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cab8420 commit d5a4eca

File tree

2 files changed

+47
-276
lines changed

2 files changed

+47
-276
lines changed

‎tests/src/core/CMakeLists.txt‎

Lines changed: 46 additions & 275 deletions
Original file line numberDiff line numberDiff line change
@@ -63,281 +63,52 @@ ENDIF (APPLE)
6363
#directly included in the sources
6464
#and should not be compiled twice. Trying to include
6565
#them in will cause an error at build time
66-
#############################################################
67-
# Tests:
68-
69-
#
70-
# QgsApplication test
71-
#
72-
SET(qgis_applicationtest_SRCS testqgsapplication.cpp ${util_SRCS})
73-
SET(qgis_applicationtest_MOC_CPPS testqgsapplication.cpp)
74-
QT4_WRAP_CPP(qgis_applicationtest_MOC_SRCS ${qgis_applicationtest_MOC_CPPS})
75-
ADD_CUSTOM_TARGET(qgis_applicationtestmoc ALL DEPENDS ${qgis_applicationtest_MOC_SRCS})
76-
ADD_EXECUTABLE(qgis_applicationtest ${qgis_applicationtest_SRCS})
77-
ADD_DEPENDENCIES(qgis_applicationtest qgis_applicationtestmoc)
78-
TARGET_LINK_LIBRARIES(qgis_applicationtest ${QT_LIBRARIES} qgis_core)
79-
#No relinking and full RPATH for the install tree
80-
#See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree
81-
SET_TARGET_PROPERTIES(qgis_applicationtest
82-
# skip the full RPATH for the build tree
83-
PROPERTIES SKIP_BUILD_RPATH TRUE
84-
)
85-
SET_TARGET_PROPERTIES(qgis_applicationtest
86-
# when building, use the install RPATH already
87-
# (so it doesn't need to relink when installing)
88-
PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE
89-
)
90-
SET_TARGET_PROPERTIES(qgis_applicationtest
91-
# the RPATH to be used when installing
92-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
93-
)
94-
SET_TARGET_PROPERTIES(qgis_applicationtest
95-
# add the automatically determined parts of the RPATH
96-
# which point to directories outside the build tree to the install RPATH
97-
PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
98-
)
99-
IF (APPLE)
100-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
101-
INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
102-
ADD_TEST(qgis_applicationtest ${CMAKE_INSTALL_PREFIX}/qgis_applicationtest)
103-
ELSE (APPLE)
104-
INSTALL(TARGETS qgis_applicationtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
105-
ADD_TEST(qgis_applicationtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_applicationtest)
106-
ENDIF (APPLE)
107-
#
108-
# QgsFileWriter test
109-
#
110-
SET(qgis_filewritertest_SRCS testqgsvectorfilewriter.cpp ${util_SRCS})
111-
SET(qgis_filewritertest_MOC_CPPS testqgsvectorfilewriter.cpp)
112-
QT4_WRAP_CPP(qgis_filewritertest_MOC_SRCS ${qgis_filewritertest_MOC_CPPS})
113-
ADD_CUSTOM_TARGET(qgis_filewritertestmoc ALL DEPENDS ${qgis_filewritertest_MOC_SRCS})
114-
ADD_EXECUTABLE(qgis_filewritertest ${qgis_filewritertest_SRCS})
115-
ADD_DEPENDENCIES(qgis_filewritertest qgis_filewritertestmoc)
116-
TARGET_LINK_LIBRARIES(qgis_filewritertest ${QT_LIBRARIES} qgis_core)
117-
SET_TARGET_PROPERTIES(qgis_filewritertest
118-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
119-
INSTALL_RPATH_USE_LINK_PATH true)
120-
IF (APPLE)
121-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
122-
INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
123-
ADD_TEST(qgis_filewritertest ${CMAKE_INSTALL_PREFIX}/qgis_filewritertest)
124-
ELSE (APPLE)
125-
INSTALL(TARGETS qgis_filewritertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
126-
ADD_TEST(qgis_filewritertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_filewritertest)
127-
ENDIF (APPLE)
128-
129-
130-
#
131-
# Ticket 992 Regression992 test
132-
#
133-
SET(regression992_SRCS regression992.cpp ${util_SRCS})
134-
SET(regression992_MOC_CPPS regression992.cpp)
135-
QT4_WRAP_CPP(regression992_MOC_SRCS ${regression992_MOC_CPPS})
136-
ADD_CUSTOM_TARGET(regression992moc ALL DEPENDS ${regression992_MOC_SRCS})
137-
ADD_EXECUTABLE(regression992 ${regression992_SRCS})
138-
ADD_DEPENDENCIES(regression992 regression992moc)
139-
TARGET_LINK_LIBRARIES(regression992 ${QT_LIBRARIES} qgis_core)
140-
SET_TARGET_PROPERTIES(regression992
141-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
142-
INSTALL_RPATH_USE_LINK_PATH true)
143-
IF (APPLE)
144-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
145-
INSTALL(TARGETS regression992 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
146-
ADD_TEST(regression992 ${CMAKE_INSTALL_PREFIX}/regression992)
147-
ELSE (APPLE)
148-
INSTALL(TARGETS regression992 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
149-
ADD_TEST(regression992 ${CMAKE_INSTALL_PREFIX}/bin/regression992)
150-
ENDIF (APPLE)
151-
#
152-
# Ticket 1141 Regression1141 test
153-
#
154-
SET(regression1141_SRCS regression1141.cpp ${util_SRCS})
155-
SET(regression1141_MOC_CPPS regression1141.cpp)
156-
QT4_WRAP_CPP(regression1141_MOC_SRCS ${regression1141_MOC_CPPS})
157-
ADD_CUSTOM_TARGET(regression1141moc ALL DEPENDS ${regression1141_MOC_SRCS})
158-
ADD_EXECUTABLE(regression1141 ${regression1141_SRCS})
159-
ADD_DEPENDENCIES(regression1141 regression1141moc)
160-
TARGET_LINK_LIBRARIES(regression1141 ${QT_LIBRARIES} qgis_core)
161-
SET_TARGET_PROPERTIES(regression1141
162-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
163-
INSTALL_RPATH_USE_LINK_PATH true)
164-
IF (APPLE)
165-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
166-
INSTALL(TARGETS regression1141 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
167-
ADD_TEST(regression1141 ${CMAKE_INSTALL_PREFIX}/regression1141)
168-
ELSE (APPLE)
169-
INSTALL(TARGETS regression1141 RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
170-
ADD_TEST(regression1141 ${CMAKE_INSTALL_PREFIX}/bin/regression1141)
171-
ENDIF (APPLE)
172-
#
173-
# QgsRasterLayer test
174-
#
175-
SET(qgis_rasterlayertest_SRCS testqgsrasterlayer.cpp ${util_SRCS})
176-
SET(qgis_rasterlayertest_MOC_CPPS testqgsrasterlayer.cpp)
177-
QT4_WRAP_CPP(qgis_rasterlayertest_MOC_SRCS ${qgis_rasterlayertest_MOC_CPPS})
178-
ADD_CUSTOM_TARGET(qgis_rasterlayertestmoc ALL DEPENDS ${qgis_rasterlayertest_MOC_SRCS})
179-
ADD_EXECUTABLE(qgis_rasterlayertest ${qgis_rasterlayertest_SRCS})
180-
ADD_DEPENDENCIES(qgis_rasterlayertest qgis_rasterlayertestmoc)
181-
TARGET_LINK_LIBRARIES(qgis_rasterlayertest ${QT_LIBRARIES} qgis_core)
182-
SET_TARGET_PROPERTIES(qgis_rasterlayertest
183-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
184-
INSTALL_RPATH_USE_LINK_PATH true)
185-
IF (APPLE)
186-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
187-
ADD_TEST(qgis_rasterlayertest ${CMAKE_INSTALL_PREFIX}/qgis_rasterlayertest)
188-
INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
189-
ELSE (APPLE)
190-
ADD_TEST(qgis_rasterlayertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_rasterlayertest)
191-
INSTALL(TARGETS qgis_rasterlayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
192-
ENDIF (APPLE)
193-
#
194-
# Contrast Enhancements Test
195-
#
196-
SET(qgis_contrastenhancementtest_SRCS testcontrastenhancements.cpp)
197-
SET(qgis_contrastenhancementtest_MOC_CPPS testcontrastenhancements.cpp)
198-
QT4_WRAP_CPP(qgis_contrastenhancementtest_MOC_SRCS ${qgis_contrastenhancementtest_MOC_CPPS})
199-
ADD_CUSTOM_TARGET(qgis_contrastenhancementtestmoc ALL DEPENDS ${qgis_contrastenhancementtest_MOC_SRCS})
200-
ADD_EXECUTABLE(qgis_contrastenhancementtest ${qgis_contrastenhancementtest_SRCS})
201-
ADD_DEPENDENCIES(qgis_contrastenhancementtest qgis_contrastenhancementtestmoc)
202-
TARGET_LINK_LIBRARIES(qgis_contrastenhancementtest ${QT_LIBRARIES} qgis_core)
203-
SET_TARGET_PROPERTIES(qgis_contrastenhancementtest
204-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
205-
INSTALL_RPATH_USE_LINK_PATH true)
206-
IF (APPLE)
207-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
208-
ADD_TEST(qgis_contrastenhancementtest ${CMAKE_INSTALL_PREFIX}/qgis_contrastenhancementtest)
209-
INSTALL(TARGETS qgis_contrastenhancementtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
210-
ELSE (APPLE)
211-
ADD_TEST(qgis_contrastenhancementtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_contrastenhancementtest)
212-
INSTALL(TARGETS qgis_contrastenhancementtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
213-
ENDIF (APPLE)
214-
#
215-
# QgsMapLayer test
216-
#
217-
SET(qgis_maplayertest_SRCS testqgsmaplayer.cpp ${util_SRCS})
218-
SET(qgis_maplayertest_MOC_CPPS testqgsmaplayer.cpp)
219-
QT4_WRAP_CPP(qgis_maplayertest_MOC_SRCS ${qgis_maplayertest_MOC_CPPS})
220-
ADD_CUSTOM_TARGET(qgis_maplayertestmoc ALL DEPENDS ${qgis_maplayertest_MOC_SRCS})
221-
ADD_EXECUTABLE(qgis_maplayertest ${qgis_maplayertest_SRCS})
222-
ADD_DEPENDENCIES(qgis_maplayertest qgis_maplayertestmoc)
223-
TARGET_LINK_LIBRARIES(qgis_maplayertest ${QT_LIBRARIES} qgis_core)
224-
SET_TARGET_PROPERTIES(qgis_maplayertest
225-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
226-
INSTALL_RPATH_USE_LINK_PATH true)
227-
IF (APPLE)
228-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
229-
INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
230-
ADD_TEST(qgis_maplayertest ${CMAKE_INSTALL_PREFIX}/qgis_maplayertest)
231-
ELSE (APPLE)
232-
INSTALL(TARGETS qgis_maplayertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
233-
ADD_TEST(qgis_maplayertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_maplayertest)
234-
ENDIF (APPLE)
235-
#
236-
# Qgs Renderers test (qsinglesymbol renderer etc)
237-
#
238-
SET(qgis_rendererstest_SRCS testqgsrenderers.cpp ${util_SRCS})
239-
SET(qgis_rendererstest_MOC_CPPS testqgsrenderers.cpp)
240-
QT4_WRAP_CPP(qgis_rendererstest_MOC_SRCS ${qgis_rendererstest_MOC_CPPS})
241-
ADD_CUSTOM_TARGET(qgis_rendererstestmoc ALL DEPENDS ${qgis_rendererstest_MOC_SRCS})
242-
ADD_EXECUTABLE(qgis_rendererstest ${qgis_rendererstest_SRCS})
243-
ADD_DEPENDENCIES(qgis_rendererstest qgis_rendererstestmoc)
244-
TARGET_LINK_LIBRARIES(qgis_rendererstest ${QT_LIBRARIES} qgis_core)
245-
SET_TARGET_PROPERTIES(qgis_rendererstest
246-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
247-
INSTALL_RPATH_USE_LINK_PATH true)
248-
IF (APPLE)
249-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
250-
INSTALL(TARGETS qgis_rendererstest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
251-
ADD_TEST(qgis_rendererstest ${CMAKE_INSTALL_PREFIX}/qgis_rendererstest)
252-
ELSE (APPLE)
253-
INSTALL(TARGETS qgis_rendererstest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
254-
ADD_TEST(qgis_rendererstest ${CMAKE_INSTALL_PREFIX}/bin/qgis_rendererstest)
255-
ENDIF (APPLE)
256-
#
257-
# QgsMapRenderer test
258-
#
259-
SET(qgis_maprenderertest_SRCS testqgsmaprenderer.cpp ${util_SRCS})
260-
SET(qgis_maprenderertest_MOC_CPPS testqgsmaprenderer.cpp)
261-
QT4_WRAP_CPP(qgis_maprenderertest_MOC_SRCS ${qgis_maprenderertest_MOC_CPPS})
262-
ADD_CUSTOM_TARGET(qgis_maprenderertestmoc ALL DEPENDS ${qgis_maprenderertest_MOC_SRCS})
263-
ADD_EXECUTABLE(qgis_maprenderertest ${qgis_maprenderertest_SRCS})
264-
ADD_DEPENDENCIES(qgis_maprenderertest qgis_maprenderertestmoc)
265-
TARGET_LINK_LIBRARIES(qgis_maprenderertest ${QT_LIBRARIES} qgis_core)
266-
SET_TARGET_PROPERTIES(qgis_maprenderertest
267-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
268-
INSTALL_RPATH_USE_LINK_PATH true)
269-
IF (APPLE)
270-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
271-
INSTALL(TARGETS qgis_maprenderertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
272-
ADD_TEST(qgis_maprenderertest ${CMAKE_INSTALL_PREFIX}/qgis_maprenderertest)
273-
ELSE (APPLE)
274-
INSTALL(TARGETS qgis_maprenderertest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
275-
ADD_TEST(qgis_maprenderertest ${CMAKE_INSTALL_PREFIX}/bin/qgis_maprenderertest)
276-
ENDIF (APPLE)
277-
#
278-
# QgsGeometry test
279-
#
280-
SET(qgis_geometrytest_SRCS testqgsgeometry.cpp ${util_SRCS})
281-
SET(qgis_geometrytest_MOC_CPPS testqgsgeometry.cpp)
282-
QT4_WRAP_CPP(qgis_geometrytest_MOC_SRCS ${qgis_geometrytest_MOC_CPPS})
283-
ADD_CUSTOM_TARGET(qgis_geometrytestmoc ALL DEPENDS ${qgis_geometrytest_MOC_SRCS})
284-
ADD_EXECUTABLE(qgis_geometrytest ${qgis_geometrytest_SRCS})
285-
ADD_DEPENDENCIES(qgis_geometrytest qgis_geometrytestmoc)
286-
TARGET_LINK_LIBRARIES(qgis_geometrytest ${QT_LIBRARIES} qgis_core)
287-
SET_TARGET_PROPERTIES(qgis_geometrytest
288-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
289-
INSTALL_RPATH_USE_LINK_PATH true)
290-
IF (APPLE)
291-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
292-
INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
293-
ADD_TEST(qgis_geometrytest ${CMAKE_INSTALL_PREFIX}/qgis_geometrytest)
294-
ELSE (APPLE)
295-
INSTALL(TARGETS qgis_geometrytest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
296-
ADD_TEST(qgis_geometrytest ${CMAKE_INSTALL_PREFIX}/bin/qgis_geometrytest)
297-
ENDIF (APPLE)
298-
29966
300-
#
301-
# testqgscoordinatereferencesystem
302-
#
303-
SET(qgis_coordinatereferencesystemtest_SRCS testqgscoordinatereferencesystem.cpp ${util_SRCS})
304-
SET(qgis_coordinatereferencesystemtest_MOC_CPPS testqgscoordinatereferencesystem.cpp)
305-
QT4_WRAP_CPP(qgis_coordinatereferencesystemtest_MOC_SRCS ${qgis_coordinatereferencesystemtest_MOC_CPPS})
306-
ADD_CUSTOM_TARGET(qgis_coordinatereferencesystemtestmoc ALL DEPENDS ${qgis_coordinatereferencesystemtest_MOC_SRCS})
307-
ADD_EXECUTABLE(qgis_coordinatereferencesystemtest ${qgis_coordinatereferencesystemtest_SRCS})
308-
ADD_DEPENDENCIES(qgis_coordinatereferencesystemtest qgis_coordinatereferencesystemtestmoc)
309-
TARGET_LINK_LIBRARIES(qgis_coordinatereferencesystemtest ${QT_LIBRARIES} qgis_core)
310-
SET_TARGET_PROPERTIES(qgis_coordinatereferencesystemtest
311-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
312-
INSTALL_RPATH_USE_LINK_PATH true)
313-
IF (APPLE)
314-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
315-
INSTALL(TARGETS qgis_coordinatereferencesystemtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
316-
ADD_TEST(qgis_coordinatereferencesystemtest ${CMAKE_INSTALL_PREFIX}/qgis_coordinatereferencesystemtest)
317-
ELSE (APPLE)
318-
INSTALL(TARGETS qgis_coordinatereferencesystemtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
319-
ADD_TEST(qgis_coordinatereferencesystemtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_coordinatereferencesystemtest)
320-
ENDIF (APPLE)
67+
#No relinking and full RPATH for the install tree
68+
#See: http://www.cmake.org/Wiki/CMake_RPATH_handling#No_relinking_and_full_RPATH_for_the_install_tree
69+
70+
MACRO (ADD_QGIS_TEST testname testsrc)
71+
SET(qgis_${testname}_SRCS ${testsrc} ${util_SRCS})
72+
SET(qgis_${testname}_MOC_CPPS ${testsrc})
73+
QT4_WRAP_CPP(qgis_${testname}_MOC_SRCS ${qgis_${testname}_MOC_CPPS})
74+
ADD_CUSTOM_TARGET(qgis_${testname}moc ALL DEPENDS ${qgis_${testname}_MOC_SRCS})
75+
ADD_EXECUTABLE(qgis_${testname} ${qgis_${testname}_SRCS})
76+
ADD_DEPENDENCIES(qgis_${testname} qgis_${testname}moc)
77+
TARGET_LINK_LIBRARIES(qgis_${testname} ${QT_LIBRARIES} qgis_core)
78+
SET_TARGET_PROPERTIES(qgis_${testname}
79+
PROPERTIES
80+
# skip the full RPATH for the build tree
81+
SKIP_BUILD_RPATH TRUE
82+
# when building, use the install RPATH already
83+
# (so it doesn't need to relink when installing)
84+
BUILD_WITH_INSTALL_RPATH TRUE
85+
# the RPATH to be used when installing
86+
INSTALL_RPATH ${QGIS_LIB_DIR}
87+
# add the automatically determined parts of the RPATH
88+
# which point to directories outside the build tree to the install RPATH
89+
INSTALL_RPATH_USE_LINK_PATH true)
90+
IF (APPLE)
91+
# For Mac OS X, the executable must be at the root of the bundle's executable folder
92+
INSTALL(TARGETS qgis_${testname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
93+
ADD_TEST(qgis_${testname} ${CMAKE_INSTALL_PREFIX}/qgis_${testname})
94+
ELSE (APPLE)
95+
INSTALL(TARGETS qgis_${testname} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
96+
ADD_TEST(qgis_${testname} ${CMAKE_INSTALL_PREFIX}/bin/qgis_${testname})
97+
ENDIF (APPLE)
98+
ENDMACRO (ADD_QGIS_TEST)
32199
322-
#
323-
# testqgspoint
324-
#
325-
SET(qgis_pointtest_SRCS testqgspoint.cpp ${util_SRCS})
326-
SET(qgis_pointtest_MOC_CPPS testqgspoint.cpp)
327-
QT4_WRAP_CPP(qgis_pointtest_MOC_SRCS ${qgis_pointtest_MOC_CPPS})
328-
ADD_CUSTOM_TARGET(qgis_pointtestmoc ALL DEPENDS ${qgis_pointtest_MOC_SRCS})
329-
ADD_EXECUTABLE(qgis_pointtest ${qgis_pointtest_SRCS})
330-
ADD_DEPENDENCIES(qgis_pointtest qgis_pointtestmoc)
331-
TARGET_LINK_LIBRARIES(qgis_pointtest ${QT_LIBRARIES} qgis_core)
332-
SET_TARGET_PROPERTIES(qgis_pointtest
333-
PROPERTIES INSTALL_RPATH ${QGIS_LIB_DIR}
334-
INSTALL_RPATH_USE_LINK_PATH true)
335-
IF (APPLE)
336-
# For Mac OS X, the executable must be at the root of the bundle's executable folder
337-
INSTALL(TARGETS qgis_pointtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
338-
ADD_TEST(qgis_pointtest ${CMAKE_INSTALL_PREFIX}/qgis_pointtest)
339-
ELSE (APPLE)
340-
INSTALL(TARGETS qgis_pointtest RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
341-
ADD_TEST(qgis_pointtest ${CMAKE_INSTALL_PREFIX}/bin/qgis_pointtest)
342-
ENDIF (APPLE)
100+
#############################################################
101+
# Tests:
343102
103+
ADD_QGIS_TEST(applicationtest testqgsapplication.cpp)
104+
ADD_QGIS_TEST(filewritertest testqgsvectorfilewriter.cpp)
105+
ADD_QGIS_TEST(regression992 regression992.cpp)
106+
ADD_QGIS_TEST(regression1141 regression1141.cpp)
107+
ADD_QGIS_TEST(rasterlayertest testqgsrasterlayer.cpp)
108+
ADD_QGIS_TEST(contrastenhancementtest testcontrastenhancements.cpp)
109+
ADD_QGIS_TEST(maplayertest testqgsmaplayer.cpp)
110+
ADD_QGIS_TEST(rendererstest testqgsrenderers.cpp)
111+
ADD_QGIS_TEST(maprenderertest testqgsmaprenderer.cpp)
112+
ADD_QGIS_TEST(geometrytest testqgsgeometry.cpp)
113+
ADD_QGIS_TEST(coordinatereferencesystemtest testqgscoordinatereferencesystem.cpp)
114+
ADD_QGIS_TEST(pointtest testqgspoint.cpp)

‎tests/src/core/testqgspoint.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ void TestQgsPoint::toDegreesMinutesSeconds()
112112
mReport += "<p>" + mPoint2.toDegreesMinutesSeconds( 2 ) + "</p>";
113113
mReport += "<p>" + mPoint3.toDegreesMinutesSeconds( 2 ) + "</p>";
114114
mReport += "<p>" + mPoint4.toDegreesMinutesSeconds( 2 ) + "</p>";
115-
QVERIFY( mPoint4.toString( 2 ) == QString("80°0'0.00\"E,20°0'0.00\"N") );
115+
QVERIFY( mPoint4.toDegreesMinutesSeconds( 2 ) == QString("80°0'0.00\"E,20°0'0.00\"N") );
116116

117117
};
118118
void TestQgsPoint::wellKnownText()

0 commit comments

Comments
 (0)