Move tests to relevant subprojects

.claude/rules/tests.md

@@ -0,0 +1 @@
+Tests for projects should be placed in the `Tests/` or `tests/` subfolder of that project.

Documentation/ideas.md

@@ -18,7 +18,6 @@
 - Make it possible to override stack size for an app via config file (loaded at boot), and make it possible to set preferred memory location (e.g. internal/external)
 - Wrap file operations like fopen/fclose with file_mutex
 - Add bold fonts for e-ink readability improvement
-- Move test projects to their relevant subproject
 - Httpd.cpp: warn if running on same CPU core (or task) as UI/LVGL/window manager.
 - Improve Setup: Show "Step done" screen
 - Improve Setup: Add keyboard/keypad navigation explanation

Tests/app-module/CMakeLists.txt → Modules/app-module/tests/CMakeLists.txt

@@ -3,7 +3,7 @@ project(AppModuleTests)
 enable_language(C CXX ASM)
 
 
-file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
+file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/source/*.cpp)
 add_executable(AppModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 target_include_directories(AppModuleTests PRIVATE ${DOCTESTINC})

Tests/crypt-module/CMakeLists.txt → Modules/crypt-module/tests/CMakeLists.txt

@@ -2,7 +2,7 @@ project(CryptModuleTests)
 
 enable_language(C CXX ASM)
 
-file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
+file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/source/*.cpp)
 add_executable(CryptModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 target_include_directories(CryptModuleTests PRIVATE ${DOCTESTINC})

Tests/crypt-module/Source/Main.cpp → Modules/crypt-module/tests/source/main.cpp

@@ -1,6 +1,7 @@
 #define DOCTEST_CONFIG_IMPLEMENT
 #include "doctest.h"
-#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -43,7 +44,10 @@ int main(int argc, char** argv) {
         1,
         nullptr
     );
-    assert(task_result == pdPASS);
+
+    if (task_result != pdPASS) {
+        return 1;
+    }
 
     vTaskStartScheduler();
 
@@ -54,6 +58,7 @@ int main(int argc, char** argv) {
 extern "C" {
 // Required for FreeRTOS
 void vAssertCalled(unsigned long line, const char* const file) {
-    __assert_fail("assert failed", file, line, "");
+    std::fprintf(stderr, "assert failed at %s:%lu\n", file, line);
+    std::abort();
 }
 }

Tests/service-module/CMakeLists.txt → Modules/service-module/tests/CMakeLists.txt

@@ -3,7 +3,7 @@ project(ServiceModuleTests)
 enable_language(C CXX ASM)
 
 
-file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
+file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/source/*.cpp)
 add_executable(ServiceModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 target_include_directories(ServiceModuleTests PRIVATE ${DOCTESTINC})

Tests/service-module/Source/Main.cpp → Modules/service-module/tests/source/main.cpp

@@ -1,6 +1,5 @@
 #define DOCTEST_CONFIG_IMPLEMENT
 #include "doctest.h"
-#include <cassert>
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -43,7 +42,10 @@ int main(int argc, char** argv) {
         1,
         nullptr
     );
-    assert(task_result == pdPASS);
+
+    if (task_result != pdPASS) {
+        return 1;
+    }
 
     vTaskStartScheduler();
 

Tactility/Source/file/File.cpp

@@ -278,6 +278,9 @@ bool deleteRecursively(const std::string& path) {
     if (path.empty()) {
         return true;
     }
+    if (path == "/" || path == "." || path == "..") {
+        return true;
+    }
 
     if (isDirectory(path)) {
         std::vector<dirent> entries;
@@ -287,6 +290,9 @@ bool deleteRecursively(const std::string& path) {
         }
 
         for (const auto& entry : entries) {
+            if (strcmp(entry.d_name, ".") == 0 || strcmp(entry.d_name, "..") == 0) {
+                continue;
+            }
             auto child_path = path + "/" + entry.d_name;
             if (!deleteRecursively(child_path)) {
                 return false;
@@ -297,9 +303,6 @@ bool deleteRecursively(const std::string& path) {
     } else if (isFile(path)) {
         LOG_I(TAG, "Deleting %s", path.c_str());
         return deleteFile(path);
-    } else if (path == "/" || path == "." || path == "..") {
-        // No-op
-        return true;
     } else {
         LOG_E(TAG, "Failed to delete \"%s\": unknown type", path.c_str());
         return false;

Tests/Tactility/CMakeLists.txt → Tactility/Tests/CMakeLists.txt

@@ -3,7 +3,7 @@ project(TactilityTests)
 enable_language(C CXX ASM)
 
 
-file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
+file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/Source/*.cpp)
 add_executable(TactilityTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 target_include_directories(TactilityTests PRIVATE ${DOCTESTINC})

Tests/Tactility/Source/FileTest.cpp → Tactility/Tests/Source/FileTest.cpp

@@ -5,10 +5,10 @@ using namespace tt;
 
 TEST_CASE("findOrCreateDirectory can create a directory tree without prefix") {
     CHECK_EQ(file::findOrCreateDirectory("test1/test1", 0777), true);
-    // TODO: delete dirs
+    CHECK_EQ(file::deleteRecursively("test1"), true);
 }
 
 TEST_CASE("findOrCreateDirectory can create a directory tree with prefix") {
     CHECK_EQ(file::findOrCreateDirectory("/tmp/test2", 0777), true);
-    // TODO: delete dirs
+    CHECK_EQ(file::deleteRecursively("/tmp/test2"), true);
 }

Tests/Tactility/Source/Main.cpp → Tactility/Tests/Source/Main.cpp

@@ -1,6 +1,5 @@
 #define DOCTEST_CONFIG_IMPLEMENT
 #include "doctest.h"
-#include <cassert>
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -54,7 +53,10 @@ int main(int argc, char** argv) {
         1,
         nullptr
     );
-    assert(task_result == pdPASS);
+
+    if (task_result != pdPASS) {
+        return 1;
+    }
 
     vTaskStartScheduler();
 

Tests/Tactility/Source/ObjectFileTest.cpp → Tactility/Tests/Source/ObjectFileTest.cpp

@@ -26,8 +26,10 @@ TEST_CASE("Writing and reading multiple records to a file") {
     CHECK_EQ(reader.open(), true);
     CHECK_EQ(reader.hasNext(), true);
     CHECK_EQ(reader.readNext(&record_in), true);
+    CHECK_EQ(record_in.value, 0xAAAAAAAA);
     CHECK_EQ(reader.hasNext(), true);
     CHECK_EQ(reader.readNext(&record_in), true);
+    CHECK_EQ(record_in.value, 0xBBBBBBBB);
     CHECK_EQ(reader.hasNext(), false);
     reader.close();
 

Tests/Tactility/Source/UrlTest.cpp → Tactility/Tests/Source/UrlTest.cpp

@@ -46,7 +46,7 @@ TEST_CASE("parseUrlQuery should url-decode the key") {
     CHECK_EQ(map["Test!Test"], "value");
 }
 
-TEST_CASE("urlDecode") {
+TEST_CASE("urlEncode") {
     auto input = std::string("prefix!*'();:@&=+$,/?#[]<>%-.^_`{}|~ \\");
     auto expected = std::string("prefix%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%23%5B%5D%3C%3E%25-.%5E_%60%7B%7D%7C~+%5C");
     auto encoded = network::urlEncode(input);

Tests/TactilityFreeRtos/CMakeLists.txt → TactilityFreeRtos/Tests/CMakeLists.txt

@@ -3,7 +3,7 @@ project(TactilityFreeRtosTests)
 enable_language(C CXX ASM)
 
 
-file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
+file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/Source/*.cpp)
 add_executable(TactilityFreeRtosTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 target_include_directories(TactilityFreeRtosTests PRIVATE ${DOCTESTINC})

Tests/TactilityFreeRtos/Source/DispatcherThreadTest.cpp → TactilityFreeRtos/Tests/Source/DispatcherThreadTest.cpp

@@ -1,5 +1,6 @@
 #include "doctest.h"
 #include <Tactility/DispatcherThread.h>
+#include <Tactility/Semaphore.h>
 
 using namespace tt;
 
@@ -18,11 +19,14 @@ TEST_CASE("DispatcherThread should consume jobs") {
     DispatcherThread thread("test");
     thread.start();
     int counter = 0;
+    Semaphore done(1, 0);
 
-    thread.dispatch([&counter]() { counter++; });
-
-    tt::kernel::delayTicks(10);
+    thread.dispatch([&counter, &done]() {
+        counter++;
+        done.release();
+    });
 
+    CHECK(done.acquire(pdMS_TO_TICKS(2000)));
     CHECK_EQ(counter, 1);
     thread.stop();
 }

Tests/TactilityFreeRtos/Source/MutexTest.cpp → TactilityFreeRtos/Tests/Source/MutexTest.cpp

@@ -14,6 +14,7 @@ TEST_CASE("a Mutex can block a thread") {
         1024,
         [&mutex] {
             mutex.lock(kernel::FREERTOS_MAX_TICKS);
+            mutex.unlock();
             return 0;
         }
     );

Tests/TactilityFreeRtos/Source/RecursiveMutexTest.cpp → TactilityFreeRtos/Tests/Source/RecursiveMutexTest.cpp

@@ -14,6 +14,7 @@ TEST_CASE("a RecursiveMutex can block a thread") {
         1024,
         [&mutex] {
             mutex.lock(kernel::FREERTOS_MAX_TICKS);
+            mutex.unlock();
             return 0;
         }
     );
@@ -35,4 +36,5 @@ TEST_CASE("a RecursiveMutex can be locked more than once from the same context")
     CHECK_EQ(mutex.lock(0), true);
     CHECK_EQ(mutex.lock(0), true);
     mutex.unlock();
+    mutex.unlock();
 }

Tests/TactilityFreeRtos/Source/ThreadTest.cpp → TactilityFreeRtos/Tests/Source/ThreadTest.cpp

@@ -1,6 +1,8 @@
 #include "doctest.h"
 #include <Tactility/Thread.h>
 
+#include <atomic>
+
 using namespace tt;
 
 TEST_CASE("when a thread is started then its callback should be called") {
@@ -22,7 +24,7 @@ TEST_CASE("when a thread is started then its callback should be called") {
 }
 
 TEST_CASE("a thread can be started and stopped") {
-    bool interrupted = false;
+    std::atomic<bool> interrupted = false;
     auto* thread = new Thread(
         "interruptable thread",
         4096,
@@ -42,7 +44,7 @@ TEST_CASE("a thread can be started and stopped") {
 }
 
 TEST_CASE("thread id should only be set at when thread is started") {
-    bool interrupted = false;
+    std::atomic<bool> interrupted = false;
     auto* thread = new Thread(
         "interruptable thread",
         4096,
@@ -63,7 +65,7 @@ TEST_CASE("thread id should only be set at when thread is started") {
 }
 
 TEST_CASE("thread state should be correct") {
-    bool interrupted = false;
+    std::atomic<bool> interrupted = false;
     auto* thread = new Thread(
         "interruptable thread",
         4096,

TactilityFreeRtos/Tests/Source/TimerTest.cpp

@@ -0,0 +1,67 @@
+#include "doctest.h"
+#include <Tactility/Semaphore.h>
+#include <Tactility/Timer.h>
+
+#include <atomic>
+
+using namespace tt;
+
+// stop() only enqueues a command; it doesn't wait for the timer service task to process it or
+// finish an in-flight callback. Queuing a pending callback on that same queue and waiting for it
+// does, since the service task processes its queue in order.
+void waitForTimerServiceIdle(Timer& timer) {
+    Semaphore done(1, 0);
+    auto markDone = [](void* context, uint32_t) {
+        static_cast<Semaphore*>(context)->release();
+    };
+    REQUIRE(timer.setPendingCallback(markDone, &done, 0, pdMS_TO_TICKS(2000)));
+    REQUIRE(done.acquire(pdMS_TO_TICKS(2000)));
+}
+
+TEST_CASE("TimerType::Periodic timers can be stopped and restarted") {
+    std::atomic<int> counter{0};
+    auto* timer = new Timer(Timer::Type::Periodic, 1, [&counter] { counter++; });
+    CHECK_EQ(timer->start(), true);
+    kernel::delayTicks(10);
+    CHECK_EQ(timer->stop(), true);
+    waitForTimerServiceIdle(*timer);
+    const auto first_run_count = counter.load();
+
+    CHECK_EQ(timer->start(), true);
+    kernel::delayTicks(10);
+    CHECK_EQ(timer->stop(), true);
+    waitForTimerServiceIdle(*timer);
+    delete timer;
+
+    CHECK_GT(counter.load(), first_run_count);
+}
+
+TEST_CASE("TimerType::Periodic calls the callback periodically") {
+    int ticks_to_run = 10;
+    std::atomic<int> counter{0};
+    auto* timer = new Timer(Timer::Type::Periodic, 1, [&counter] { counter++; });
+    CHECK_EQ(timer->start(), true);
+    kernel::delayTicks(ticks_to_run);
+    CHECK_EQ(timer->stop(), true);
+    waitForTimerServiceIdle(*timer);
+    delete timer;
+
+    // Exact count isn't guaranteed (scheduling slop around start()/stop()), so this only checks
+    // that the callback fired repeatedly, not an exact tick-for-tick match.
+    CHECK_GE(counter.load(), ticks_to_run / 2);
+}
+
+TEST_CASE("restarting TimerType::Once timers calls the callback again") {
+    std::atomic<int> counter{0};
+    auto* timer = new Timer(Timer::Type::Once, 1, [&counter] { counter++; });
+    CHECK_EQ(timer->start(), true);
+    kernel::delayTicks(10);
+    CHECK_EQ(timer->stop(), true);
+    CHECK_EQ(timer->start(), true);
+    kernel::delayTicks(10);
+    CHECK_EQ(timer->stop(), true);
+    waitForTimerServiceIdle(*timer);
+    delete timer;
+
+    CHECK_EQ(counter.load(), 2);
+}

Tests/TactilityKernel/CMakeLists.txt → TactilityKernel/tests/CMakeLists.txt

@@ -3,7 +3,7 @@ project(TactilityKernelTests)
 enable_language(C CXX ASM)
 
 
-file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp)
+file(GLOB_RECURSE TEST_SOURCES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/source/*.cpp)
 add_executable(TactilityKernelTests EXCLUDE_FROM_ALL ${TEST_SOURCES})
 
 target_include_directories(TactilityKernelTests PRIVATE ${DOCTESTINC})

Tests/TactilityKernel/Source/Main.cpp → TactilityKernel/tests/source/main.cpp

@@ -1,6 +1,5 @@
 #define DOCTEST_CONFIG_IMPLEMENT
 #include "doctest.h"
-#include <cassert>
 #include <tactility/check.h>
 
 #include <tactility/dts.h>
@@ -52,7 +51,10 @@ int main(int argc, char** argv) {
         1,
         nullptr
     );
-    assert(task_result == pdPASS);
+
+    if (task_result != pdPASS) {
+        return 1;
+    }
 
     vTaskStartScheduler();
 

Tests/TactilityKernel/Source/ModuleTest.cpp → TactilityKernel/tests/source/module_test.cpp

@@ -138,9 +138,10 @@ TEST_CASE("Global symbol resolution") {
     REQUIRE_EQ(module_add(&module), ERROR_NONE);
     CHECK_EQ(module_resolve_symbol_global("symbol_test_function", &addr), false);
     REQUIRE_EQ(module_start(&module), ERROR_NONE);
-    // Still fails as symbols are null
+    // Resolvable now that the module is both added and started
     CHECK_EQ(module_resolve_symbol_global("symbol_test_function", &addr), true);
     // Cleanup
+    CHECK_EQ(module_stop(&module), ERROR_NONE);
     CHECK_EQ(module_remove(&module), ERROR_NONE);
 
     CHECK_EQ(module_destruct(&module), ERROR_NONE);

Tests/TactilityKernel/Source/MutexTest.cpp → TactilityKernel/tests/source/mutex_test.cpp

@@ -47,6 +47,7 @@ TEST_CASE("mutex_lock in another task should block when a lock is active") {
             Mutex* mutex_ptr = static_cast<Mutex*>(input);
             mutex_lock(mutex_ptr);
             task_lock_counter++;
+            mutex_unlock(mutex_ptr);
             vTaskDelete(nullptr);
         },
         "mutex_test",