From c163629f8e7759a2c598a86b3a50d1b326952d4b Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Sat, 27 Jan 2018 11:21:10 +0100
Subject: [PATCH] Autotests: Add FALKONTEST_MAIN macro

---
 autotests/autotests.h         | 30 ++++++++++++++++++++++++++++++
 autotests/cookiestest.cpp     | 12 ++----------
 autotests/locationbartest.cpp | 13 ++-----------
 3 files changed, 34 insertions(+), 21 deletions(-)
 create mode 100644 autotests/autotests.h

diff --git a/autotests/autotests.h b/autotests/autotests.h
new file mode 100644
index 000000000..07c8953f3
--- /dev/null
+++ b/autotests/autotests.h
@@ -0,0 +1,30 @@
+/* ============================================================
+* Falkon - Qt web browser
+* Copyright (C) 2018 David Rosca <nowrep@gmail.com>
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* ============================================================ */
+#include "mainapplication.h"
+
+#include <QtTest/QtTest>
+
+#define FALKONTEST_MAIN(Test) \
+    int main(int argc, char **argv) \
+    { \
+        MainApplication::setTestModeEnabled(true); \
+        MainApplication app(argc, argv); \
+        QTEST_DISABLE_KEYPAD_NAVIGATION; \
+        Test test; \
+        return QTest::qExec(&test, argc, argv); \
+    }
diff --git a/autotests/cookiestest.cpp b/autotests/cookiestest.cpp
index 6943c184f..4f66a4295 100644
--- a/autotests/cookiestest.cpp
+++ b/autotests/cookiestest.cpp
@@ -16,11 +16,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "cookiestest.h"
+#include "autotests.h"
 #include "datapaths.h"
 #include "settings.h"
-#include "mainapplication.h"
 
-#include <QtTest/QtTest>
 #include <QDir>
 
 void CookiesTest::initTestCase()
@@ -98,11 +97,4 @@ void CookiesTest::listMatchesDomainTest()
     QCOMPARE(m_cookieJar->listMatchesDomain(list, cookieDomain), result);
 }
 
-int main(int argc, char **argv)
-{
-    MainApplication::setTestModeEnabled(true);
-    MainApplication app(argc, argv);
-
-    CookiesTest test;
-    return QTest::qExec(&test, argc, argv);
-}
+FALKONTEST_MAIN(CookiesTest)
diff --git a/autotests/locationbartest.cpp b/autotests/locationbartest.cpp
index 9bf1eaaad..81de2ef57 100644
--- a/autotests/locationbartest.cpp
+++ b/autotests/locationbartest.cpp
@@ -16,14 +16,12 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "locationbartest.h"
+#include "autotests.h"
 #include "locationbar.h"
-#include "mainapplication.h"
 #include "searchenginesmanager.h"
 #include "bookmarks.h"
 #include "bookmarkitem.h"
 
-#include <QtTest/QtTest>
-
 static void removeBookmarks(BookmarkItem *parent)
 {
     for (BookmarkItem *child : parent->children()) {
@@ -150,11 +148,4 @@ void LocationBarTest::loadAction_kdebug389491()
     QCOMPARE(action.loadRequest.url(), QUrl("site:website.com?search=searchterm and another"));
 }
 
-int main(int argc, char **argv)
-{
-    MainApplication::setTestModeEnabled(true);
-    MainApplication app(argc, argv);
-
-    LocationBarTest test;
-    return QTest::qExec(&test, argc, argv);
-}
+FALKONTEST_MAIN(LocationBarTest)