diff options
Diffstat (limited to 'kbruch/testcases')
-rw-r--r-- | kbruch/testcases/CMakeLists.txt | 33 | ||||
-rw-r--r-- | kbruch/testcases/kbruch_test.cpp | 9 |
2 files changed, 38 insertions, 4 deletions
diff --git a/kbruch/testcases/CMakeLists.txt b/kbruch/testcases/CMakeLists.txt new file mode 100644 index 00000000..179bb4c1 --- /dev/null +++ b/kbruch/testcases/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories( + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../src + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} + ${Boost_LIBRARY_DIRS} +) + + +##### kbruch_test (test) + +tde_add_check_executable( kbruch_test AUTOMOC + + SOURCES + ${CMAKE_SOURCE_DIR}/kbruch/src/primenumber.cpp + ${CMAKE_SOURCE_DIR}/kbruch/src/ratio.cpp + ${CMAKE_SOURCE_DIR}/kbruch/src/task.cpp + ratio_test.cpp + primenumber_test.cpp + kbruch_test.cpp + LINK + tdeui-shared + + TEST +) diff --git a/kbruch/testcases/kbruch_test.cpp b/kbruch/testcases/kbruch_test.cpp index b4e978d1..a98496eb 100644 --- a/kbruch/testcases/kbruch_test.cpp +++ b/kbruch/testcases/kbruch_test.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ // for BOOST testing -#include <boost/test/unit_test.hpp> -using boost::unit_test_framework::test_suite; +#include <boost/test/included/unit_test.hpp> +using namespace boost::unit_test; // the test classes #include "primenumber_test.cpp" @@ -27,11 +27,12 @@ using boost::unit_test_framework::test_suite; test_suite* init_unit_test_suite(int /* argc */, char** /* argv */) { // create the top test suite - std::auto_ptr<test_suite> top_test_suite(BOOST_TEST_SUITE("Master test suite")); + test_suite* top_test_suite = BOOST_TEST_SUITE("Master test suite"); // add test suites to the top test suite top_test_suite->add(new primenumber_test_suite()); top_test_suite->add(new ratio_test_suite()); - return top_test_suite.release(); + framework::master_test_suite().add( top_test_suite ); + return 0; } |