diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d9f0a1..0a43511 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,5 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -enable_testing() - add_subdirectory(src) -add_subdirectory(test) +add_subdirectory(test) \ No newline at end of file diff --git a/src/core/database.cpp b/src/core/database.cpp index 0b3207a..1ad5f43 100644 --- a/src/core/database.cpp +++ b/src/core/database.cpp @@ -18,14 +18,4 @@ void Database::exec(const std::string& sql) if (errCode) { throw std::runtime_error("Error in SQL execution."); } -} - -void Database::beginTransaction() -{ - exec("BEGIN TRANSACTION"); -} - -void Database::endTransaction() -{ - exec("END TRANSACTION"); } \ No newline at end of file diff --git a/src/core/database.h b/src/core/database.h index 5fcf027..dcb2858 100644 --- a/src/core/database.h +++ b/src/core/database.h @@ -15,8 +15,6 @@ public: void exec(const std::string& sql); private: sqlite3 *db; - void beginTransaction(); - void endTransaction(); }; #endif // DATABASE_H \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f89cd4a..dde9034 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,9 +1,8 @@ +enable_testing() + find_package(Boost COMPONENTS filesystem unit_test_framework REQUIRED) -add_executable(sellertest test_seller.cpp) -target_link_libraries(sellertest core Boost::boost Boost::filesystem Boost::unit_test_framework) -add_test(Seller ${CMAKE_BINARY_DIR}/bin/sellertest) +set(TEST_SOURCES test_seller.cpp) -add_executable(databasetest test_database.cpp) -target_link_libraries(databasetest core Boost::boost Boost::filesystem Boost::unit_test_framework) -add_test(Database ${CMAKE_BINARY_DIR}/bin/databasetest) +add_executable(testsuite ${TEST_SOURCES}) +target_link_libraries(testsuite core Boost::boost Boost::filesystem Boost::unit_test_framework) diff --git a/test/test_database.cpp b/test/test_database.cpp deleted file mode 100644 index 982a174..0000000 --- a/test/test_database.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#define BOOST_TEST_MODULE database - -#include "../src/core/database.h" - -#include - -//using namespace boost::unit_test; - -BOOST_AUTO_TEST_CASE( create_database ) { - Database db("test.db"); -} \ No newline at end of file diff --git a/test/test_seller.cpp b/test/test_seller.cpp index c467906..456acad 100644 --- a/test/test_seller.cpp +++ b/test/test_seller.cpp @@ -1,7 +1,7 @@ -#define BOOST_TEST_MODULE seller - #include "../src/core/seller.h" +#define BOOST_TEST_MODULE seller + #include using namespace boost::unit_test;