diff --git a/src/tests/TestUtils.hpp b/src/tests/TestUtils.hpp index 75ba72d8f..6523ee89a 100644 --- a/src/tests/TestUtils.hpp +++ b/src/tests/TestUtils.hpp @@ -36,6 +36,13 @@ QCOMPARE(virtualWindowContent->objectName(), QStringLiteral(NAME)); \ } while (0) +#define INIT_GUI_TEST() \ + QQuickWindow * mainWindow = App::getInstance()->getMainWindow(); \ + App::smartShowWindow(mainWindow); \ + QQuickItem *contentLoader = mainWindow->findChild("__contentLoader"); \ + QVERIFY(contentLoader); \ + QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(110, 100)); + namespace TestUtils { void executeKeySequence (QQuickWindow *window, QKeySequence sequence); diff --git a/src/tests/assistant-view/AssistantViewTest.cpp b/src/tests/assistant-view/AssistantViewTest.cpp index f883814d4..45c105f4d 100644 --- a/src/tests/assistant-view/AssistantViewTest.cpp +++ b/src/tests/assistant-view/AssistantViewTest.cpp @@ -21,27 +21,28 @@ */ #include -#include #include #include #include "../../app/App.hpp" +#include "../TestUtils.hpp" #include "AssistantViewTest.hpp" // ============================================================================= +void AssistantViewTest::init () { + INIT_GUI_TEST(); +} + void AssistantViewTest::showAssistantView () { QQuickWindow *mainWindow = App::getInstance()->getMainWindow(); - - // Ensure home view is selected. QQuickItem *contentLoader = mainWindow->findChild("__contentLoader"); - QVERIFY(contentLoader); - QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(110, 100)); // Show assistant view. QSignalSpy spyLoaderReady(contentLoader, SIGNAL(loaded())); QTest::mouseClick(mainWindow, Qt::LeftButton, Qt::KeyboardModifiers(), QPoint(705, 485)); + QVERIFY(spyLoaderReady.count() == 1); QCOMPARE( QQmlProperty::read(contentLoader, "source").toString(), diff --git a/src/tests/assistant-view/AssistantViewTest.hpp b/src/tests/assistant-view/AssistantViewTest.hpp index de660577c..88d436485 100644 --- a/src/tests/assistant-view/AssistantViewTest.hpp +++ b/src/tests/assistant-view/AssistantViewTest.hpp @@ -35,6 +35,8 @@ public: ~AssistantViewTest () = default; private slots: + void init (); + void showAssistantView (); }; diff --git a/src/tests/main-view/MainViewTest.cpp b/src/tests/main-view/MainViewTest.cpp index e5520b790..55dbea34a 100644 --- a/src/tests/main-view/MainViewTest.cpp +++ b/src/tests/main-view/MainViewTest.cpp @@ -31,6 +31,12 @@ // ============================================================================= +void MainViewTest::init () { + INIT_GUI_TEST(); +} + +// ----------------------------------------------------------------------------- + void MainViewTest::showAboutPopup () { QQuickWindow *mainWindow = App::getInstance()->getMainWindow(); diff --git a/src/tests/main-view/MainViewTest.hpp b/src/tests/main-view/MainViewTest.hpp index 82d37e0c6..f4c043ce0 100644 --- a/src/tests/main-view/MainViewTest.hpp +++ b/src/tests/main-view/MainViewTest.hpp @@ -35,6 +35,8 @@ public: ~MainViewTest () = default; private slots: + void init (); + void showAboutPopup (); void showManageAccountsPopup (); void showSettingsWindow (); diff --git a/ui/scripts/LinphoneUtils/linphone-utils.js b/ui/scripts/LinphoneUtils/linphone-utils.js index b0a1a835e..0411f602e 100644 --- a/ui/scripts/LinphoneUtils/linphone-utils.js +++ b/ui/scripts/LinphoneUtils/linphone-utils.js @@ -37,7 +37,7 @@ function _getDisplayName (str) { return name } - return _getDisplayNameFromString (str) + return _getDisplayNameFromString(str) } // -----------------------------------------------------------------------------