diff options
Diffstat (limited to 'src/Simplex_tree/test')
| -rw-r--r-- | src/Simplex_tree/test/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/Simplex_tree/test/README | 2 | ||||
| -rw-r--r-- | src/Simplex_tree/test/simplex_tree_unit_test.cpp (renamed from src/Simplex_tree/test/UnitTestSimplexTree.cpp) | 13 |
3 files changed, 24 insertions, 13 deletions
diff --git a/src/Simplex_tree/test/CMakeLists.txt b/src/Simplex_tree/test/CMakeLists.txt index a15ac04e..02ef9d8b 100644 --- a/src/Simplex_tree/test/CMakeLists.txt +++ b/src/Simplex_tree/test/CMakeLists.txt @@ -1,11 +1,21 @@ cmake_minimum_required(VERSION 2.6) project(GUDHITestSimplexTree) -# NEED TO FIND BOOST NEEDED COMPONENTS TO LINK WITH -find_package(Boost 1.45.0 COMPONENTS system unit_test_framework) -message("Boost_lib = ${Boost_LIBRARIES}") +if(NOT MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} --coverage") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} --coverage") +endif() -include_directories(${Boost_INCLUDE_DIRS}) -add_executable ( TestSimplexTree UnitTestSimplexTree.cpp ) -target_link_libraries(TestSimplexTree ${Boost_LIBRARIES}) +add_executable ( simplex_tree_unit_test simplex_tree_unit_test.cpp ) +target_link_libraries(simplex_tree_unit_test ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) +# Unitary tests +add_test(simplex_tree_unit_test ${CMAKE_CURRENT_BINARY_DIR}/simplex_tree_unit_test) + +if (LCOV_PATH) + # Lcov code coverage of unitary test + add_test(src/Simplex_tree/lcov/coverage.log ${CMAKE_SOURCE_DIR}/scripts/check_code_coverage.sh ${CMAKE_SOURCE_DIR}/src/Simplex_tree) +endif() + +cpplint_add_tests("${CMAKE_SOURCE_DIR}/src/Simplex_tree/include/gudhi") diff --git a/src/Simplex_tree/test/README b/src/Simplex_tree/test/README index 3d6981ff..620bcd5f 100644 --- a/src/Simplex_tree/test/README +++ b/src/Simplex_tree/test/README @@ -7,6 +7,6 @@ make To launch with details: *********************** -./TestSimplexTree --report_level=detailed --log_level=all +./simplex_tree_unit_test --report_level=detailed --log_level=all ==> echo $? returns 0 in case of success (non-zero otherwise) diff --git a/src/Simplex_tree/test/UnitTestSimplexTree.cpp b/src/Simplex_tree/test/simplex_tree_unit_test.cpp index a3671f56..b44f95a8 100644 --- a/src/Simplex_tree/test/UnitTestSimplexTree.cpp +++ b/src/Simplex_tree/test/simplex_tree_unit_test.cpp @@ -166,7 +166,7 @@ void set_and_test_simplex_tree_dim_fil(typeST& simplexTree, int vectorSize, cons simplexTree.set_filtration(max_fil); std::cout << " set_and_test_simplex_tree_dim_fil - max_fil=" << max_fil << std::endl; } - int nb_simplices = simplexTree.num_simplices() + 1; + unsigned int nb_simplices = simplexTree.num_simplices() + 1; simplexTree.set_num_simplices(nb_simplices); BOOST_CHECK( simplexTree.dimension() == dim_max ); @@ -347,11 +347,12 @@ BOOST_AUTO_TEST_CASE( simplex_tree_insertion ) BOOST_CHECK( st.dimension() == dim_max ); BOOST_CHECK( AreAlmostTheSame(st.filtration(), max_fil) ); - // 1 - // o - // /X\ - // o---o---o - // 2 0 3 + /* Inserted simplex: */ + /* 1 */ + /* o */ + /* /X\ */ + /* o---o---o */ + /* 2 0 3 */ // [0.1] 0 // [0.1] 1 |