Add X11 mocking utilities

Signed-off-by: Tin Švagelj <[email protected]>

tests/CMakeLists.txt

@@ -25,9 +25,11 @@ excluding_any("wayland" IF NOT BUILD_WAYLAND)
 
 # Mocking works because it's linked before conky_core, so the linker uses mock
 # implementations instead of those that are linked later.
-add_library(conky-mock OBJECT ${mock_sources})
 add_library(Catch2 STATIC catch2/catch_amalgamated.cpp)
 
+add_library(conky-mock OBJECT ${mock_sources})
+target_link_libraries(conky-mock Catch2)
+
 add_executable(test-conky test-common.cc ${test_sources})
 target_include_directories(test-conky
   PUBLIC

tests/mock/mock.hh

@@ -33,8 +33,10 @@ std::string debug_format(const std::string& format, Args... args) {
 /// This is intended for cases where some library function is internally invoked
 /// but would fail if conditions only present at runtime aren't met.
 struct state_change {
- public:
   virtual ~state_change() = default;
+
+  static std::string change_name() { return "state_change"; }
+
   /// Returns a string representation of this state change with information
   /// necessary to differentiate it from other variants of the same type.
   virtual std::string debug() = 0;
@@ -70,7 +72,7 @@ std::optional<T> next_state_change_t() {
 }  // namespace mock
 
 /// A variant of `mock::next_state_change_t` that integrates into Catch2.
-/// It's a macro because using `FAIL` outside of a test doesn't work.
+/// It's a macro because using `FAIL` outside of a test doesn't compile.
 #define EXPECT_NEXT_CHANGE(T)                                  \
   []() {                                                       \
     static_assert(std::is_base_of_v<mock::state_change, T>,    \