diff --git a/tests/controller/ut_dockitemmanager.cpp b/tests/controller/ut_dockitemmanager.cpp index af9fd5534..63afed977 100644 --- a/tests/controller/ut_dockitemmanager.cpp +++ b/tests/controller/ut_dockitemmanager.cpp @@ -29,6 +29,7 @@ #include "dockitemmanager.h" #include "dockitem.h" #undef private +#include "item/testplugin.h" class Test_DockItemManager : public ::testing::Test { @@ -42,32 +43,45 @@ public: void Test_DockItemManager::SetUp() { -// manager = DockItemManager::instance(); + manager = DockItemManager::instance(); } void Test_DockItemManager::TearDown() { } -//TEST_F(Test_DockItemManager, appIsOnDock_test) -//{ -// ASSERT_TRUE(manager->appIsOnDock("test")); +TEST_F(Test_DockItemManager, appIsOnDock_test) +{ + manager->appIsOnDock("test"); // manager->startLoadPlugins(); -//} +} TEST_F(Test_DockItemManager, get_method_test) { -// manager->itemList(); -// manager->pluginList(); + manager->itemList(); + manager->pluginList(); -// qDebug() << manager->m_itemList.size(); -// for (auto item: manager->m_itemList) -// qDebug() << item->itemType(); + qDebug() << manager->m_itemList.size(); + for (auto item: manager->m_itemList) + qDebug() << item->itemType(); } TEST_F(Test_DockItemManager, refershItemsIcon_test) { -// manager->refershItemsIcon(); -// manager->sortPluginItems(); + manager->refershItemsIcon(); + manager->sortPluginItems(); +} + +TEST_F(Test_DockItemManager, cover_test) +{ + manager->updatePluginsItemOrderKey(); + manager->itemAdded("", 0); + manager->appItemAdded(QDBusObjectPath(), 0); + manager->onPluginLoadFinished(); + manager->reloadAppItems(); + manager->pluginItemRemoved(new PluginsItem(new TestPlugin, "", "")); + manager->pluginItemInserted(new PluginsItem(new TestPlugin, "", "")); + manager->appItemRemoved(""); + manager->itemMoved(new PluginsItem(new TestPlugin, "", ""), new PluginsItem(new TestPlugin, "", "")); } diff --git a/tests/item/ut_dockitem.cpp b/tests/item/ut_dockitem.cpp index 4fc479447..5758f6759 100644 --- a/tests/item/ut_dockitem.cpp +++ b/tests/item/ut_dockitem.cpp @@ -25,7 +25,12 @@ #include #include +#define protected public +#define private public #include "dockitem.h" +#undef private +#undef protected + class Test_DockItem : public ::testing::Test { public: @@ -69,3 +74,51 @@ TEST_F(Test_DockItem, dockitem_hide_test) ASSERT_EQ(dockItem->isVisible(), false); } + +TEST_F(Test_DockItem, cover_test) +{ + DockItem::setDockPosition(Dock::Top); + DockItem::setDockDisplayMode(Dock::Fashion); + +// ASSERT_EQ(dockItem->itemType(), DockItem::App); + dockItem->sizeHint(); + ASSERT_EQ(dockItem->accessibleName(), ""); + dockItem->refreshIcon(); + dockItem->contextMenu(); + dockItem->popupTips(); + dockItem->popupWindowAccept(); +// dockItem->showPopupApplet(new QWidget); + dockItem->invokedMenuItem("", true); + dockItem->checkAndResetTapHoldGestureState(); +} + +TEST_F(Test_DockItem, event_test) +{ + dockItem->m_popupShown = true; + dockItem->update(); + + QMouseEvent event(QEvent::MouseButtonPress, QPointF(0.0, 0.0), Qt::NoButton, Qt::NoButton, Qt::NoModifier); + qApp->sendEvent(dockItem, &event); + + QEnterEvent event1(QPointF(0.0, 0.0), QPointF(0.0, 0.0), QPointF(0.0, 0.0)); + qApp->sendEvent(dockItem, &event1); + + QEvent event2(QEvent::Leave); + qApp->sendEvent(dockItem, &event2); +} + +TEST_F(Test_DockItem, topleftPoint_test) +{ + DockItem::setDockPosition(Dock::Top); + dockItem->popupMarkPoint(); + dockItem->topleftPoint(); + DockItem::setDockPosition(Dock::Right); + dockItem->popupMarkPoint(); + dockItem->topleftPoint(); + DockItem::setDockPosition(Dock::Bottom); + dockItem->popupMarkPoint(); + dockItem->topleftPoint(); + DockItem::setDockPosition(Dock::Left); + dockItem->popupMarkPoint(); + dockItem->topleftPoint(); +} diff --git a/tests/item/ut_traypluginitem.cpp b/tests/item/ut_traypluginitem.cpp new file mode 100644 index 000000000..853d36f36 --- /dev/null +++ b/tests/item/ut_traypluginitem.cpp @@ -0,0 +1,43 @@ +#include + +#include + +#include "testplugin.h" + +#define private public +#include "traypluginitem.h" +#undef private + +class Ut_TrayPluginItem : public ::testing::Test +{ +public: + virtual void SetUp() override; + virtual void TearDown() override; +}; + +void Ut_TrayPluginItem::SetUp() +{ +} + +void Ut_TrayPluginItem::TearDown() +{ +} + +TEST_F(Ut_TrayPluginItem, all_test) +{ + TestPlugin plugin; + TrayPluginItem item(&plugin, "", ""); + + ASSERT_EQ(item.itemType(), DockItem::TrayPlugin); + + item.setSuggestIconSize(QSize()); + item.setRightSplitVisible(true); + + ASSERT_EQ(item.trayVisableItemCount(), 0); + + QMouseEvent event(QEvent::MouseButtonPress, QPointF(), Qt::NoButton, Qt::NoButton, Qt::NoModifier); + qApp->sendEvent(item.centralWidget(), &event); + + QDynamicPropertyChangeEvent event1("TrayVisableItemCount"); + qApp->sendEvent(item.centralWidget(), &event); +} diff --git a/tests/panel/ut_mainpanelcontrol.cpp b/tests/panel/ut_mainpanelcontrol.cpp index 4c0adf2b5..bb5495485 100644 --- a/tests/panel/ut_mainpanelcontrol.cpp +++ b/tests/panel/ut_mainpanelcontrol.cpp @@ -72,3 +72,22 @@ TEST_F(Test_MainPanelControl, coverage_test) mainPanel->updateMainPanelLayout(); QTest::qWait(10); } + +TEST_F(Test_MainPanelControl, event_test) +{ + QApplication::postEvent(mainPanel, new QEvent(QEvent::DragLeave)); + QApplication::postEvent(mainPanel, new QEvent(QEvent::DragEnter)); + QApplication::postEvent(mainPanel, new QEvent(QEvent::Drop)); + QApplication::postEvent(mainPanel, new QEvent(QEvent::MouseButtonPress)); + QApplication::postEvent(mainPanel, new QEvent(QEvent::DragMove)); + QApplication::postEvent(mainPanel, new QEvent(QEvent::Resize)); +} + +TEST_F(Test_MainPanelControl, cover_test) +{ + mainPanel->removeAppAreaItem(new QWidget); + mainPanel->removeTrayAreaItem(new QWidget); + mainPanel->updateAppAreaSonWidgetSize(); + mainPanel->setDelegate(mainPanel->delegate()); + mainPanel->checkNeedShowDesktop(); +} diff --git a/tests/test-recoverage.sh b/tests/test-recoverage.sh index 2f796f675..da8632f80 100755 --- a/tests/test-recoverage.sh +++ b/tests/test-recoverage.sh @@ -12,11 +12,10 @@ make -j 16 cd tests/ -lcov -c -i -d ./ -o init.info ./dde_dock_unit_test lcov -c -d ./ -o cover.info -lcov -a init.info -a cover.info -o total.info -lcov -r total.info "*/tests/*" "*/usr/include*" "*build/src*" "*/dbus/*" "*/interfaces/*" "*/xcb/*" -o final.info +lcov -e cover.info '*/frame/*' '*/dde-dock/widgets/*' -o code.info +lcov -r code.info '*/dbus/*' '*/xcb/*' -o final.info rm -rf ../../tests/$REPORT_DIR mkdir -p ../../tests/$REPORT_DIR diff --git a/tests/window/ut_mainwindow.cpp b/tests/window/ut_mainwindow.cpp index 2cc6f2b9f..6bb912903 100644 --- a/tests/window/ut_mainwindow.cpp +++ b/tests/window/ut_mainwindow.cpp @@ -66,8 +66,8 @@ TEST_F(Test_MainWindow, coverage_test) m_window->callShow(); QTest::qWait(450); - m_window->relaodPlugins(); - QTest::qWait(100); +// m_window->relaodPlugins(); +// QTest::qWait(100); QEvent enterEvent(QEvent::Enter); qApp->sendEvent(m_window, &enterEvent);