1 files changed, 15 insertions(+), 16 deletions(-)

M module-db/tests/AlarmsTable_tests.cpp

@@ 1,14 1,15 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <catch2/catch.hpp>
+#include "common.hpp"
 
-#include "Database/Database.hpp"
-#include "Databases/AlarmsDB.hpp"
-#include "Tables/AlarmsTable.hpp"
+#include <Database/Database.hpp>
+#include <Databases/AlarmsDB.hpp>
+#include <Tables/AlarmsTable.hpp>
 
-#include <algorithm>
+#include <catch2/catch.hpp>
 
+#include <algorithm>
 #include <cstdint>
 #include <cstdio>
 #include <cstring>


@@ 19,9 20,7 @@ TEST_CASE("Alarms Table tests")
     Database::initialize();
 
     const auto alarmsPath = (std::filesystem::path{"sys/user"} / "alarms.db");
-    if (std::filesystem::exists(alarmsPath)) {
-        REQUIRE(std::filesystem::remove(alarmsPath));
-    }
+    RemoveDbFiles(alarmsPath.stem());
 
     AlarmsDB alarmsDb(alarmsPath.c_str());
     REQUIRE(alarmsDb.isInitialized());


@@ 29,6 28,14 @@ TEST_CASE("Alarms Table tests")
     auto &alarmsTbl = alarmsDb.alarms;
     REQUIRE(alarmsTbl.count() == 0);
 
+    REQUIRE(alarmsTbl.add(
+        AlarmsTableRow(1, TimePointFromString("2020-11-11 15:10:00"), 0, AlarmStatus::Off, 0, "file.mp3")));
+    REQUIRE(alarmsTbl.add(
+        AlarmsTableRow(2, TimePointFromString("2020-11-11 15:15:00"), 1, AlarmStatus::On, 1, "file2.mp3")));
+
+    REQUIRE(alarmsTbl.count() == 2);
+    REQUIRE(alarmsTbl.countByFieldId("status", 0) == 1);
+
     SECTION("Default Constructor")
     {
         AlarmsTableRow test;


@@ 39,14 46,6 @@ TEST_CASE("Alarms Table tests")
         REQUIRE(test.path == "");
     }
 
-    REQUIRE(alarmsTbl.add(
-        AlarmsTableRow(1, TimePointFromString("2020-11-11 15:10:00"), 0, AlarmStatus::Off, 0, "file.mp3")));
-    REQUIRE(alarmsTbl.add(
-        AlarmsTableRow(2, TimePointFromString("2020-11-11 15:15:00"), 1, AlarmStatus::On, 1, "file2.mp3")));
-
-    REQUIRE(alarmsTbl.count() == 2);
-    REQUIRE(alarmsTbl.countByFieldId("status", 0) == 1);
-
     SECTION("Get entry by ID")
     {
         auto entry = alarmsTbl.getById(1);