Rename tests and examples to be consistent with the naming rules

xml test results is now generated out of source


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/add_test_windows@2364 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: ae2dd1592b63f4e7da5e17655761697b6daf7dd0

3 files changed, 45 insertions, 43 deletions

diff --git a/src/Rips_complex/doc/Intro_rips_complex.h b/src/Rips_complex/doc/Intro_rips_complex.h
index 8e374c09..124dfec9 100644
--- a/src/Rips_complex/doc/Intro_rips_complex.h
+++ b/src/Rips_complex/doc/Intro_rips_complex.h
@@ -77,7 +77,7 @@ namespace rips_complex {
  * When launching (Rips maximal distance between 2 points is 12.0, is expanded until dimension 1 - one skeleton graph
  * in other words):
  * 
- * \code $> ./oneskeletonripspoints
+ * \code $> ./Rips_complex_example_one_skeleton_from_points
  * \endcode
  *
  * the program output is:
@@ -97,7 +97,7 @@ namespace rips_complex {
  * 
  * When launching:
  * 
- * \code $> ./ripsoffreader ../../data/points/alphacomplexdoc.off 12.0 3
+ * \code $> ./Rips_complex_example_from_off ../../data/points/alphacomplexdoc.off 12.0 3
  * \endcode
  *
  * the program output is:
@@ -120,7 +120,7 @@ namespace rips_complex {
  * When launching (Rips maximal distance between 2 points is 1.0, is expanded until dimension 1 - one skeleton graph
  * with other words):
  * 
- * \code $> ./oneskeletonripsdistance
+ * \code $> ./Rips_complex_example_one_skeleton_from_distance_matrix
  * \endcode
  *
  * the program output is:
@@ -139,7 +139,7 @@ namespace rips_complex {
  * 
  * When launching:
  * 
- * \code $> ./ripscsvdistancereader ../../data/distance_matrix/full_square_distance_matrix.csv 1.0 3
+ * \code $> ./Rips_complex_example_from_csv_distance_matrix ../../data/distance_matrix/full_square_distance_matrix.csv 1.0 3
  * \endcode
  *
  * the program output is:
diff --git a/src/Rips_complex/example/CMakeLists.txt b/src/Rips_complex/example/CMakeLists.txt
index 070ac710..8aee79e2 100644
--- a/src/Rips_complex/example/CMakeLists.txt
+++ b/src/Rips_complex/example/CMakeLists.txt
@@ -2,37 +2,40 @@ cmake_minimum_required(VERSION 2.6)
 project(Rips_complex_examples)
 
 # Point cloud
-add_executable ( ripsoffreader example_rips_complex_from_off_file.cpp )
-target_link_libraries(ripsoffreader  ${Boost_SYSTEM_LIBRARY})
+add_executable ( Rips_complex_example_from_off example_rips_complex_from_off_file.cpp )
+target_link_libraries(Rips_complex_example_from_off  ${Boost_SYSTEM_LIBRARY})
 
-add_executable ( oneskeletonripspoints example_one_skeleton_rips_from_points.cpp )
-target_link_libraries(oneskeletonripspoints  ${Boost_SYSTEM_LIBRARY})
+add_executable ( Rips_complex_example_one_skeleton_from_points example_one_skeleton_rips_from_points.cpp )
+target_link_libraries(Rips_complex_example_one_skeleton_from_points  ${Boost_SYSTEM_LIBRARY})
 
 # Distance matrix
-add_executable ( oneskeletonripsdistance example_one_skeleton_rips_from_distance_matrix.cpp )
-target_link_libraries(oneskeletonripsdistance  ${Boost_SYSTEM_LIBRARY})
+add_executable ( Rips_complex_example_one_skeleton_from_distance_matrix example_one_skeleton_rips_from_distance_matrix.cpp )
+target_link_libraries(Rips_complex_example_one_skeleton_from_distance_matrix  ${Boost_SYSTEM_LIBRARY})
 
-add_executable ( ripscsvdistancereader example_rips_complex_from_csv_distance_matrix_file.cpp )
-target_link_libraries(ripscsvdistancereader  ${Boost_SYSTEM_LIBRARY})
+add_executable ( Rips_complex_example_from_csv_distance_matrix example_rips_complex_from_csv_distance_matrix_file.cpp )
+target_link_libraries(Rips_complex_example_from_csv_distance_matrix  ${Boost_SYSTEM_LIBRARY})
 
 if (TBB_FOUND)
-  target_link_libraries(ripsoffreader ${TBB_LIBRARIES})
-  target_link_libraries(oneskeletonripspoints ${TBB_LIBRARIES})
-  target_link_libraries(oneskeletonripsdistance ${TBB_LIBRARIES})
-  target_link_libraries(ripscsvdistancereader ${TBB_LIBRARIES})
+  target_link_libraries(Rips_complex_example_from_off ${TBB_LIBRARIES})
+  target_link_libraries(Rips_complex_example_one_skeleton_from_points ${TBB_LIBRARIES})
+  target_link_libraries(Rips_complex_example_one_skeleton_from_distance_matrix ${TBB_LIBRARIES})
+  target_link_libraries(Rips_complex_example_from_csv_distance_matrix ${TBB_LIBRARIES})
 endif()
 
-add_test(oneskeletonripspoints ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripspoints)
-add_test(oneskeletonripsdistance ${CMAKE_CURRENT_BINARY_DIR}/oneskeletonripsdistance)
+add_test(NAME Rips_complex_example_one_skeleton_from_points
+    COMMAND $<TARGET_FILE:Rips_complex_example_one_skeleton_from_points>)
+add_test(NAME Rips_complex_example_one_skeleton_from_distance_matrix
+    COMMAND $<TARGET_FILE:Rips_complex_example_one_skeleton_from_distance_matrix>)
 
-# Do not forget to copy test files in current binary dir
-file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-add_test(ripsoffreader_doc_12_1 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader alphacomplexdoc.off 12.0 1 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt)
-add_test(ripsoffreader_doc_12_3 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader alphacomplexdoc.off 12.0 3 ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt)
+add_test(NAME Rips_complex_example_from_off_doc_12_1 COMMAND $<TARGET_FILE:Rips_complex_example_from_off>
+    "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "12.0" "1" "${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt")
+add_test(NAME Rips_complex_example_from_off_doc_12_3 COMMAND $<TARGET_FILE:Rips_complex_example_from_off>
+    "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "12.0" "3" "${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt")
 
-file(COPY "${CMAKE_SOURCE_DIR}/data/distance_matrix/full_square_distance_matrix.csv" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-add_test(ripscsvdistancereader_doc_12_1 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvdistancereader full_square_distance_matrix.csv 12.0 1 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_1.txt)
-add_test(ripscsvdistancereader_doc_12_3 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvdistancereader full_square_distance_matrix.csv 12.0 3 ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_3.txt)
+add_test(NAME Rips_complex_example_from_csv_distance_matrix_doc_12_1 COMMAND $<TARGET_FILE:Rips_complex_example_from_csv_distance_matrix>
+    "${CMAKE_SOURCE_DIR}/data/distance_matrix/full_square_distance_matrix.csv" "12.0" "1" "${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_1.txt")
+add_test(NAME Rips_complex_example_from_csv_distance_matrix_doc_12_3 COMMAND $<TARGET_FILE:Rips_complex_example_from_csv_distance_matrix>
+    "${CMAKE_SOURCE_DIR}/data/distance_matrix/full_square_distance_matrix.csv" "12.0" "3" "${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_3.txt")
 
 
 if (DIFF_PATH)
@@ -40,8 +43,16 @@ if (DIFF_PATH)
   file(COPY "one_skeleton_rips_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
   file(COPY "full_skeleton_rips_for_doc.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 
-  add_test(ripsoffreader_doc_12_1_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_for_doc.txt)
-  add_test(ripsoffreader_doc_12_3_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_for_doc.txt)
-  add_test(ripscsvreader_doc_12_1_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_1.txt ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_for_doc.txt)
-  add_test(ripscsvreader_doc_12_3_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_3.txt ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_for_doc.txt)
+  add_test(Rips_complex_example_from_off_doc_12_1_diff_files ${DIFF_PATH}
+      ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_1.txt
+      ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_for_doc.txt)
+  add_test(Rips_complex_example_from_off_doc_12_3_diff_files ${DIFF_PATH}
+      ${CMAKE_CURRENT_BINARY_DIR}/ripsoffreader_result_12_3.txt
+      ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_for_doc.txt)
+  add_test(Rips_complex_example_from_csv_distance_matrix_doc_12_1_diff_files ${DIFF_PATH}
+      ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_1.txt
+      ${CMAKE_CURRENT_BINARY_DIR}/one_skeleton_rips_for_doc.txt)
+  add_test(Rips_complex_example_from_csv_distance_matrix_doc_12_3_diff_files ${DIFF_PATH}
+      ${CMAKE_CURRENT_BINARY_DIR}/ripscsvreader_result_12_3.txt
+      ${CMAKE_CURRENT_BINARY_DIR}/full_skeleton_rips_for_doc.txt)
 endif()
diff --git a/src/Rips_complex/test/CMakeLists.txt b/src/Rips_complex/test/CMakeLists.txt
index 87bad2ed..57f780f1 100644
--- a/src/Rips_complex/test/CMakeLists.txt
+++ b/src/Rips_complex/test/CMakeLists.txt
@@ -1,25 +1,16 @@
 cmake_minimum_required(VERSION 2.6)
 project(Rips_complex_tests)
 
-if (GCOVR_PATH)
-  # for gcovr to make coverage reports - Corbera Jenkins plugin
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-endif()
-if (GPROF_PATH)
-  # for gprof to make coverage reports - Jenkins
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
-endif()
+include(GUDHI_test_coverage)
 
-add_executable ( rips_complex_UT test_rips_complex.cpp )
-target_link_libraries(rips_complex_UT  ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+add_executable ( Rips_complex_test_unit test_rips_complex.cpp )
+target_link_libraries(Rips_complex_test_unit  ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 if (TBB_FOUND)
-  target_link_libraries(rips_complex_UT ${TBB_LIBRARIES})
+  target_link_libraries(Rips_complex_test_unit ${TBB_LIBRARIES})
 endif()
 
 # Do not forget to copy test files in current binary dir
 file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 file(COPY "${CMAKE_SOURCE_DIR}/data/distance_matrix/full_square_distance_matrix.csv" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 
-add_test(rips_complex_UT ${CMAKE_CURRENT_BINARY_DIR}/rips_complex_UT
-         # XML format for Jenkins xUnit plugin 
-         --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/rips_complex_UT.xml --log_level=test_suite --report_level=no)
+gudhi_add_coverage_test(Rips_complex_test_unit)