Merge branch 'uos' of ssh://gerrit.uniontech.com:29418/dde-dock into maintain/5.1

Change-Id: I6cc7fe48158807c9fcf2bd633310316308f7b0aa

frame/main.cpp

@@ -26,7 +26,7 @@
 
 #include <QAccessible>
 #include <QDir>
-
+#include <QStandardPaths>
 #include <DApplication>
 #include <DLog>
 #include <DDBusSender>
@@ -34,8 +34,14 @@
 
 #include <unistd.h>
 #include "dbus/dbusdockadaptors.h"
+#include <string>
 
 #include <sys/mman.h>
+#include <stdio.h>
+#include <time.h>
+#include <execinfo.h>
+#include <sys/stat.h>
+#include <signal.h>
 
 DWIDGET_USE_NAMESPACE
 #ifdef DCORE_NAMESPACE
@@ -64,12 +70,100 @@ void RegisterDdeSession()
         qDebug() << Q_FUNC_INFO << r.value();
     }
 }
+const int MAX_STACK_FRAMES = 128;
+
+using namespace std;
+
+void sig_crash(int sig)
+{
+    FILE *fd;
+    struct stat buf;
+    char path[100];
+    memset(path, 0, 100);
+    //崩溃日志路径
+    QString strPath = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation)[0] + "/dde-collapse.log";
+    memcpy(path, strPath.toStdString().data(), strPath.length());
+    qDebug() << path;
+
+    stat(path, &buf);
+    if (buf.st_size > 10 * 1024 * 1024) {
+        // 超过10兆则清空内容
+        fd = fopen(path, "w");
+    } else {
+        fd = fopen(path, "at");
+    }
+
+    if (nullptr == fd) {
+        exit(0);
+    }
+    //捕获异常，打印崩溃日志到配置文件中
+    try {
+            char szLine[512] = {0};
+            time_t t = time(nullptr);
+            tm *now = localtime(&t);
+            QString log = "#####" + qApp->applicationName() + "#####\n[%04d-%02d-%02d %02d:%02d:%02d][crash signal number:%d]\n";
+            int nLen1 = sprintf(szLine, log.toStdString().c_str(),
+                                now->tm_year + 1900,
+                                now->tm_mon + 1,
+                                now->tm_mday,
+                                now->tm_hour,
+                                now->tm_min,
+                                now->tm_sec,
+                                sig);
+            fwrite(szLine, 1, strlen(szLine), fd);
+
+#ifdef __linux
+        void *array[MAX_STACK_FRAMES];
+        size_t size = 0;
+        char **strings = nullptr;
+        size_t i, j;
+        signal(sig, SIG_DFL);
+        size = backtrace(array, MAX_STACK_FRAMES);
+        strings = (char **)backtrace_symbols(array, size);
+        for (i = 0; i < size; ++i) {
+            char szLine[512] = {0};
+            sprintf(szLine, "%d %s\n", i, strings[i]);
+            fwrite(szLine, 1, strlen(szLine), fd);
+
+            std::string symbol(strings[i]);
+
+            size_t pos1 = symbol.find_first_of("[");
+            size_t pos2 = symbol.find_last_of("]");
+            std::string address = symbol.substr(pos1 + 1, pos2 - pos1 - 1);
+            char cmd[128] = {0};
+            sprintf(cmd, "addr2line -C -f -e dde-dock %s", address.c_str()); // 打印当前进程的id和地址
+            FILE *fPipe = popen(cmd, "r");
+            if (fPipe != nullptr) {
+                char buff[1024];
+                memset(buff, 0, sizeof(buff));
+                char *ret = fgets(buff, sizeof(buff), fPipe);
+                pclose(fPipe);
+                fwrite(ret, 1, strlen(ret), fd);
+            }
+        }
+        free(strings);
+#endif // __linux
+    } catch (...) {
+        //
+    }
+    fflush(fd);
+    fclose(fd);
+    fd = nullptr;
+    exit(0);
+}
 
 int main(int argc, char *argv[])
 {
     DGuiApplicationHelper::setUseInactiveColorGroup(false);
     DApplication::loadDXcbPlugin();
     DApplication app(argc, argv);
+    //崩溃信号
+    signal(SIGTERM, sig_crash);
+    signal(SIGSEGV, sig_crash);
+    signal(SIGILL, sig_crash);
+    signal(SIGINT, sig_crash);
+    signal(SIGABRT, sig_crash);
+    signal(SIGFPE, sig_crash);
 
     // 锁定物理内存，用于国测测试[会显著增加内存占用]
 //    qDebug() << "lock memory result:" << mlockall(MCL_CURRENT | MCL_FUTURE);

unittest/CMakeLists.txt

@@ -13,6 +13,7 @@ find_package(PkgConfig REQUIRED)
 find_package(Qt5 COMPONENTS Test DBus REQUIRED)
 
 pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus)
+pkg_check_modules(QGSettings REQUIRED gsettings-qt)
 
 # 添加执行文件信息
 add_executable(${BIN_NAME} ${SRCS} ${INTERFACES})
@@ -25,4 +26,5 @@ target_link_libraries(${BIN_NAME} PRIVATE
     ${Qt5Test_LIBRARIES}
     ${Qt5DBus_LIBRARIES}
     ${DFrameworkDBus_LIBRARIES}
+    ${QGSettings_LIBRARIES}
 )

unittest/dock_unit_test.cpp

@@ -24,11 +24,14 @@
 #include <QDBusMetaType>
 #include <QDBusMessage>
 #include <QDBusArgument>
+#include <QGSettings/QGSettings>
 
 #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;
 DockUnitTest::DockUnitTest()
 {
     qDBusRegisterMetaType<ScreenRect>();
@@ -77,6 +80,79 @@ void DockUnitTest::dock_geometry_check()
 
     QCOMPARE(daemonDockRect, dockRect);
 }
+/**
+ * @brief DockUnitTest::dock_position_check   比较Dbus和QGSettings获取的坐标信息是否一致
+ */
+void DockUnitTest::dock_position_check()
+{
+    DBusDock *dockInter = new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
+    int nPos = dockInter->position();
+    QString postion = "";
+    qDebug() << nPos;
+
+    switch (nPos) {
+    case 0 :
+        postion = "top";
+        break;
+    case 1:
+        postion = "right";
+        break;
+    case 2:
+        postion = "bottom";
+        break;
+    case 3:
+        postion = "left";
+        break;
+    default:
+        break;
+    }
+
+    QGSettings *setting = new QGSettings("com.deepin.dde.dock");
+    if (setting->keys().contains("position")) {
+        qDebug() << setting->get("position");
+        QCOMPARE(postion,setting->get("position").toString());
+    }
+}
+/**
+ * @brief DockUnitTest::dock_displayMode_check   比较Dbus和QGSettings获取的显示模式是否一致
+ */
+void DockUnitTest::dock_displayMode_check()
+{
+    DBusDock *dockInter = new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
+    int nMode = dockInter->displayMode();
+    QString displayMode = "";
+    qDebug() << nMode;
+
+    switch (nMode) {
+    case 0 :
+        displayMode = "fashion";
+        break;
+    case 1:
+        displayMode = "efficient";
+        break;
+    case 2:
+        displayMode = "classic";
+        break;
+    default:
+        break;
+    }
+
+    QGSettings *setting = new QGSettings("com.deepin.dde.dock");
+    if (setting->keys().contains("displayMode")) {
+        qDebug() << setting->get("displayMode");
+        QCOMPARE(displayMode,setting->get("displayMode").toString());
+    }
+}
+
+void DockUnitTest::dock_appItemCount_check()
+{
+    DBusDock *dockInter = new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
+    qDebug() << dockInter->entries().size();
+    for (auto inter : dockInter->entries()) {
+        qDebug() << inter.path();
+    }
+
+}
 
 QTEST_APPLESS_MAIN(DockUnitTest)
 

unittest/dock_unit_test.h

@@ -32,9 +32,9 @@ public:
 
 private slots:
     void dock_geometry_check();         // 显示区域
-//    void dock_position_check();         // 位置检查
-//    void dock_displayMode_check();      // 显示模式检查
-//    void dock_appItemCount_check();     // 应用显示数量检查
+    void dock_position_check();         // 位置检查
+    void dock_displayMode_check();      // 显示模式检查
+    void dock_appItemCount_check();     // 应用显示数量检查
 };
 
 #endif // DOCK_UNIT_TEST_H