tests: merge consolelog/ with lib-core/

Tarsnap · Dec 6, 2023 · 1eff3b1 · 1eff3b1
1 parent c0c3ec6
commit 1eff3b1
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 96 deletions.
diff --git a/Tarsnap.pro b/Tarsnap.pro
@@ -290,7 +290,6 @@ UNIT_TESTS =								\
 	tests/customfilesystemmodel					\
 	tests/small-widgets						\
 	tests/lib-widgets						\
-	tests/consolelog						\
 	tests/task							\
 	tests/lib-core
 

diff --git a/tests/consolelog/.gitignore b/tests/consolelog/.gitignore
diff --git a/tests/consolelog/confdir/test-consolelog.conf b/tests/consolelog/confdir/test-consolelog.conf
diff --git a/tests/consolelog/test-consolelog.cpp b/tests/consolelog/test-consolelog.cpp
diff --git a/tests/consolelog/test-consolelog.pro b/tests/consolelog/test-consolelog.pro
diff --git a/tests/lib-core/test-lib-core.cpp b/tests/lib-core/test-lib-core.cpp
@@ -2,12 +2,14 @@
 
 WARNINGS_DISABLE
 #include <QCoreApplication>
+#include <QDir>
 #include <QObject>
 #include <QString>
 #include <QTest>
 #include <QVariant>
 WARNINGS_ENABLE
 
+#include "ConsoleLog.h"
 #include "TSettings.h"
 
 class TestLibCore : public QObject
@@ -21,16 +23,20 @@ private slots:
     void settings_default();
     void settings_custom();
     void settings_default_after_custom();
+
+    void log_saveMessage();
 };
 
 void TestLibCore::initTestCase()
 {
     QCoreApplication::setOrganizationName(TEST_NAME);
+    LOG.initializeConsoleLog();
 }
 
 void TestLibCore::cleanupTestCase()
 {
     TSettings::destroy();
+    ConsoleLog::destroy();
 }
 
 void TestLibCore::settings_default()
@@ -73,6 +79,26 @@ void TestLibCore::settings_default_after_custom()
     QVERIFY(user == "default_init");
 }
 
+void TestLibCore::log_saveMessage()
+{
+    TSettings settings;
+
+    QString appdata = settings.value("app/app_data", "").toString();
+    QString logFile = appdata + QDir::separator() + TEST_NAME + ".log";
+
+    // Don't record this message
+    LOG << "don't write this\n";
+
+    // Save a message
+    LOG.setFilename(logFile);
+    LOG.setWriteToFile(true);
+    LOG << "write this\n";
+
+    // Disable saving again
+    LOG.setWriteToFile(false);
+    LOG << "don't write this\n";
+}
+
 QTEST_MAIN(TestLibCore)
 WARNINGS_DISABLE
 #include "test-lib-core.moc"

diff --git a/tests/lib-core/test-lib-core.pro b/tests/lib-core/test-lib-core.pro
@@ -5,12 +5,16 @@ TOPDIR = ../..
 VALGRIND = true
 
 HEADERS  +=								\
+	$$TOPDIR/lib/core/ConsoleLog.h					\
 	$$TOPDIR/lib/core/TSettings.h
 
 SOURCES += test-lib-core.cpp						\
+	$$TOPDIR/lib/core/ConsoleLog.cpp				\
 	$$TOPDIR/lib/core/TSettings.cpp
 
 include(../tests-include.pri)
 
+# We need the extra "appdata" to save the logfile.
 test_home_prep.commands += ; mkdir -p "$${TEST_HOME}/$${TARGET}";	\
+	mkdir -p "$${TEST_HOME}/$${TARGET}/appdata";			\
 	cp confdir/*.conf "$${TEST_HOME}/$${TARGET}"
diff --git a/tests/run-valgrind-tests.sh b/tests/run-valgrind-tests.sh
@@ -4,7 +4,7 @@ set -e
 
 # Command-line
 DIRS_C=""
-DIRS_C="${DIRS_C} lib-core consolelog"
+DIRS_C="${DIRS_C} lib-core"
 DIRS_C="${DIRS_C} task taskmanager persistent"
 DIRS_C="${DIRS_C} app-cmdline cli"