refactor: address code review feedback

Makefile.am: - Replace 4 hardcoded parallel commands with loop over FUNC_TEST_GROUPS - Easy to extend by adding group numbers to the variable functionaltests.c: - Remove test counts from comments (prone to becoming outdated) - Restore previous comment style with === separators for readability - Replace switch with groups[] array structure for extensibility proftest.h: - Fix comment to describe current state, not the change made CONTRIBUTING.md: - Document test groups and parallel execution commands - Add instructions for adding new test groups
feat: add code coverage with branch coverage
2026-01-21 15:33:48 +03:00 · 2026-01-19 20:49:37 +03:00 · 2026-01-19 16:38:34 +03:00 · 2026-01-19 16:38:19 +03:00
9 changed files with 8 additions and 146 deletions
--- a/Dockerfile.arch
+++ b/Dockerfile.arch
@@ -13,7 +13,6 @@ RUN pacman -S --needed --noconfirm \
  autoconf-archive \
  automake \
  base-devel \
-  ca-certificates \
  ccache \
  check \
  cmake \
@@ -65,7 +64,7 @@ USER root
 RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst

 WORKDIR /usr/src
-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber

 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  autoconf \
  autoconf-archive \
  automake \
-  ca-certificates \
  ccache \
  gcc \
  git \
@@ -41,8 +40,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
-RUN git clone --depth 1 https://github.com/strophe/libstrophe
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe

 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -11,7 +11,6 @@ RUN dnf install -y \
  autoconf-archive \
  automake \
  awk \
-  ca-certificates \
  ccache \
  gcc \
  git \
@@ -51,7 +50,7 @@ ENV TERM=xterm
 RUN mkdir -p /usr/src
 WORKDIR /usr/src

-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr --disable-dependency-tracking
@@ -60,7 +59,7 @@ RUN make install

 WORKDIR /usr/src
 RUN mkdir -p /usr/src/libstrophe
-RUN git clone --depth 1 https://github.com/strophe/libstrophe
+RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe
 WORKDIR /usr/src/libstrophe
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr
--- a/Dockerfile.tumbleweed
+++ b/Dockerfile.tumbleweed
@@ -10,7 +10,6 @@ RUN zypper --non-interactive in --no-recommends \
  autoconf \
  autoconf-archive \
  automake \
-  ca-certificates \
  ccache \
  gcc \
  git \
@@ -50,7 +49,7 @@ ENV TERM=xterm
 RUN mkdir -p /usr/src
 WORKDIR /usr/src

-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
 RUN ./configure --prefix=/usr --disable-dependency-tracking
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -8,7 +8,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
  autoconf \
  autoconf-archive \
  automake \
-  ca-certificates \
  ccache \
  gcc \
  git \
@@ -40,8 +39,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
 WORKDIR /usr/src

-RUN git clone --depth 1 https://git.jabber.space/devs/stabber
-RUN git clone --depth 1 https://github.com/strophe/libstrophe
+RUN git clone --depth 1 -c http.sslverify=false https://git.jabber.space/devs/stabber
+RUN git clone --depth 1 -c http.sslverify=false https://github.com/strophe/libstrophe

 WORKDIR /usr/src/stabber
 RUN ./bootstrap.sh
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,7 +180,6 @@ functionaltest_sources = \
 	tests/functionaltests/test_message.c tests/functionaltests/test_message.h \
 	tests/functionaltests/test_chat_session.c tests/functionaltests/test_chat_session.h \
 	tests/functionaltests/test_carbons.c tests/functionaltests/test_carbons.h \
-	tests/functionaltests/test_disco.c tests/functionaltests/test_disco.h \
 	tests/functionaltests/test_receipts.c tests/functionaltests/test_receipts.h \
 	tests/functionaltests/test_roster.c tests/functionaltests/test_roster.h \
 	tests/functionaltests/test_software.c tests/functionaltests/test_software.h \
--- a/tests/functionaltests/functionaltests.c
+++ b/tests/functionaltests/functionaltests.c
@@ -47,7 +47,6 @@
 #include "test_message.h"
 #include "test_carbons.h"
 #include "test_chat_session.h"
-#include "test_disco.h"
 #include "test_receipts.h"
 #include "test_roster.h"
 #include "test_software.h"
@@ -99,12 +98,6 @@ main(int argc, char* argv[])
        PROF_FUNC_TEST(display_software_version_result_when_from_domainpart),
        PROF_FUNC_TEST(show_message_in_chat_window_when_no_resource),
        PROF_FUNC_TEST(display_software_version_result_in_chat),
-
-        /* Service Discovery - XEP-0030 */
-        PROF_FUNC_TEST(disco_info_server_on_explicit_request),
-        PROF_FUNC_TEST(disco_items_with_node),
-        PROF_FUNC_TEST(disco_info_error_item_not_found),
-        PROF_FUNC_TEST(no_automatic_disco_after_connect),
    };

    /* ============================================================
--- a/tests/functionaltests/test_disco.c
+++ b/tests/functionaltests/test_disco.c
@@ -1,121 +0,0 @@
-#include <glib.h>
-#include "prof_cmocka.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include <stabber.h>
-
-#include "proftest.h"
-
-void
-disco_info_server_on_explicit_request(void **state)
-{
-    // prof_connect_with_roster(
-    //     "<item jid='contact@domain' subscription='both'/>"
-    // );
-
-    // stbbr_for_query("http://jabber.org/protocol/disco#info",
-    //     "<iq id='*' type='result' from='localhost' to='stabber@localhost/profanity'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#info'>"
-    //             "<identity category='server' type='im'/>"
-    //             "<feature var='http://jabber.org/protocol/disco#info'/>"
-    //             "<feature var='http://jabber.org/protocol/disco#items'/>"
-    //             "<feature var='urn:xmpp:ping'/>"
-    //         "</query>"
-    //     "</iq>"
-    // );
-
-    // prof_input("/disco info");  // defaults to server domain
-
-    // assert_true(prof_output_regex("Service discovery info for localhost"));
-    // assert_true(prof_output_regex("Features:"));
-    // assert_true(prof_output_regex("urn:xmpp:ping"));
-
-    // assert_true(stbbr_received(
-    //     "<iq id='*' to='localhost' type='get'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#info'/>"
-    //     "</iq>"
-    // ));
-}
-
-
-void
-disco_items_with_node(void **state)
-{
-    // prof_connect_with_roster(
-    //     "<item jid='contact@domain' subscription='both'/>"
-    // );
-
-    // stbbr_for_query("http://jabber.org/protocol/disco#items",
-    //     "<iq id='*' type='result' from='pubsub.localhost' to='stabber@localhost/profanity'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#items' node='http://jabber.org/protocol/tune'>"
-    //             "<item jid='pubsub.localhost' node='http://example.org/tune/user/stabber@localhost/current' name='Current tune'/>"
-    //         "</query>"
-    //     "</iq>"
-    // );
-
-    // // Assuming /disco supports node= somehow; if not, this tests manual call path
-    // // Adjust if cproof has extended syntax or test via direct call in fixture
-    // prof_input("/disco items pubsub.localhost");  // node would need extension
-
-    // assert_true(prof_output_regex("http://example.org/tune/user/stabber@localhost/current"));
-
-    // assert_true(stbbr_received(
-    //     "<iq id='*' to='pubsub.localhost' type='get'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#items'/>"
-    //     "</iq>"
-    // ));
-}
-
-
-void
-disco_info_error_item_not_found(void **state)
-{
-    // prof_connect_with_roster(
-    //     "<item jid='contact@domain' subscription='both'/>"
-    // );
-
-    // stbbr_for_query("http://jabber.org/protocol/disco#info",
-    //     "<iq id='*' type='error' from='ghost.service' to='stabber@localhost/profanity'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#info'/>"
-    //         "<error type='cancel'>"
-    //             "<item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>"
-    //         "</error>"
-    //     "</iq>"
-    // );
-
-    // prof_input("/disco info ghost.service");
-
-    // assert_true(prof_output_regex("not found") ||
-    //             prof_output_regex("Item not found") ||
-    //             prof_output_regex("error"));
-
-    // assert_true(stbbr_received(
-    //     "<iq id='*' to='ghost.service' type='get'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#info'/>"
-    //     "</iq>"
-    // ));
-}
-
-
-void
-no_automatic_disco_after_connect(void **state)
-{
-    // prof_connect_with_roster(
-    //     "<item jid='contact@domain' subscription='both'/>"
-    // );
-
-    // // After connect + roster + initial presence, assert *no* disco#* IQ was sent
-    // // except possibly to own bare JID or server — but according to code, none auto
-    // assert_false(stbbr_received(
-    //     "<iq id='*' type='get'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#info'/>"
-    //     "</iq>"
-    // ));
-
-    // assert_false(stbbr_received(
-    //     "<iq id='*' type='get'>"
-    //         "<query xmlns='http://jabber.org/protocol/disco#items'/>"
-    //     "</iq>"
-    // ));
-}
--- a/tests/functionaltests/test_disco.h
+++ b/tests/functionaltests/test_disco.h
@@ -1,4 +0,0 @@
-void disco_info_server_on_explicit_request(void** state);
-void disco_items_with_node(void** state);
-void disco_info_error_item_not_found(void** state);
-void no_automatic_disco_after_connect(void** state);
Author	SHA1	Message	Date
jabber.developer2	56ede1b45f	refactor: address code review feedback All checks were successful CI Code / Check coding style (pull_request) Successful in 32s Details CI Code / Check spelling (pull_request) Successful in 18s Details CI Code / Linux (debian) (pull_request) Successful in 16m1s Details CI Code / Linux (arch) (pull_request) Successful in 21m7s Details CI Code / Linux (ubuntu) (pull_request) Successful in 16m24s Details CI Code / Code Coverage (pull_request) Successful in 15m23s Details Makefile.am: - Replace 4 hardcoded parallel commands with loop over FUNC_TEST_GROUPS - Easy to extend by adding group numbers to the variable functionaltests.c: - Remove test counts from comments (prone to becoming outdated) - Restore previous comment style with === separators for readability - Replace switch with groups[] array structure for extensibility proftest.h: - Fix comment to describe current state, not the change made CONTRIBUTING.md: - Document test groups and parallel execution commands - Add instructions for adding new test groups	2026-01-21 15:33:48 +03:00
jabber.developer2	49b552dcb1	feat: add code coverage with branch coverage All checks were successful CI Code / Check spelling (pull_request) Successful in 21s Details CI Code / Check coding style (pull_request) Successful in 35s Details CI Code / Code Coverage (pull_request) Successful in 15m31s Details CI Code / Linux (debian) (pull_request) Successful in 16m1s Details CI Code / Linux (arch) (pull_request) Successful in 16m11s Details CI Code / Linux (ubuntu) (pull_request) Successful in 18m24s Details - Add --enable-coverage configure option - Add lcov targets for generating coverage reports - Enable branch coverage (--rc branch_coverage=1) - Install lcov in all Docker images - Coverage report displayed via lcov --summary (no Codecov - doesn't work with Gitea)	2026-01-19 20:49:37 +03:00
jabber.developer2	5a34a4a1d3	perf: optimize CI build performance - Add -C flag to configure for caching - Use ccache for faster recompilation	2026-01-19 16:38:34 +03:00
jabber.developer2	cb2cd1bbf2	feat: parallel functional tests (~3x faster CI) - Split 69 functional tests into 4 groups for parallel execution - Add check-functional-parallel target to Makefile.am - Fix VPATH builds with $(srcdir)/tests path - Add test failure detection verification in CI - Update Dockerfiles with parallel make -j$(nproc) - Add --depth 1 for faster git clone in Dockerfiles	2026-01-19 16:38:19 +03:00