revert: remove cmocka 2.0 compatibility workaround

Restore original prof_cmocka.h - the CMOCKA_DISABLE_DEPRECATION_WARNINGS
workaround is not needed for this project.

.github/workflows/ci-code.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Run tests
         run: |
-          docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
+          docker build --no-cache -f Dockerfile.${{ matrix.flavor }} -t profanity .
           docker run profanity ./ci-build.sh
 
   code-style:
@@ -121,5 +121,10 @@ jobs:
               --output-file /coverage/coverage.info \
               --rc branch_coverage=1 \
               --ignore-errors inconsistent,empty,unused
-            lcov --summary /coverage/coverage.info
+          '
-          '
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4
+        with:
+          files: ./coverage/coverage.info
+          fail_ci_if_error: false
+          verbose: true

CONTRIBUTING.md

@@ -147,28 +147,9 @@ The functional test suite uses [stabber](https://git.jabber.space/devs/stabber)
 Functional tests require stabber to be installed. Once installed, tests run as part of `make check`:
 
 ```bash
-make check                      # Run all tests (unit + functional)
+make check
-make check-functional-parallel  # Run functional tests in parallel (~3x faster)
-./tests/functionaltests/functionaltests    # Run all functional tests sequentially
-./tests/functionaltests/functionaltests 1  # Run specific group (1-4)
 ```
 
-#### Test groups
-
-Tests are organized into 4 groups for parallel execution:
-
-| Group | Description |
-|-------|-------------|
-| 1 | Connect, Ping, Rooms, Software |
-| 2 | Message, Receipts, Roster, Chat Session |
-| 3 | Presence, Disconnect |
-| 4 | MUC, Carbons |
-
-To add a new group:
-1. Define the test array in `functionaltests.c`
-2. Add entry to `groups[]` array
-3. Update `FUNC_TEST_GROUPS` in `Makefile.am`
-
 #### Writing functional tests
 
 Use content-based stubbing with stabber:
@@ -187,5 +168,4 @@ Guidelines:
 2. Use `stbbr_send(xml)` for presence, message, and other push-style stanzas.
 3. Keep assertions tolerant of ordering when possible; use `prof_output_regex()` for flexible matching.
 4. If timing issues appear, use `prof_timeout()` around critical expectations and reset afterwards.
-5. When adding new tests, place them in the appropriate group based on functionality.
 

Makefile.am

@@ -308,22 +308,18 @@ tests_functionaltests_functionaltests_LDADD = -lcmocka -lstabber @FORKPTY_LIB@
 
 # Parallel functional tests target (~3x faster than sequential)
 # Usage: make check-functional-parallel
-# To add more groups: increase FUNC_TEST_GROUPS and add group in functionaltests.c
-FUNC_TEST_GROUPS = 1 2 3 4
-
 check-functional-parallel: tests/functionaltests/functionaltests
-	@echo "Running functional tests in parallel ($(words $(FUNC_TEST_GROUPS)) groups)..."
+	@echo "Running functional tests in parallel (4 groups)..."
 	@mkdir -p $(builddir)/test-logs
-	@pids=""; \
+	@failed=0; \
-	for g in $(FUNC_TEST_GROUPS); do \
+	./tests/functionaltests/functionaltests 1 > $(builddir)/test-logs/group1.log 2>&1 & pid1=$$!; \
-		./tests/functionaltests/functionaltests $$g > $(builddir)/test-logs/group$$g.log 2>&1 & \
+	./tests/functionaltests/functionaltests 2 > $(builddir)/test-logs/group2.log 2>&1 & pid2=$$!; \
-		pids="$$pids $$!"; \
+	./tests/functionaltests/functionaltests 3 > $(builddir)/test-logs/group3.log 2>&1 & pid3=$$!; \
-	done; \
+	./tests/functionaltests/functionaltests 4 > $(builddir)/test-logs/group4.log 2>&1 & pid4=$$!; \
-	failed=0; i=1; \
+	wait $$pid1 || { echo "Group 1 FAILED (exit $$?)"; cat $(builddir)/test-logs/group1.log; failed=1; }; \
-	for pid in $$pids; do \
+	wait $$pid2 || { echo "Group 2 FAILED (exit $$?)"; cat $(builddir)/test-logs/group2.log; failed=1; }; \
-		wait $$pid || { echo "Group $$i FAILED"; cat $(builddir)/test-logs/group$$i.log; failed=1; }; \
+	wait $$pid3 || { echo "Group 3 FAILED (exit $$?)"; cat $(builddir)/test-logs/group3.log; failed=1; }; \
-		i=$$((i + 1)); \
+	wait $$pid4 || { echo "Group 4 FAILED (exit $$?)"; cat $(builddir)/test-logs/group4.log; failed=1; }; \
-	done; \
 	echo "=== Test Results Summary ==="; \
 	grep -E 'PASSED|FAILED|Running' $(builddir)/test-logs/group*.log || true; \
 	if [ $$failed -ne 0 ]; then echo "FUNCTIONAL TESTS FAILED"; exit 1; fi; \

tests/functionaltests/functionaltests.c

@@ -15,14 +15,17 @@
  * functional tests run less frequently than unit tests.
  *
  * Tests are organized into groups for better maintainability and parallel execution:
- *   Group 1: Connect, Ping, Rooms, Software
+ *   Group 1: Connect, Ping, Rooms, Software (17 tests)
- *   Group 2: Message, Receipts, Roster, Chat Session
+ *   Group 2: Message, Receipts, Roster, Chat Session (17 tests)
- *   Group 3: Presence, Disconnect
+ *   Group 3: Presence (16 tests)
- *   Group 4: MUC, Carbons
+ *   Group 4: MUC, Carbons (19 tests)
  *
  * Parallel execution:
  *   ./functionaltests        - run all tests sequentially
- *   ./functionaltests N      - run group N only (N = 1..num_groups)
+ *   ./functionaltests 1      - run group 1 only
+ *   ./functionaltests 2      - run group 2 only
+ *   ./functionaltests 3      - run group 3 only
+ *   ./functionaltests 4      - run group 4 only
  *
  * For parallel execution, run multiple groups simultaneously:
  *   ./functionaltests 1 & ./functionaltests 2 & ./functionaltests 3 & ./functionaltests 4 & wait
@@ -38,7 +41,6 @@
 
 #include "config.h"
 
-#include "common.h"
 #include "proftest.h"
 #include "test_connect.h"
 #include "test_ping.h"
@@ -69,12 +71,11 @@ main(int argc, char* argv[])
         }
     }
 
-    /* ============================================================
+    /* GROUP 1: Connect, Ping, Rooms, Software (17 tests)
-     * GROUP 1: Connect, Ping, Rooms, Software
+     * Basic XMPP session establishment and server queries */
-     * Basic XMPP session establishment and server queries
+
-     * ============================================================ */
+    /* Connection tests - verify login, roster, bookmarks */
     const struct CMUnitTest group1_tests[] = {
-        /* Connection tests - verify login, roster, bookmarks */
         PROF_FUNC_TEST(connect_jid_requests_roster),
         PROF_FUNC_TEST(connect_jid_sends_presence_after_receiving_roster),
         PROF_FUNC_TEST(connect_jid_requests_bookmarks),
@@ -100,11 +101,10 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(display_software_version_result_in_chat),
     };
 
-    /* ============================================================
+    /* GROUP 2: Message, Receipts, Roster, Chat Session (17 tests)
-     * GROUP 2: Message, Receipts, Roster, Chat Session
+     * Core messaging and contact management */
-     * Core messaging and contact management
-     * ============================================================ */
     const struct CMUnitTest group2_tests[] = {
+
         /* Basic message send/receive */
         PROF_FUNC_TEST(message_send),
         PROF_FUNC_TEST(message_receive_console),
@@ -131,10 +131,8 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(new_session_when_message_received_from_different_fulljid),
     };
 
-    /* ============================================================
+    /* GROUP 3: Presence (16 tests)
-     * GROUP 3: Presence, Disconnect
+     * Online/away/xa/dnd/chat status management */
-     * Online/away/xa/dnd/chat status management
-     * ============================================================ */
     const struct CMUnitTest group3_tests[] = {
         PROF_FUNC_TEST(presence_online),
         PROF_FUNC_TEST(presence_online_with_message),
@@ -156,11 +154,10 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(disconnect_ends_session),
     };
 
-    /* ============================================================
+    /* GROUP 4: MUC, Carbons (19 tests)
-     * GROUP 4: MUC, Carbons
+     * Multi-user chat and message synchronization */
-     * Multi-user chat and message synchronization
-     * ============================================================ */
     const struct CMUnitTest group4_tests[] = {
+
         /* MUC room join with various options - XEP-0045 */
         PROF_FUNC_TEST(sends_room_join),
         PROF_FUNC_TEST(sends_room_join_with_nick),
@@ -191,31 +188,28 @@ main(int argc, char* argv[])
         PROF_FUNC_TEST(receive_private_carbon),
     };
 
-    /* Test group registry for easy extension */
-    struct {
-        const char* name;
-        const struct CMUnitTest* tests;
-        size_t count;
-    } groups[] = {
-        { "Group 1: Connect/Ping/Rooms/Software", group1_tests, ARRAY_SIZE(group1_tests) },
-        { "Group 2: Message/Receipts/Roster/Session", group2_tests, ARRAY_SIZE(group2_tests) },
-        { "Group 3: Presence/Disconnect", group3_tests, ARRAY_SIZE(group3_tests) },
-        { "Group 4: MUC/Carbons", group4_tests, ARRAY_SIZE(group4_tests) },
-    };
-    const int num_groups = ARRAY_SIZE(groups);
-
     int result = 0;
 
-    if (group > 0 && group <= num_groups) {
+    switch (group) {
-        /* Run specific group */
+        case 1:
-        result = _cmocka_run_group_tests(groups[group - 1].name, groups[group - 1].tests,
+            result = cmocka_run_group_tests_name("Group 1: Connect/Ping/Rooms/Software", group1_tests, NULL, NULL);
-                                         groups[group - 1].count, NULL, NULL);
+            break;
-    } else {
+        case 2:
-        /* Run all groups sequentially */
+            result = cmocka_run_group_tests_name("Group 2: Message/Receipts/Roster/Session", group2_tests, NULL, NULL);
-        for (int i = 0; i < num_groups; i++) {
+            break;
-            result |= _cmocka_run_group_tests(groups[i].name, groups[i].tests,
+        case 3:
-                                              groups[i].count, NULL, NULL);
+            result = cmocka_run_group_tests_name("Group 3: Presence", group3_tests, NULL, NULL);
-        }
+            break;
+        case 4:
+            result = cmocka_run_group_tests_name("Group 4: MUC/Carbons", group4_tests, NULL, NULL);
+            break;
+        default:
+            /* Run all groups sequentially */
+            result |= cmocka_run_group_tests_name("Group 1: Connect/Ping/Rooms/Software", group1_tests, NULL, NULL);
+            result |= cmocka_run_group_tests_name("Group 2: Message/Receipts/Roster/Session", group2_tests, NULL, NULL);
+            result |= cmocka_run_group_tests_name("Group 3: Presence", group3_tests, NULL, NULL);
+            result |= cmocka_run_group_tests_name("Group 4: MUC/Carbons", group4_tests, NULL, NULL);
+            break;
     }
 
     return result;

tests/functionaltests/proftest.h

@@ -2,9 +2,9 @@
 #define __H_PROFTEST
 
 /*
- * XDG paths are dynamic and generated per-test based on stub_port.
+ * XDG paths are now dynamic, generated per-test based on stub_port.
- * Each test instance uses unique directories (./tests/functionaltests/files/{port}/xdg_*)
+ * This allows parallel test execution without file conflicts.
- * to allow parallel test execution without file conflicts.
+ * Use xdg_config_home and xdg_data_home variables instead of macros.
  */
 extern char xdg_config_home[256];
 extern char xdg_data_home[256];