Skip to content

Commit 347dcf1

Browse files
pengfeixxpengfeixx
committed
test: migrate unit tests from Qt5 to Qt6
Adapt build scripts, .pro files, and test code for Qt6 compatibility. 将单元测试从Qt5迁移适配到Qt6，包括构建脚本、工程文件及测试代码。 Log: 单元测试Qt5迁移至Qt6适配 Influence: 所有单元测试模块构建系统切换至Qt6，涉及deprecated API替换（QDesktopWidget、QCameraInfo等），ut_screen_shot_recorder因依赖libcam Qt6适配而临时禁用。
1 parent 651423f commit 347dcf1

28 files changed

Lines changed: 269 additions & 255 deletions

‎tests/test-prj-running.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
3+
# SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
44
#
55
# SPDX-License-Identifier: GPL-3.0-or-later
66

@@ -13,6 +13,7 @@ cppcheck --enable=all --output-file=../build-ut/cppcheck_deepin-screen-recorder.
1313
cppcheck --enable=all --output-file=../build-ut/cppcheck_dde-dock-plugins.xml --xml ../dde-dock-plugins/
1414

1515
./ut_dde_dock_plugins/build_run_ut.sh
16-
./ut_screen_shot_recorder/build_run_ut.sh
16+
# TODO: ut_screen_shot_recorder 需要 3rdparty/libcam 等生产代码完成 Qt6 适配后再启用
17+
#./ut_screen_shot_recorder/build_run_ut.sh
1718

1819
exit 0

‎tests/ut_dde_dock_plugins/ut_record_time/build_run_ut.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
3+
# SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
44
#
55
# SPDX-License-Identifier: GPL-3.0-or-later
66

@@ -12,8 +12,8 @@ mkdir ./ut_dde_dock_plugins/ut_record_time/build-ut
1212

1313
cd ./ut_dde_dock_plugins/ut_record_time/build-ut
1414
pwd
15-
export QT_SELECT=qt5
16-
qmake ../
15+
export QT_SELECT=qt6
16+
qmake6 ../
1717
make -j4
1818

1919
workdir=$(cd ../$(dirname $0)/build-ut; pwd)

‎tests/ut_dde_dock_plugins/ut_record_time/ut_mock_stub_recordtimeplugin.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -19,6 +19,8 @@ class TestRecordTimePlugin : public testing::Test
1919
{
2020
m_recordTimePlugin.reset(new RecordTimePlugin());
2121
m_recordTimePlugin->init(&mock_proxy);
22+
if (!m_recordTimePlugin->m_timeWidget)
23+
m_recordTimePlugin->m_timeWidget = new TimeWidget();
2224
}
2325
void TearDown() override
2426
{
@@ -60,7 +62,7 @@ TEST_F(TestRecordTimePlugin, onStart)
6062

6163
TEST_F(TestRecordTimePlugin, onStop)
6264
{
63-
m_recordTimePlugin->m_checkTimer = new QTimer();
65+
m_recordTimePlugin->m_timer = new QTimer();
6466
emit m_recordTimePlugin->m_dBusService->stop();
6567
}
6668

‎tests/ut_dde_dock_plugins/ut_record_time/ut_record_time.pro‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QT += core widgets dbus
22
CONFIG += c++11 plugin link_pkgconfig
3-
PKGCONFIG += dtkgui dtkwidget
3+
PKGCONFIG += dtk6gui dtk6widget
44
include(../../../3rdparty/stub_linux/stub.pri)
55

66
TARGET = ut_record_time
@@ -28,13 +28,15 @@ equals(TSAN_TOOL_ENABLE, true ){
2828
HEADERS += \
2929
ut_mock_pluginproxyinterface.h \
3030
../../../src/dde-dock-plugins/recordtime/timewidget.h \
31+
../../../src/dde-dock-plugins/recordtime/timewidget_interface.h \
3132
../../../src/dde-dock-plugins/recordtime/dbusservice.h \
3233
../../../src/dde-dock-plugins/recordtime/recordtimeplugin.h
3334

3435
SOURCES += \
3536
main.cpp \
3637
../../../src/dde-dock-plugins/recordtime/recordtimeplugin.cpp \
3738
../../../src/dde-dock-plugins/recordtime/timewidget.cpp \
39+
../../../src/dde-dock-plugins/recordtime/timewidget_interface.cpp \
3840
../../../src/dde-dock-plugins/recordtime/dbusservice.cpp \
3941
ut_mock_stub_recordtimeplugin.cpp \
4042
ut_timewidget.cpp \

‎tests/ut_dde_dock_plugins/ut_record_time/ut_timewidget.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
1+
// SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
22
//
33
// SPDX-License-Identifier: GPL-3.0-or-later
44

@@ -19,7 +19,7 @@ ACCESS_PRIVATE_FUN(TimeWidget, void(QMouseEvent *e), mouseMoveEvent);
1919
ACCESS_PRIVATE_FUN(TimeWidget, void(QEvent *e), leaveEvent);
2020
ACCESS_PRIVATE_FUN(TimeWidget, void(), onTimeout);
2121
ACCESS_PRIVATE_FUN(TimeWidget, void(int), onPositionChanged);
22-
ACCESS_PRIVATE_FUN(TimeWidget, void(), createCacheFile);
22+
ACCESS_PRIVATE_FUN(TimeWidget, bool(), createCacheFile);
2323

2424
ACCESS_PRIVATE_FIELD(TimeWidget, int, m_position)
2525
ACCESS_PRIVATE_FIELD(TimeWidget, QPixmap, m_pixmap)
@@ -94,30 +94,30 @@ TEST_F(TestTimeWidget, paintEvent)
9494

9595
TEST_F(TestTimeWidget, mousePressEvent)
9696
{
97-
QMouseEvent *ev = new QMouseEvent(QEvent::MouseButtonPress, QPoint(-10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
97+
QMouseEvent *ev = new QMouseEvent(QEvent::MouseButtonPress, QPoint(-10, 10), QPoint(-10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
9898
access_private_field::TimeWidgetm_position(*m_timeWidget) = 0;
9999
call_private_fun::TimeWidgetmousePressEvent(*m_timeWidget, ev);
100100
delete ev;
101101
}
102102

103103
TEST_F(TestTimeWidget, mouseReleaseEvent)
104104
{
105-
QMouseEvent *ev = new QMouseEvent(QEvent::MouseButtonRelease, QPoint(10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
105+
QMouseEvent *ev = new QMouseEvent(QEvent::MouseButtonRelease, QPoint(10, 10), QPoint(10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
106106
call_private_fun::TimeWidgetmouseReleaseEvent(*m_timeWidget, ev);
107107
delete ev;
108108
}
109109

110110
TEST_F(TestTimeWidget, mouseMoveEvent)
111111
{
112-
QMouseEvent *ev = new QMouseEvent(QEvent::MouseMove, QPoint(10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
112+
QMouseEvent *ev = new QMouseEvent(QEvent::MouseMove, QPoint(10, 10), QPoint(10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
113113
call_private_fun::TimeWidgetmouseMoveEvent(*m_timeWidget, ev);
114114
delete ev;
115115
}
116116

117117

118118
TEST_F(TestTimeWidget, leaveEvent)
119119
{
120-
QEvent *ev = new QMouseEvent(QEvent::MouseMove, QPoint(10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
120+
QEvent *ev = new QMouseEvent(QEvent::MouseMove, QPoint(10, 10), QPoint(10, 10), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
121121
call_private_fun::TimeWidgetleaveEvent(*m_timeWidget, ev);
122122
delete ev;
123123
}

‎tests/ut_dde_dock_plugins/ut_shot_start/build_run_ut.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
3+
# SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
44
#
55
# SPDX-License-Identifier: GPL-3.0-or-later
66

@@ -15,8 +15,8 @@ cd ./ut_dde_dock_plugins/ut_shot_start/build-ut
1515
mkdir -p html
1616
mkdir -p report
1717

18-
export QT_SELECT=qt5
19-
qmake ../
18+
export QT_SELECT=qt6
19+
qmake6 ../
2020
make -j4
2121

2222
executable=ut_shot_start #可执行程序的文件名

‎tests/ut_dde_dock_plugins/ut_shot_start/ut_shot_start.pro‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
QT += core widgets dbus testlib
22
CONFIG += c++11 plugin link_pkgconfig
3-
PKGCONFIG += dtkgui dtkwidget
3+
PKGCONFIG += dtk6gui dtk6widget
44
DEFINES += UNIT_TEST
55

6-
include(../../../3rdparty/stub_linux/stub.pri)s
6+
include(../../../3rdparty/stub_linux/stub.pri)
77

88
TARGET = ut_shot_start
99

‎tests/ut_dde_dock_plugins/ut_shot_start_record/build_run_ut.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
3+
# SPDX-FileCopyrightText: 2022-2026 UnionTech Software Technology Co., Ltd.
44
#
55
# SPDX-License-Identifier: GPL-3.0-or-later
66

@@ -15,8 +15,8 @@ cd ./ut_dde_dock_plugins/ut_shot_start_record/build-ut
1515
mkdir -p html
1616
mkdir -p report
1717

18-
export QT_SELECT=qt5
19-
qmake ../
18+
export QT_SELECT=qt6
19+
qmake6 ../
2020
make -j4
2121

2222
executable=ut_shot_start_record #可执行程序的文件名

‎tests/ut_dde_dock_plugins/ut_shot_start_record/ut_shot_start_record.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QT += core widgets dbus testlib
22
CONFIG += c++11 plugin link_pkgconfig
3-
PKGCONFIG += dtkgui dtkwidget
3+
PKGCONFIG += dtk6gui dtk6widget
44
DEFINES += UNIT_TEST
55

66
include(../../../3rdparty/stub_linux/stub.pri)

‎tests/ut_pin_screenshots/ut_pin_screenshots.pro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
QT += core widgets dbus
88
CONFIG += c++11 plugin link_pkgconfig
9-
PKGCONFIG += dtkgui dtkwidget
9+
PKGCONFIG += dtk6gui dtk6widget
1010
include(../../3rdparty/stub_linux/stub.pri)
1111

1212
TARGET = ut_pin_screenshots

0 commit comments

Comments
 (0)