Setup tests for running headless

Author: NerdOfCode

CMakeLists.txt

@@ -3,6 +3,15 @@ project(Qedit)
 
 set(CMAKE_CXX_STANDARD 17)
 
+# Platform-specific filesystem library
+if(APPLE)
+    # On macOS, filesystem is part of the standard library
+    set(FILESYSTEM_LIB "")
+else()
+    # On Linux, we need to link against stdc++fs
+    set(FILESYSTEM_LIB stdc++fs)
+endif()
+
 # Include FetchContent for downloading Catch2
 include(FetchContent)
 
@@ -24,20 +33,29 @@ add_executable(Qedit
         ${SOURCES}
         src/EditorCommands.h
 )
+if(FILESYSTEM_LIB)
+    target_link_libraries(Qedit PRIVATE ${FILESYSTEM_LIB})
+endif()
 
 # Config test executable
 add_executable(config_test
         lib/config_test.cpp
         lib/Config.cpp
 )
+if(FILESYSTEM_LIB)
+    target_link_libraries(config_test PRIVATE ${FILESYSTEM_LIB})
+endif()
 
 # Editor test executable
 add_executable(editor_test
         tests/editor_test.cpp
         ${SOURCES}
 )
 target_link_libraries(editor_test PRIVATE Catch2::Catch2WithMain)
-target_compile_definitions(editor_test PRIVATE TESTING)
+if(FILESYSTEM_LIB)
+    target_link_libraries(editor_test PRIVATE ${FILESYSTEM_LIB})
+endif()
+target_compile_definitions(editor_test PRIVATE CATCH_CONFIG_FAST_COMPILE)
 
 # Enable testing
 enable_testing()

src/QEditor.cpp

@@ -5,6 +5,7 @@
 #include <iostream>
 #include <thread>
 #include <sys/ioctl.h>
+#include <filesystem>
 
 #include "EditorCommands.h"
 #include "../lib/EditorError.h"
@@ -14,8 +15,18 @@ namespace {
 }
 
 Editor::Editor() {
-    enableRawMode();
-    updateWindowSize();
+#ifdef TESTING
+    if (!skipTerminalSetup) {
+#endif
+        enableRawMode();
+        updateWindowSize();
+#ifdef TESTING
+    } else {
+        // Set default terminal size for testing
+        screenRows = 24;
+        screenCols = 80;
+    }
+#endif
 
     // Load configuration
     config.parse();
@@ -32,14 +43,20 @@ Editor::Editor() {
     filename = "";
     commandBuffer = "";
 
-    // Save terminal state and switch to alternate screen
-    std::cout << "\x1b[?1049h" << std::flush;
-    // Clear the alternate screen completely
-    std::cout << "\x1b[2J" << std::flush;
-    // Move to home position
-    std::cout << "\x1b[H" << std::flush;
-    // Disable line wrapping
-    std::cout << "\x1b[?7l" << std::flush;
+#ifdef TESTING
+    if (!skipTerminalSetup) {
+#endif
+        // Save terminal state and switch to alternate screen
+        std::cout << "\x1b[?1049h" << std::flush;
+        // Clear the alternate screen completely
+        std::cout << "\x1b[2J" << std::flush;
+        // Move to home position
+        std::cout << "\x1b[H" << std::flush;
+        // Disable line wrapping
+        std::cout << "\x1b[?7l" << std::flush;
+#ifdef TESTING
+    }
+#endif
 }
 
 Editor::~Editor() {
@@ -539,13 +556,36 @@ void Editor::deleteLine() {
 }
 
 void Editor::updateWindowSize() {
+#ifdef TESTING
+    if (skipTerminalSetup) {
+        // Use default size for testing
+        screenRows = 24;
+        screenCols = 80;
+        return;
+    }
+#endif
+
+    // Check if we're in a terminal
+    if (!isatty(STDOUT_FILENO)) {
+        // Not in a terminal, use default size
+        screenRows = 24;
+        screenCols = 80;
+        return;
+    }
+
     winsize ws{};
     if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == -1) {
-        throw QEditor::TerminalError("Failed to get window size");
+        // If we can't get window size, use default
+        screenRows = 24;
+        screenCols = 80;
+        return;
     }
 
     if (ws.ws_row < 1 || ws.ws_col < 1) {
-        throw QEditor::TerminalSizeError(ws.ws_row, ws.ws_col);
+        // Invalid window size, use default
+        screenRows = 24;
+        screenCols = 80;
+        return;
     }
 
     screenRows = ws.ws_row;

src/QEditor.h

@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 #include <chrono>
+#include <csignal>
 #include "../lib/Config.h"
 
 enum Mode { VIEW, EDIT, COMMAND };
@@ -49,8 +50,7 @@ class Editor {
     static void enableRawMode();
     static void disableRawMode();
 
-#ifdef TESTING
-    // Test helper methods
+    // Test helper methods - always available
     [[nodiscard]] bool isInEditMode() const { return mode == EDIT; }
     [[nodiscard]] bool isInNormalMode() const { return mode == VIEW; }
     [[nodiscard]] bool isInCommandMode() const { return mode == COMMAND; }
@@ -67,7 +67,7 @@ class Editor {
     [[nodiscard]] size_t getScreenRows() const { return screenRows; }
     [[nodiscard]] size_t getScreenCols() const { return screenCols; }
 
-    // Test-only methods
+    // Test-only methods - always available
     void setCursorPosition(size_t x, size_t y) {
         cur_x = x;
         cur_y = y;
@@ -77,6 +77,16 @@ class Editor {
         cur_x = 0;
         cur_y = 0;
     }
+
+#ifdef TESTING
+    // Test-specific terminal handling
+    void skipTerminalInit() {
+        skipTerminalSetup = true;
+    }
+    void setMockTerminalSize(size_t rows, size_t cols) {
+        screenRows = rows;
+        screenCols = cols;
+    }
 #endif
 
 private:
@@ -100,6 +110,9 @@ class Editor {
     size_t TAB_WIDTH = 4; // Now can be configured
     bool showLineNumbers = false; // Default to not showing line numbers
     bool running = true;
+#ifdef TESTING
+    bool skipTerminalSetup = false;
+#endif
 
     std::string commandBuffer;
     std::vector<std::string> buffer;

tests/editor_test.cpp

@@ -1,17 +1,26 @@
 #define CATCH_CONFIG_MAIN
+#define TESTING  // Define TESTING before including QEditor.h
 #include <catch2/catch_test_macros.hpp>
 #include "../src/QEditor.h"
 
-TEST_CASE("Basic editor initialization", "[editor]") {
+// Helper function to create a test-ready editor
+Editor createTestEditor() {
     Editor editor;
+    editor.skipTerminalInit();
+    editor.setMockTerminalSize(24, 80);
+    return editor;
+}
+
+TEST_CASE("Basic editor initialization", "[editor]") {
+    Editor editor = createTestEditor();
     REQUIRE(editor.isInNormalMode());
     REQUIRE(editor.getBuffer().empty());
     REQUIRE(editor.getCursorX() == 0);
     REQUIRE(editor.getCursorY() == 0);
 }
 
 TEST_CASE("Editor mode switching", "[editor]") {
-    Editor editor;
+    Editor editor = createTestEditor();
 
     SECTION("Start in normal mode") {
         REQUIRE(editor.isInNormalMode());
@@ -33,15 +42,15 @@ TEST_CASE("Editor mode switching", "[editor]") {
 }
 
 TEST_CASE("Editor buffer operations", "[editor]") {
-    Editor editor;
+    Editor editor = createTestEditor();
 
     SECTION("Empty buffer") {
         REQUIRE(editor.getBuffer().empty());
     }
 }
 
 TEST_CASE("Editor cursor navigation", "[editor]") {
-    Editor editor;
+    Editor editor = createTestEditor();
 
     // Set up a 3x3 grid of text for testing navigation
     editor.editMode();