Commit e52b6f60 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(tests): init each GUI test correctly

parent 55153d72
...@@ -36,6 +36,13 @@ ...@@ -36,6 +36,13 @@
QCOMPARE(virtualWindowContent->objectName(), QStringLiteral(NAME)); \ QCOMPARE(virtualWindowContent->objectName(), QStringLiteral(NAME)); \
} while (0) } while (0)
#define INIT_GUI_TEST() \
QQuickWindow * mainWindow = App::getInstance()->getMainWindow(); \
App::smartShowWindow(mainWindow); \
QQuickItem *contentLoader = mainWindow->findChild<QQuickItem *>("__contentLoader"); \
QVERIFY(contentLoader); \
QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(110, 100));
namespace TestUtils { namespace TestUtils {
void executeKeySequence (QQuickWindow *window, QKeySequence sequence); void executeKeySequence (QQuickWindow *window, QKeySequence sequence);
......
...@@ -21,27 +21,28 @@ ...@@ -21,27 +21,28 @@
*/ */
#include <QQmlProperty> #include <QQmlProperty>
#include <QQuickItem>
#include <QSignalSpy> #include <QSignalSpy>
#include <QTest> #include <QTest>
#include "../../app/App.hpp" #include "../../app/App.hpp"
#include "../TestUtils.hpp"
#include "AssistantViewTest.hpp" #include "AssistantViewTest.hpp"
// ============================================================================= // =============================================================================
void AssistantViewTest::init () {
INIT_GUI_TEST();
}
void AssistantViewTest::showAssistantView () { void AssistantViewTest::showAssistantView () {
QQuickWindow *mainWindow = App::getInstance()->getMainWindow(); QQuickWindow *mainWindow = App::getInstance()->getMainWindow();
// Ensure home view is selected.
QQuickItem *contentLoader = mainWindow->findChild<QQuickItem *>("__contentLoader"); QQuickItem *contentLoader = mainWindow->findChild<QQuickItem *>("__contentLoader");
QVERIFY(contentLoader);
QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(110, 100));
// Show assistant view. // Show assistant view.
QSignalSpy spyLoaderReady(contentLoader, SIGNAL(loaded())); QSignalSpy spyLoaderReady(contentLoader, SIGNAL(loaded()));
QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(705, 485)); QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(705, 485));
QVERIFY(spyLoaderReady.count() == 1); QVERIFY(spyLoaderReady.count() == 1);
QCOMPARE( QCOMPARE(
QQmlProperty::read(contentLoader, "source").toString(), QQmlProperty::read(contentLoader, "source").toString(),
......
...@@ -35,6 +35,8 @@ public: ...@@ -35,6 +35,8 @@ public:
~AssistantViewTest () = default; ~AssistantViewTest () = default;
private slots: private slots:
void init ();
void showAssistantView (); void showAssistantView ();
}; };
......
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
// ============================================================================= // =============================================================================
void MainViewTest::init () {
INIT_GUI_TEST();
}
// -----------------------------------------------------------------------------
void MainViewTest::showAboutPopup () { void MainViewTest::showAboutPopup () {
QQuickWindow *mainWindow = App::getInstance()->getMainWindow(); QQuickWindow *mainWindow = App::getInstance()->getMainWindow();
......
...@@ -35,6 +35,8 @@ public: ...@@ -35,6 +35,8 @@ public:
~MainViewTest () = default; ~MainViewTest () = default;
private slots: private slots:
void init ();
void showAboutPopup (); void showAboutPopup ();
void showManageAccountsPopup (); void showManageAccountsPopup ();
void showSettingsWindow (); void showSettingsWindow ();
......
...@@ -37,7 +37,7 @@ function _getDisplayName (str) { ...@@ -37,7 +37,7 @@ function _getDisplayName (str) {
return name return name
} }
return _getDisplayNameFromString (str) return _getDisplayNameFromString(str)
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment