more on database (tests)

.vscode/settings.json

@@ -6,5 +6,60 @@
         "**/CVS": true,
         "**/.DS_Store": true,
         "**/build": true
+    },
+    "files.associations": {
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "*.ipp": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "strstream": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "chrono": "cpp",
+        "codecvt": "cpp",
+        "complex": "cpp",
+        "cstdint": "cpp",
+        "deque": "cpp",
+        "list": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "fstream": "cpp",
+        "functional": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "iostream": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "memory": "cpp",
+        "new": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "ostream": "cpp",
+        "ratio": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "thread": "cpp",
+        "type_traits": "cpp",
+        "tuple": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "utility": "cpp",
+        "variant": "cpp",
+        "algorithm": "cpp"
     }
 }

src/core/database.cpp

@@ -1,7 +1,7 @@
 #include "database.h"
 
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 Database::Database(const std::string& dbname) : db_(nullptr)
 {
@@ -24,16 +24,14 @@ void Database::exec(const std::string& sql)
 
 void Database::init()
 {
-    std::string sqlCreateSellers{
+    std::string sqlCreateSellers{"CREATE TABLE IF NOT EXISTS sellers ("
-        "CREATE TABLE IF NOT EXISTS sellers ("
                                  "id TEXT PRIMARY KEY NOT NULL, "
                                  "seller_no INTEGER, "
                                  "first_name TEXT, "
                                  "last_name TEXT, "
                                  "offered_articles INTEGER, "
                                  "UNIQUE (seller_no)"
-        ");"
+                                 ");"};
-    };
 
     std::string sqlCreateArticles{
         "CREATE TABLE IF NOT EXISTS articles ("
@@ -46,10 +44,7 @@ void Database::init()
         "UNIQUE (source_no, article_no), "
         "FOREIGN KEY (seller_id) REFERENCES sellers(id) ON DELETE CASCADE, "
         "CHECK (article_no BETWEEN 0 AND 99999)"
-        ");"
+        ");"};
-    };
-
-    std::cout << sqlCreateArticles << "\n";
 
     beginTransaction();
     exec(sqlCreateSellers);

test/CMakeLists.txt

@@ -2,8 +2,8 @@ find_package(Boost COMPONENTS unit_test_framework REQUIRED)
 
 add_executable(test_seller test_seller.cpp)
 target_link_libraries(test_seller core Boost::unit_test_framework)
-add_test(Seller ${CMAKE_BINARY_DIR}/bin/test_seller)
+add_test(NAME Seller COMMAND ${CMAKE_BINARY_DIR}/bin/test_seller)
 
 add_executable(test_database test_database.cpp)
 target_link_libraries(test_database core Boost::unit_test_framework stdc++fs)
-add_test(Database ${CMAKE_BINARY_DIR}/bin/test_database)
+add_test(NAME Database COMMAND ${CMAKE_BINARY_DIR}/bin/test_database)

test/test_database.cpp

@@ -6,11 +6,20 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-//using namespace boost::unit_test;
+BOOST_AUTO_TEST_CASE(create_database)
-
+{
-BOOST_AUTO_TEST_CASE( create_database ) {
+    std::filesystem::path testPath = std::filesystem::temp_directory_path() / "kima2test.db";
-    std::filesystem::path testPath = std::filesystem::temp_directory_path() / "test.db";
+    if (std::filesystem::exists(testPath)) {
-    Database db(testPath.c_str());
-    db.init();
         std::filesystem::remove(testPath);
+    }
+
+    std::string filename = testPath.generic_string();
+
+    Database db(filename);
+    db.init();
+
+    BOOST_TEST(std::filesystem::exists(testPath) == true);
+    if (std::filesystem::exists(testPath)) {
+        std::filesystem::remove(testPath);
+    }
 }

test/test_seller.cpp

@@ -4,7 +4,7 @@
 
 #include <boost/test/included/unit_test.hpp>
 
-using namespace boost::unit_test;
+//using namespace boost::unit_test;
 
 BOOST_AUTO_TEST_CASE( create_uuid_nil ) {
     Seller seller{};