Merge pull request 'Feature/integrate jenkins code coverage' (#4) from feature/integrate-jenkins-code-coverage into main

Reviewed-on: #4

Jenkinsfile

@@ -1,10 +1,5 @@
 pipeline {
-  agent {
-    docker {
-      image 'lifemaps/ci-cpp:latest'
-      reuseNode true
-    }
-  }
+  agent none
 
   options {
     timestamps()
@@ -19,106 +14,133 @@ pipeline {
     QT_QPA_PLATFORM = "offscreen"
     LANG = "C.UTF-8"
     LC_ALL = "C.UTF-8"
+    DOCKER_IMAGE = "lifemaps/ci-cpp:latest"
   }
 
   stages {
-    stage('Cleanup') {
+    stage('Docker Image') {
+      agent any
       steps {
         script {
-          echo "Cleaning workspace to avoid corruption issues..."
-          // Use shell command with chmod to handle permission issues
-          sh '''
-            if [ -d "${WORKSPACE}/${BUILD_DIR}" ]; then
-              echo "Removing build directory with permission fix..."
-              chmod -R u+w "${WORKSPACE}/${BUILD_DIR}" 2>/dev/null || true
-              rm -rf "${WORKSPACE}/${BUILD_DIR}"
-            fi
-            if [ -d "${WORKSPACE}/${COVERAGE_BUILD_DIR}" ]; then
-              echo "Removing coverage build directory..."
-              chmod -R u+w "${WORKSPACE}/${COVERAGE_BUILD_DIR}" 2>/dev/null || true
-              rm -rf "${WORKSPACE}/${COVERAGE_BUILD_DIR}"
-            fi
-            if [ -d "${WORKSPACE}/coverage" ]; then
-              echo "Removing coverage output directory..."
-              chmod -R u+w "${WORKSPACE}/coverage" 2>/dev/null || true
-              rm -rf "${WORKSPACE}/coverage"
-            fi
-          '''
+          echo "Checking if Docker image exists locally..."
+          def imageExists = sh(script: "docker inspect ${DOCKER_IMAGE} >/dev/null 2>&1", returnStatus: true) == 0
+          if (!imageExists) {
+            echo "Docker image not found. Building from ci/Dockerfile.ci..."
+            sh 'docker build -t ${DOCKER_IMAGE} -f ci/Dockerfile.ci .'
+          } else {
+            echo "Docker image ${DOCKER_IMAGE} found locally."
+          }
         }
       }
     }
 
-    stage('Checkout') {
-      steps {
-        checkout scm
-        sh 'git fetch --all --prune'
-        sh 'git submodule update --init --recursive || true'
-      }
-    }
-
-    stage('Tool Versions') {
-      steps {
-        sh '''
-          python3 --version
-          cmake --version
-          ninja --version
-          g++ --version
-        '''
-      }
-    }
-
-    stage('Qt Diagnostics') {
-      steps {
-        sh '''
-          echo "QT_QPA_PLATFORM=$QT_QPA_PLATFORM"
-          echo "LANG=$LANG"
-          echo "LC_ALL=$LC_ALL"
-          dpkg -l | grep -E "qt6-base-dev|qtbase5-dev|qt6-tools" || true
-          pkg-config --list-all | grep -i qt || true
-        '''
-      }
-    }
-
-    stage('Policy Checks') {
-      steps {
-        sh 'python3 ci/check_pr_policies.py'
-      }
-    }
-
-    stage('Configure') {
-      steps {
-        sh 'cmake -S ${PROJECT_DIR} -B ${BUILD_DIR} -G Ninja -DCMAKE_BUILD_TYPE=Debug'
-      }
-    }
-
-    stage('Build') {
-      steps {
-        sh 'cmake --build ${BUILD_DIR} --parallel'
-      }
-    }
-
-    stage('Test') {
-      steps {
-        sh 'QT_QPA_PLATFORM=offscreen LANG=C.UTF-8 LC_ALL=C.UTF-8 ctest --test-dir ${BUILD_DIR} --output-on-failure'
-      }
-    }
-
-    stage('Coverage') {
-      when {
-        expression {
-          return env.BRANCH_NAME ==~ /main|master|coverage.*/
+    stage('Build and Test') {
+      agent {
+        docker {
+          image 'lifemaps/ci-cpp:latest'
+          reuseNode true
         }
       }
-      steps {
-        echo "Running coverage collection..."
-        sh '''
-          ${PROJECT_DIR}/scripts/collect-coverage.sh ${WORKSPACE}/${COVERAGE_BUILD_DIR}
-        '''
-      }
-      post {
-        always {
-          publishCoverage adapters: [lcovAdapter(mergeToOneReport: true, reportFile: 'coverage/lcov.info')],
-                        sourceFileResolver: sourceFiles('STORE_LAST_BUILD')
+      stages {
+        stage('Cleanup') {
+          steps {
+            script {
+              echo "Cleaning workspace to avoid corruption issues..."
+              sh '''
+                if [ -d "${WORKSPACE}/${BUILD_DIR}" ]; then
+                  echo "Removing build directory with permission fix..."
+                  chmod -R u+w "${WORKSPACE}/${BUILD_DIR}" 2>/dev/null || true
+                  rm -rf "${WORKSPACE}/${BUILD_DIR}"
+                fi
+                if [ -d "${WORKSPACE}/${COVERAGE_BUILD_DIR}" ]; then
+                  echo "Removing coverage build directory..."
+                  chmod -R u+w "${WORKSPACE}/${COVERAGE_BUILD_DIR}" 2>/dev/null || true
+                  rm -rf "${WORKSPACE}/${COVERAGE_BUILD_DIR}"
+                fi
+                if [ -d "${WORKSPACE}/coverage" ]; then
+                  echo "Removing coverage output directory..."
+                  chmod -R u+w "${WORKSPACE}/coverage" 2>/dev/null || true
+                  rm -rf "${WORKSPACE}/coverage"
+                fi
+              '''
+            }
+          }
+        }
+
+        stage('Checkout') {
+          steps {
+            checkout scm
+            sh 'git fetch --all --prune'
+            sh 'git submodule update --init --recursive || true'
+          }
+        }
+
+        stage('Tool Versions') {
+          steps {
+            sh '''
+              python3 --version
+              cmake --version
+              ninja --version
+              g++ --version
+            '''
+          }
+        }
+
+        stage('Qt Diagnostics') {
+          steps {
+            sh '''
+              echo "QT_QPA_PLATFORM=$QT_QPA_PLATFORM"
+              echo "LANG=$LANG"
+              echo "LC_ALL=$LC_ALL"
+              dpkg -l | grep -E "qt6-base-dev|qtbase5-dev|qt6-tools" || true
+              pkg-config --list-all | grep -i qt || true
+            '''
+          }
+        }
+
+        stage('Policy Checks') {
+          steps {
+            sh 'python3 ci/check_pr_policies.py'
+          }
+        }
+
+        stage('Configure') {
+          steps {
+            sh 'cmake -S ${PROJECT_DIR} -B ${BUILD_DIR} -G Ninja -DCMAKE_BUILD_TYPE=Debug'
+          }
+        }
+
+        stage('Build') {
+          steps {
+            sh 'cmake --build ${BUILD_DIR} --parallel'
+          }
+        }
+
+        stage('Test') {
+          steps {
+            sh 'QT_QPA_PLATFORM=offscreen LANG=C.UTF-8 LC_ALL=C.UTF-8 ctest --test-dir ${BUILD_DIR} --output-on-failure'
+          }
+        }
+
+        stage('Coverage') {
+          when {
+            expression {
+              def branch = env.CHANGE_BRANCH ?: env.BRANCH_NAME
+              return branch ==~ /main|master|coverage.*|feature.*/
+            }
+          }
+          steps {
+            echo "Running coverage collection..."
+            sh '''
+              ${PROJECT_DIR}/scripts/collect-coverage.sh ${WORKSPACE}/${COVERAGE_BUILD_DIR}
+            '''
+          }
+          post {
+            always {
+              recordCoverage tools: [[parser: 'LCOV', pattern: "${PROJECT_DIR}/coverage/lcov.info"]],
+                             sourceCodeRetention: 'LAST_BUILD'
+            }
+          }
         }
       }
     }
@@ -128,7 +150,6 @@ pipeline {
     always {
       script {
         if (getContext(hudson.FilePath)) {
-          // Use shell command with chmod to handle permission issues
           sh '''
             if [ -d "${WORKSPACE}/${BUILD_DIR}" ]; then
               echo "Final cleanup: Removing build directory..."

ci/Dockerfile.ci

@@ -2,9 +2,9 @@ FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Create jenkins user with same UID as host jenkins (typically 1000)
-RUN groupadd -g 1000 jenkins && \
-    useradd -u 1000 -g 1000 -m -s /bin/bash jenkins
+# Create jenkins user (UID 1001 to avoid conflicts with existing users)
+RUN groupadd -g 1001 jenkins && \
+    useradd -u 1001 -g 1001 -m -s /bin/bash jenkins
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
@@ -23,8 +23,7 @@ RUN apt-get update && \
       qt6-base-dev-tools \
       qt6-tools-dev \
       qt6-tools-dev-tools \
-      lcov \
-      genhtml && \
+      lcov && \
     rm -rf /var/lib/apt/lists/*
 
 # Set Qt platform for headless testing

qt6-after/qt6-migrated-benchmark/CMakeLists.txt

@@ -60,7 +60,6 @@ enable_testing()
 
 # Add test executable
 add_executable(Qt6MigratedBenchmarkTest
-    tests/test_main.cpp
     tests/test_mainwindow.cpp
     MainWindow.h
     MainWindow.cpp

qt6-after/qt6-migrated-benchmark/scripts/collect-coverage.sh

@@ -72,7 +72,7 @@ lcov --remove "${COVERAGE_DIR}/coverage.info" \
      '*/Qt6/*' \
      '*/qt6-migrated-benchmark/tests/*' \
      --output-file "${COVERAGE_DIR}/coverage.filtered.info" \
-     --ignore-errors mismatch \
+     --ignore-errors mismatch,unused \
      --rc lcov_branch_coverage=1
 
 # Generate HTML report

qt6-after/qt6-migrated-benchmark/tests/test_main.cpp

@@ -1,52 +0,0 @@
-#include <QtTest/QtTest>
-
-class TestMainWindow : public QObject
-{
-    Q_OBJECT
-
-  private slots:
-    void testValidateInputValid();
-    void testValidateInputInvalid();
-    void testValidateInputEmpty();
-    void testValidateInputMixedCase();
-};
-
-void TestMainWindow::testValidateInputValid()
-{
-    // Test valid input patterns
-    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
-
-    QVERIFY(pattern.match("Test123").hasMatch());
-    QVERIFY(pattern.match("abc456").hasMatch());
-    QVERIFY(pattern.match("ABC789").hasMatch());
-}
-
-void TestMainWindow::testValidateInputInvalid()
-{
-    // Test invalid input patterns
-    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
-
-    QVERIFY(!pattern.match("123Test").hasMatch());
-    QVERIFY(!pattern.match("Test").hasMatch());
-    QVERIFY(!pattern.match("123").hasMatch());
-    QVERIFY(!pattern.match("Test123ABC").hasMatch());
-    QVERIFY(!pattern.match("Test-123").hasMatch());
-}
-
-void TestMainWindow::testValidateInputEmpty()
-{
-    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
-    QVERIFY(!pattern.match("").hasMatch());
-}
-
-void TestMainWindow::testValidateInputMixedCase()
-{
-    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
-
-    QVERIFY(pattern.match("TeSt123").hasMatch());
-    QVERIFY(pattern.match("aBcDeF999").hasMatch());
-}
-
-QTEST_MAIN(TestMainWindow)
-
-#include "test_main.moc"

qt6-after/qt6-migrated-benchmark/tests/test_mainwindow.cpp

@@ -1,49 +1,88 @@
 #include "MainWindow.h"
 
-#include <QApplication>
 #include <QtTest/QtTest>
 
-class TestMainWindowWidget : public QObject
+class TestMainWindow : public QObject
 {
     Q_OBJECT
 
   private slots:
+    void testValidateInputValid();
+    void testValidateInputInvalid();
+    void testValidateInputEmpty();
+    void testValidateInputMixedCase();
     void testMainWindowCreation();
     void testWindowTitle();
     void testValidateInputMethod();
     void testGetScreenInfo();
 };
 
-void TestMainWindowWidget::testMainWindowCreation()
+void TestMainWindow::testValidateInputValid()
+{
+    // Test valid input patterns
+    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
+
+    QVERIFY(pattern.match("Test123").hasMatch());
+    QVERIFY(pattern.match("abc456").hasMatch());
+    QVERIFY(pattern.match("ABC789").hasMatch());
+}
+
+void TestMainWindow::testValidateInputInvalid()
+{
+    // Test invalid input patterns
+    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
+
+    QVERIFY(!pattern.match("123Test").hasMatch());
+    QVERIFY(!pattern.match("Test").hasMatch());
+    QVERIFY(!pattern.match("123").hasMatch());
+    QVERIFY(!pattern.match("Test123ABC").hasMatch());
+    QVERIFY(!pattern.match("Test-123").hasMatch());
+}
+
+void TestMainWindow::testValidateInputEmpty()
+{
+    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
+    QVERIFY(!pattern.match("").hasMatch());
+}
+
+void TestMainWindow::testValidateInputMixedCase()
+{
+    QRegularExpression pattern(R"(^[A-Za-z]+\d+$)");
+
+    QVERIFY(pattern.match("TeSt123").hasMatch());
+    QVERIFY(pattern.match("aBcDeF999").hasMatch());
+}
+
+void TestMainWindow::testMainWindowCreation()
 {
     MainWindow window;
     QVERIFY(!window.windowTitle().isEmpty());
 }
 
-void TestMainWindowWidget::testWindowTitle()
+void TestMainWindow::testWindowTitle()
 {
     MainWindow window;
-    QCOMPARE(window.windowTitle(), u"Qt6 Legacy Migration Benchmark"_s);
+    QCOMPARE(window.windowTitle(), QStringLiteral("Qt6 Legacy Migration Benchmark"));
 }
 
-void TestMainWindowWidget::testValidateInputMethod()
+void TestMainWindow::testValidateInputMethod()
 {
     MainWindow window;
 
-    QVERIFY(window.validateInput(u"Test123"_s));
-    QVERIFY(window.validateInput(u"abc456"_s));
-    QVERIFY(!window.validateInput(u"123Test"_s));
-    QVERIFY(!window.validateInput(u""_s));
+    QVERIFY(window.validateInput(QStringLiteral("Test123")));
+    QVERIFY(window.validateInput(QStringLiteral("abc456")));
+    QVERIFY(!window.validateInput(QStringLiteral("123Test")));
+    QVERIFY(!window.validateInput(QStringLiteral("")));
 }
 
-void TestMainWindowWidget::testGetScreenInfo()
+void TestMainWindow::testGetScreenInfo()
 {
     MainWindow window;
     QString info = window.getScreenInfo();
     QVERIFY(!info.isEmpty());
-    QVERIFY(info.contains(u"Screen:"_s));
+    QVERIFY(info.contains(QStringLiteral("Screen:")));
 }
 
-QTEST_MAIN(TestMainWindowWidget)
+QTEST_MAIN(TestMainWindow)
 
 #include "test_mainwindow.moc"