add some tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1717008381c92c6cb080ea93fcda32d1abb02da..f4c8dfb0b12c974957405193e0f78bef0ba70a04 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,7 +56,12 @@ target_link_libraries(test_nutra PRIVATE Qt${QT_VERSION_MAJOR}::Test Qt${QT_VERS
 
 add_test(NAME FoodRepoTest COMMAND test_nutra)
 
-add_executable(test_databasemanager tests/test_databasemanager.cpp src/db/databasemanager.cpp src/db/foodrepository.cpp src/utils/string_utils.cpp)
+file(GLOB_RECURSE TEST_DB_SOURCES
+    tests/test_databasemanager.cpp
+    src/db/*.cpp
+    src/utils/*.cpp
+)
+add_executable(test_databasemanager ${TEST_DB_SOURCES})
 target_include_directories(test_databasemanager PRIVATE ${CMAKE_SOURCE_DIR}/include)
 target_link_libraries(test_databasemanager PRIVATE Qt${QT_VERSION_MAJOR}::Test Qt${QT_VERSION_MAJOR}::Sql)
 add_test(NAME DatabaseManagerTest COMMAND test_databasemanager)

diff --git a/src/widgets/preferencesdialog.cpp b/src/widgets/preferencesdialog.cpp
index 9ae17ec0e91552a73d2ec67aef06139103cb5178..3586636e7caf11c0959fa7c3228494f48e480e96 100644 (file)
--- a/src/widgets/preferencesdialog.cpp
+++ b/src/widgets/preferencesdialog.cpp
@@ -122,7 +122,7 @@ void PreferencesDialog::save() {
     settings.setValue("searchDebounce", debounceSpin->value());
 
     // Save Profile
-    if (profileWidget) profileWidget->save();
+    if (profileWidget != nullptr) profileWidget->save();
 
     // RDA saves automatically on edit in its own widget (checking RDASettingsWidget design
     // recommended, assuming yes for now or needs explicit save call if it supports it) Actually

diff --git a/src/widgets/profilesettingswidget.cpp b/src/widgets/profilesettingswidget.cpp
index 339e37191e5ef4444a528686dccff242bd106cae..549305585e89e785203bcf7cca03f0c92663b10c 100644 (file)
--- a/src/widgets/profilesettingswidget.cpp
+++ b/src/widgets/profilesettingswidget.cpp
@@ -145,8 +145,8 @@ void ProfileSettingsWidget::loadProfile() {
         heightSpin->setValue(q.value(4).toDouble());
 
         int act = q.value(5).toInt();
-        if (act < 1) act = 1;
-        if (act > 5) act = 5;
+        act = std::max(act, 1);
+        act = std::min(act, 5);
         activitySlider->setValue(act);
     } else {
         // Default insert if missing?

diff --git a/src/widgets/searchwidget.cpp b/src/widgets/searchwidget.cpp
index 4760db0a1637a1ca036e2ed122ab513c3b5b7274..2f2cce8d4869503c84ccec1945c3e9f20afde589 100644 (file)
--- a/src/widgets/searchwidget.cpp
+++ b/src/widgets/searchwidget.cpp
@@ -251,6 +251,6 @@ void SearchWidget::onCompleterActivated(const QString& text) {
 void SearchWidget::reloadSettings() {
     QSettings settings("NutraTech", "Nutra");
     int debounce = settings.value("searchDebounce", 600).toInt();
-    if (debounce < 250) debounce = 250;
+    debounce = std::max(debounce, 250);
     searchTimer->setInterval(debounce);
 }