From 31f2ec673f47b4ba6f054f02f98191146a80d64c Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Tue, 18 Jul 2017 13:53:45 +0200
Subject: [PATCH] feat(tests/MainViewTest): close popup in
 `showManageAccountsPopup`

---
 src/tests/TestUtils.cpp              | 10 ++--------
 src/tests/main-view/MainViewTest.cpp | 13 ++++++++++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/tests/TestUtils.cpp b/src/tests/TestUtils.cpp
index 4fe2be7c6..1cb5c9f4a 100644
--- a/src/tests/TestUtils.cpp
+++ b/src/tests/TestUtils.cpp
@@ -50,10 +50,7 @@ void TestUtils::printItemTree (const QQuickItem *item) {
 // -----------------------------------------------------------------------------
 
 QQuickItem *TestUtils::getMainLoaderFromMainWindow () {
-  QQuickWindow *window = App::getInstance()->getMainWindow();
-  Q_CHECK_PTR(window);
-
-  QList<QQuickItem *> items = window->contentItem()->childItems();
+  QList<QQuickItem *> items = App::getInstance()->getMainWindow()->contentItem()->childItems();
   Q_ASSERT(!items.empty());
 
   for (int i = 0; i < 3; ++i) {
@@ -96,8 +93,5 @@ QQuickItem *TestUtils::getVirtualWindowContainer (const QQuickItem *virtualWindo
   QList<QQuickItem *> items = virtualWindow->childItems();
   Q_ASSERT(items.size() == 2);
 
-  QQuickItem *container = items.at(1);
-  Q_ASSERT(!container->childItems().empty());
-
-  return container;
+  return items.at(1);
 }
diff --git a/src/tests/main-view/MainViewTest.cpp b/src/tests/main-view/MainViewTest.cpp
index 2ecd50e5b..59bfecbbd 100644
--- a/src/tests/main-view/MainViewTest.cpp
+++ b/src/tests/main-view/MainViewTest.cpp
@@ -32,14 +32,21 @@
 void MainViewTest::showManageAccountsPopup () {
   QQuickWindow *mainWindow = App::getInstance()->getMainWindow();
 
+  // Open popup.
   QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(100, 35));
   QTest::qWait(1000);
 
   const char name[] = "DialogPlus_QMLTYPE_";
-  QQuickItem *virtualWindowContent = TestUtils::getVirtualWindowContainer(
-      TestUtils::getVirtualWindow(mainWindow)
-    )->childItems().at(0);
+  QQuickItem *virtualWindow = TestUtils::getVirtualWindow(mainWindow);
+  QQuickItem *virtualWindowContent = TestUtils::getVirtualWindowContainer(virtualWindow)->childItems().at(0);
 
+  QVERIFY(virtualWindowContent);
   QVERIFY(!strncmp(virtualWindowContent->metaObject()->className(), name, sizeof name - 1));
   QVERIFY(virtualWindowContent->objectName() == "manageAccounts");
+
+  // Close popup.
+  QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(476, 392));
+  QTest::qWait(1000);
+
+  QVERIFY(TestUtils::getVirtualWindowContainer(virtualWindow)->childItems().empty());
 }