Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 添加单元测试用例

Browse Source 
添加单元测试用例，用于测试任务栏在5.3.0.2版本时，开启缩放后，启动器打开时位置和任务栏有重叠的现象，5.3.0.5版本修复了这个问题

Log: 添加单元测试用例
Change-Id: I826d55739beb2083d7427dbb8c9caf14d3d53760
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3422
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
This commit is contained in:
范朋程 2020-09-04 18:25:42 +08:00 committed by fanpengcheng
parent 1067a0fe95
commit 239cfc2861
3 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/CMakeLists.txt
View File

@ -19,7 +19,7 @@ pkg_check_modules(QGSettings REQUIRED gsettings-qt)
add_executable(${BIN_NAME} ${SRCS} ${INTERFACES})
# 包含路径
target_include_directories(${BIN_NAME} PUBLIC ${DFrameworkDBus_INCLUDE_DIRS})
target_include_directories(${BIN_NAME} PUBLIC ${DFrameworkDBus_INCLUDE_DIRS} ../../interfaces)
# 链接库
target_link_libraries(${BIN_NAME} PRIVATE

62
unittest/dock_unit_test.cpp
View File

@ -25,21 +25,53 @@
#include <QDBusMessage>
#include <QDBusArgument>
#include <QGSettings/QGSettings>
#include <QThread>
#include <com_deepin_daemon_display.h>
#include <com_deepin_dde_daemon_dock.h>
#include "dock_unit_test.h"
using DBusDock = com::deepin::dde::daemon::Dock;
#define SLEEP1 QThread::sleep(1);
DockUnitTest::DockUnitTest()
: m_dockInter(new QDBusInterface("com.deepin.dde.Dock", "/com/deepin/dde/Dock", "org.freedesktop.DBus.Properties"))
, m_daemonDockInter(new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this))
{
qDBusRegisterMetaType<ScreenRect>();
}
DockUnitTest::~DockUnitTest()
{
delete m_dockInter;
delete m_daemonDockInter;
}
const DockRect DockUnitTest::dockGeometry()
{
DockRect dockRect;
QDBusInterface inter("com.deepin.dde.Dock", "/com/deepin/dde/Dock", "org.freedesktop.DBus.Properties");
QString interface = "com.deepin.dde.Dock";
QString arg = "geometry";
QDBusMessage msg = inter.call("Get", interface, arg);
QVariant var = msg.arguments().first();
QDBusVariant dbvFirst = var.value<QDBusVariant>();
QVariant vFirst = dbvFirst.variant();
QDBusArgument dbusArgs = vFirst.value<QDBusArgument>();
dbusArgs >> dockRect;
return dockRect;
}
const DockRect DockUnitTest::frontendWindowRect()
{
DBusDock dockInter("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
return dockInter.frontendWindowRect();
}
void DockUnitTest::setPosition(Dock::Position pos)
{
m_daemonDockInter->setPosition(pos);
}
/**
* @brief DockUnitTest::dock_geometry_test 比较任务栏自身的位置和通知给后端的位置是否吻合
@ -151,7 +183,33 @@ void DockUnitTest::dock_appItemCount_check()
for (auto inter : dockInter->entries()) {
qDebug() << inter.path();
}
}
/**
* @brief DockUnitTest::dock_frontWindowRect_check
* 原理：将任务栏设置为一直显示模式，然后切换四个位置，查看其frontendWindowRect与实际位置是否一致．
* 前提条件：　开启系统缩放(大于１即可)
* Tips:　任务栏在副屏时，frontendWindowRect对应的是上一次在主屏设置过的值．
* 可测出问题：任务栏在5.3.0.2版本时，开启缩放后，启动器打开时位置和任务栏有重叠，5.3.0.5版本修复了这个问题
* 对应Bug: https://pms.uniontech.com/zentao/bug-view-42095.html
*/
void DockUnitTest::dock_frontWindowRect_check()
{
setPosition(Dock::Position::Top);
SLEEP1;
QVERIFY(dockGeometry() == frontendWindowRect());
setPosition(Dock::Position::Right);
SLEEP1;
QVERIFY(dockGeometry() == frontendWindowRect());
setPosition(Dock::Position::Bottom);
SLEEP1;
QVERIFY(dockGeometry() == frontendWindowRect());
setPosition(Dock::Position::Left);
SLEEP1;
QVERIFY(dockGeometry() == frontendWindowRect());
}
/**

16
unittest/dock_unit_test.h
View File

@ -22,6 +22,12 @@
#define DOCK_UNIT_TEST_H
#include <QObject>
#include <com_deepin_dde_daemon_dock.h>
#include "../interfaces/constants.h"
using DBusDock = com::deepin::dde::daemon::Dock;
class DockUnitTest : public QObject
{
Q_OBJECT
@ -30,12 +36,22 @@ public:
DockUnitTest();
~DockUnitTest();
private:
QDBusInterface *m_dockInter;
DBusDock *m_daemonDockInter;
private:
const DockRect dockGeometry(); // 获取任务栏实际位置
const DockRect frontendWindowRect(); // 后端记录的任务栏前端界面位置(和实际位置不一定对应)
void setPosition(Dock::Position pos);
private slots:
void dock_geometry_check(); // 显示区域
void dock_position_check(); // 位置检查
void dock_displayMode_check(); // 显示模式检查
void dock_appItemCount_check(); // 应用显示数量检查
void dock_defaultVolume_Check(float defaultVolume = 50.0f); // 设备默认音量检查
void dock_frontWindowRect_check(); // 检查FrontendWindowRect接口数据是否正确
};
#endif // DOCK_UNIT_TEST_H