diff --git a/debian/control b/debian/control index a2b50592b..15fbeab94 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,6 @@ Build-Depends: debhelper (>= 8.0.0), libgtest-dev, libgmock-dev, qttools5-dev, - dde-control-center-dev, libxcursor-dev Standards-Version: 3.9.8 Homepage: http://www.deepin.org/ diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 0876aacbb..133748410 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -11,5 +11,5 @@ add_subdirectory("overlay-warning") add_subdirectory("show-desktop") add_subdirectory("multitasking") add_subdirectory("bluetooth") -add_subdirectory("dcc-dock-plugin") +#add_subdirectory("dcc-dock-plugin") add_subdirectory("airplane-mode") diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 45994a1c4..bda3e8ace 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,19 +14,22 @@ file(GLOB_RECURSE SRCS "../widgets/*.h" "../widgets/*.cpp") +list(REMOVE_ITEM SRCS "plugins/dcc-dock-settings-plugin/*.cpp") + # Sources files file(GLOB_RECURSE PLUGIN_SRCS "../plugins/bluetooth/*.h" "../plugins/bluetooth/*.cpp" "../plugins/bluetooth/componments/*.h" "../plugins/bluetooth/componments/*.cpp" - "../plugins/dcc-dock-plugin/*.h" - "../plugins/dcc-dock-plugin/*.cpp" + #"../plugins/dcc-dock-plugin/*.h" + #"../plugins/dcc-dock-plugin/*.cpp" "../frame/util/horizontalseperator.h" "../frame/util/horizontalseperator.cpp") + # 其包含的"interface/moduleinterface.h"文件中定义了ModuleInterface_iid,任务栏插件框架的interface文件中也有定义 -list(FILTER PLUGIN_SRCS EXCLUDE REGEX "../plugins/dcc-dock-plugin/settings_module.*") +#list(FILTER PLUGIN_SRCS EXCLUDE REGEX "../plugins/dcc-dock-plugin/settings_module.*") # 用于测试覆盖率的编译条件 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage -lgcov") @@ -48,7 +51,7 @@ find_package(Qt5DBus REQUIRED) find_package(DtkWidget REQUIRED) find_package(Qt5Svg REQUIRED) find_package(Qt5 COMPONENTS Test REQUIRED) -find_package(DdeControlCenter REQUIRED) +#find_package(DdeControlCenter REQUIRED) find_package(GTest REQUIRED) find_package(GMock REQUIRED) @@ -72,12 +75,12 @@ target_include_directories(${BIN_NAME} PUBLIC ${DFrameworkDBus_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${QGSettings_INCLUDE_DIRS} - ${DdeControlCenter_INCLUDE_DIR} + #${DdeControlCenter_INCLUDE_DIR} ../interfaces fakedbus ../plugins/bluetooth ../plugins/bluetooth/componments - ../plugins/dcc-dock-plugin + #../plugins/dcc-dock-plugin ) # 链接库 @@ -92,7 +95,7 @@ target_link_libraries(${BIN_NAME} PRIVATE ${Qt5DBus_LIBRARIES} ${QGSettings_LIBRARIES} ${Qt5Svg_LIBRARIES} - ${DdeControlCenter_LIBRARIES} + #${DdeControlCenter_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} -lpthread diff --git a/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp b/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp index 8c262d744..f0de0deff 100644 --- a/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp +++ b/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp @@ -1,17 +1,17 @@ -#include "config_watcher.h" +//#include "config_watcher.h" #include #include -using namespace dcc_dock_plugin; +//using namespace dcc_dock_plugin; class Test_GSettingWatcher : public QObject, public ::testing::Test {}; TEST_F(Test_GSettingWatcher, bind) { - ConfigWatcher watcher("dde.dock.plugin.dconfig"); +/* ConfigWatcher watcher("dde.dock.plugin.dconfig"); QWidget widget; watcher.bind("Control-Center_Dock_Plugins", &widget); @@ -19,24 +19,27 @@ TEST_F(Test_GSettingWatcher, bind) watcher.bind("invalid", &widget); watcher.bind("", &widget); watcher.bind("", nullptr); + */ } TEST_F(Test_GSettingWatcher, setStatus) { - ConfigWatcher watcher("dde.dock.plugin.dconfig"); +/* ConfigWatcher watcher("dde.dock.plugin.dconfig"); QWidget widget; watcher.bind("Control-Center_Dock_Plugins", &widget); watcher.setStatus("Control-Center_Dock_Plugins", &widget); + */ } TEST_F(Test_GSettingWatcher, onStatusModeChanged) { - ConfigWatcher watcher("dde.dock.plugin.dconfig"); +/* ConfigWatcher watcher("dde.dock.plugin.dconfig"); QWidget widget; watcher.bind("Control-Center_Dock_Plugins", &widget); watcher.onStatusModeChanged("Control-Center_Dock_Plugins"); watcher.onStatusModeChanged("invalid"); watcher.onStatusModeChanged(""); + */ } diff --git a/tests/plugins/dcc-dock-settings-plugin/ut_module_widget.cpp b/tests/plugins/dcc-dock-settings-plugin/ut_module_widget.cpp index 5815110e9..6d47281c7 100644 --- a/tests/plugins/dcc-dock-settings-plugin/ut_module_widget.cpp +++ b/tests/plugins/dcc-dock-settings-plugin/ut_module_widget.cpp @@ -1,4 +1,4 @@ -#include "module_widget.h" +//#include "module_widget.h" #include @@ -9,7 +9,7 @@ class Test_ModuleWidget : public QObject, public ::testing::Test TEST_F(Test_ModuleWidget, updateSliderValue) { - ModuleWidget widget; + //ModuleWidget widget; - widget.updateSliderValue(); + //widget.updateSliderValue(); }