From 016246616870c66f28cc83a52e30a5216d504d1c Mon Sep 17 00:00:00 2001 From: twi-devel Date: Thu, 22 Oct 2026 19:36:19 +0200 Subject: [PATCH] Fix Dockerfile: GID 1001, remove genhtml (included in lcov), cleanup test file Entire-Checkpoint: 0d9a8cfb0768 --- ci/Dockerfile.ci | 9 +- .../tests/test_main.cpp | 88 ------------------- 2 files changed, 4 insertions(+), 93 deletions(-) delete mode 100644 qt6-after/qt6-migrated-benchmark/tests/test_main.cpp diff --git a/ci/Dockerfile.ci b/ci/Dockerfile.ci index 8b2f1a3..afbdd43 100644 --- a/ci/Dockerfile.ci +++ b/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 diff --git a/qt6-after/qt6-migrated-benchmark/tests/test_main.cpp b/qt6-after/qt6-migrated-benchmark/tests/test_main.cpp deleted file mode 100644 index 81e0da8..0000000 --- a/qt6-after/qt6-migrated-benchmark/tests/test_main.cpp +++ /dev/null @@ -1,88 +0,0 @@ -#include "MainWindow.h" - -#include - -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 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 TestMainWindow::testWindowTitle() -{ - MainWindow window; - QCOMPARE(window.windowTitle(), QStringLiteral("Qt6 Legacy Migration Benchmark")); -} - -void TestMainWindow::testValidateInputMethod() -{ - MainWindow window; - - QVERIFY(window.validateInput(QStringLiteral("Test123"))); - QVERIFY(window.validateInput(QStringLiteral("abc456"))); - QVERIFY(!window.validateInput(QStringLiteral("123Test"))); - QVERIFY(!window.validateInput(QStringLiteral(""))); -} - -void TestMainWindow::testGetScreenInfo() -{ - MainWindow window; - QString info = window.getScreenInfo(); - QVERIFY(!info.isEmpty()); - QVERIFY(info.contains(QStringLiteral("Screen:"))); -} - -QTEST_MAIN(TestMainWindow) - -#include "test_main.moc" \ No newline at end of file