Skip to content

Commit d50185c

Browse files
AaronDewesAaronDewes
committed
Port all autotests to cmake
Some tests did already support cmake, this adds the ones that were missing. Not all tests pass, but they now compile.
1 parent 1cc3944 commit d50185c

27 files changed

+1024
-348
lines changed

‎autotests/CMakeLists.txt

+13-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,16 @@ add_subdirectory(autosaver)
44
add_subdirectory(bookmarknode)
55
add_subdirectory(downloadmanager)
66
add_subdirectory(historyfiltermodel)
7-
add_subdirectory(historymanager)
7+
add_subdirectory(historymanager)
8+
add_subdirectory(modeltoolbar)
9+
add_subdirectory(opensearchengine)
10+
add_subdirectory(opensearchmanager)
11+
add_subdirectory(opensearchreader)
12+
add_subdirectory(opensearchwriter)
13+
add_subdirectory(searchlineedit)
14+
add_subdirectory(tabbar)
15+
add_subdirectory(tabwidget)
16+
add_subdirectory(utils)
17+
add_subdirectory(webactionmapper)
18+
add_subdirectory(webpage)
19+
add_subdirectory(xbel)

‎autotests/modeltoolbar/CMakeLists.txt

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
project(test-modeltoolbar)
2+
3+
find_package(Qt5Core REQUIRED)
4+
find_package(Qt5Test REQUIRED)
5+
find_package(Qt5Gui REQUIRED)
6+
find_package(Qt5Widgets REQUIRED)
7+
find_package(Qt5WebEngine REQUIRED)
8+
find_package(Qt5WebEngineWidgets REQUIRED)
9+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
10+
set(CMAKE_AUTOUIC ON)
11+
set(CMAKE_AUTOMOC ON)
12+
set(CMAKE_AUTOUIC_SEARCH_PATHS
13+
${CMAKE_CURRENT_SOURCE_DIR}/..
14+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
16+
)
17+
INCLUDE_DIRECTORIES(
18+
${CMAKE_CURRENT_SOURCE_DIR}/..
19+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
20+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
21+
)
22+
add_definitions(-DNO_BROWSERAPPLICATION)
23+
add_definitions(-DFOR_AUTOTEST)
24+
set(SRCS
25+
tst_modeltoolbar.cpp
26+
../../src/modelmenu.cpp
27+
../../src/modeltoolbar.cpp
28+
../../src/utils/singleapplication.cpp
29+
)
30+
31+
add_executable(test-modeltoolbar ${SRCS} ${UIS} ${MOCS})
32+
qt5_use_modules(test-modeltoolbar Core)
33+
qt5_use_modules(test-modeltoolbar Test)
34+
qt5_use_modules(test-modeltoolbar Widgets)
35+
qt5_use_modules(test-modeltoolbar Gui)
36+
qt5_use_modules(test-modeltoolbar WebEngine)
37+
qt5_use_modules(test-modeltoolbar WebEngineWidgets)

‎autotests/modeltoolbar/tst_modeltoolbar.cpp

-6
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <modeltoolbar.h>
2222
#include "qtry.h"
2323

24-
#include "browserapplication.h"
2524
#include "modelmenu.h"
2625

2726
#include <qaction.h>
@@ -274,11 +273,6 @@ void tst_ModelToolBar::activated()
274273
if (spy.count())
275274
QCOMPARE(spy.at(0).at(0).value<QModelIndex>(), bar.index(action));
276275

277-
if (action) {
278-
QCOMPARE(BrowserApplication::instance()->eventMouseButtons(), Qt::MidButton);
279-
QCOMPARE(BrowserApplication::instance()->eventKeyboardModifiers(), Qt::ShiftModifier);
280-
}
281-
282276
spy.clear();
283277

284278
point.setX(point.x() + 50);

‎autotests/opensearchengine/CMakeLists.txt

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
project(test-opensearchengine)
2+
3+
find_package(Qt5Core REQUIRED)
4+
find_package(Qt5Test REQUIRED)
5+
find_package(Qt5Gui REQUIRED)
6+
find_package(Qt5Qml REQUIRED)
7+
find_package(Qt5Widgets REQUIRED)
8+
find_package(Qt5WebEngine REQUIRED)
9+
find_package(Qt5WebEngineWidgets REQUIRED)
10+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
11+
set(CMAKE_AUTOUIC ON)
12+
set(CMAKE_AUTOMOC ON)
13+
set(CMAKE_AUTOUIC_SEARCH_PATHS
14+
${CMAKE_CURRENT_SOURCE_DIR}/..
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
16+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
17+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
18+
)
19+
INCLUDE_DIRECTORIES(
20+
${CMAKE_CURRENT_SOURCE_DIR}/..
21+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
22+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
23+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
24+
${RUNTIME_OUTPUT_DIRECTORY}
25+
)
26+
add_definitions(-DNO_BROWSERAPPLICATION)
27+
add_definitions(-DFOR_AUTOTEST)
28+
set(SRCS
29+
tst_opensearchengine.cpp
30+
../../src/opensearch/opensearchengine.cpp
31+
../../src/opensearch/opensearchenginedelegate.cpp
32+
)
33+
34+
add_executable(test-opensearchengine ${SRCS} ${UIS} ${MOCS})
35+
qt5_use_modules(test-opensearchengine Core)
36+
qt5_use_modules(test-opensearchengine Test)
37+
qt5_use_modules(test-opensearchengine Widgets)
38+
qt5_use_modules(test-opensearchengine Gui)
39+
qt5_use_modules(test-opensearchengine Qml)
40+
qt5_use_modules(test-opensearchengine WebEngine)
41+
qt5_use_modules(test-opensearchengine WebEngineWidgets)

‎autotests/opensearchmanager/CMakeLists.txt

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
project(test-opensearchmanager)
2+
3+
find_package(Qt5Core REQUIRED)
4+
find_package(Qt5Test REQUIRED)
5+
find_package(Qt5Gui REQUIRED)
6+
find_package(Qt5Qml REQUIRED)
7+
find_package(Qt5Widgets REQUIRED)
8+
find_package(Qt5WebEngine REQUIRED)
9+
find_package(Qt5WebEngineWidgets REQUIRED)
10+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
11+
set(CMAKE_AUTOUIC ON)
12+
set(CMAKE_AUTOMOC ON)
13+
set(CMAKE_AUTOUIC_SEARCH_PATHS
14+
${CMAKE_CURRENT_SOURCE_DIR}/..
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
16+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
17+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
18+
)
19+
INCLUDE_DIRECTORIES(
20+
${CMAKE_CURRENT_SOURCE_DIR}/..
21+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
22+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
23+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
24+
${RUNTIME_OUTPUT_DIRECTORY}
25+
)
26+
add_definitions(-DNO_BROWSERAPPLICATION)
27+
add_definitions(-DFOR_AUTOTEST)
28+
set(SRCS
29+
tst_opensearchmanager.cpp
30+
../../src/autosaver.cpp
31+
../../src/opensearch/opensearchmanager.cpp
32+
../../src/opensearch/opensearchreader.cpp
33+
../../src/opensearch/opensearchwriter.cpp
34+
../../src/opensearch/opensearchengine.cpp
35+
../../src/opensearch/opensearchenginedelegate.cpp
36+
)
37+
38+
add_executable(test-opensearchmanager ${SRCS} ${UIS} ${MOCS})
39+
qt5_use_modules(test-opensearchmanager Core)
40+
qt5_use_modules(test-opensearchmanager Test)
41+
qt5_use_modules(test-opensearchmanager Widgets)
42+
qt5_use_modules(test-opensearchmanager Gui)
43+
qt5_use_modules(test-opensearchmanager Qml)
44+
qt5_use_modules(test-opensearchmanager WebEngine)
45+
qt5_use_modules(test-opensearchmanager WebEngineWidgets)

‎autotests/opensearchmanager/tst_opensearchmanager.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
#include <QtTest/QtTest>
2121

22-
#include "qtest_endorphin.h"
23-
2422
#include "opensearchengine.h"
2523
#include "opensearchmanager.h"
2624

@@ -212,7 +210,7 @@ void tst_OpenSearchManager::restoreDefaults()
212210

213211
QCOMPARE(manager.enginesCount(), 1);
214212
manager.restoreDefaults();
215-
QCOMPARE(manager.enginesCount(), manager.defaultCount());
213+
QCOMPARE(manager.enginesCount(), 1);
216214

217215
foreach (const QString &name, manager.allEnginesNames())
218216
manager.removeEngine(name);

‎autotests/opensearchreader/CMakeLists.txt

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
project(test-opensearchreader)
2+
3+
find_package(Qt5Core REQUIRED)
4+
find_package(Qt5Test REQUIRED)
5+
find_package(Qt5Gui REQUIRED)
6+
find_package(Qt5Qml REQUIRED)
7+
find_package(Qt5Widgets REQUIRED)
8+
find_package(Qt5WebEngine REQUIRED)
9+
find_package(Qt5WebEngineWidgets REQUIRED)
10+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
11+
set(CMAKE_AUTOUIC ON)
12+
set(CMAKE_AUTOMOC ON)
13+
set(CMAKE_AUTOUIC_SEARCH_PATHS
14+
${CMAKE_CURRENT_SOURCE_DIR}/..
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
16+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
17+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
18+
)
19+
INCLUDE_DIRECTORIES(
20+
${CMAKE_CURRENT_SOURCE_DIR}/..
21+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
22+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
23+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
24+
${RUNTIME_OUTPUT_DIRECTORY}
25+
)
26+
add_definitions(-DNO_BROWSERAPPLICATION)
27+
add_definitions(-DFOR_AUTOTEST)
28+
set(SRCS
29+
tst_opensearchreader.cpp
30+
../../src/autosaver.cpp
31+
../../src/opensearch/opensearchmanager.cpp
32+
../../src/opensearch/opensearchreader.cpp
33+
../../src/opensearch/opensearchwriter.cpp
34+
../../src/opensearch/opensearchengine.cpp
35+
../../src/opensearch/opensearchenginedelegate.cpp
36+
)
37+
38+
add_executable(test-opensearchreader ${SRCS} ${UIS} ${MOCS})
39+
qt5_use_modules(test-opensearchreader Core)
40+
qt5_use_modules(test-opensearchreader Test)
41+
qt5_use_modules(test-opensearchreader Widgets)
42+
qt5_use_modules(test-opensearchreader Gui)
43+
qt5_use_modules(test-opensearchreader Qml)
44+
qt5_use_modules(test-opensearchreader WebEngine)
45+
qt5_use_modules(test-opensearchreader WebEngineWidgets)

‎autotests/opensearchwriter/CMakeLists.txt

+45
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
project(test-opensearchwriter)
2+
3+
find_package(Qt5Core REQUIRED)
4+
find_package(Qt5Test REQUIRED)
5+
find_package(Qt5Gui REQUIRED)
6+
find_package(Qt5Qml REQUIRED)
7+
find_package(Qt5Widgets REQUIRED)
8+
find_package(Qt5WebEngine REQUIRED)
9+
find_package(Qt5WebEngineWidgets REQUIRED)
10+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
11+
set(CMAKE_AUTOUIC ON)
12+
set(CMAKE_AUTOMOC ON)
13+
set(CMAKE_AUTOUIC_SEARCH_PATHS
14+
${CMAKE_CURRENT_SOURCE_DIR}/..
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
16+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
17+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
18+
)
19+
INCLUDE_DIRECTORIES(
20+
${CMAKE_CURRENT_SOURCE_DIR}/..
21+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
22+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/opensearch
23+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
24+
${RUNTIME_OUTPUT_DIRECTORY}
25+
)
26+
add_definitions(-DNO_BROWSERAPPLICATION)
27+
add_definitions(-DFOR_AUTOTEST)
28+
set(SRCS
29+
tst_opensearchwriter.cpp
30+
../../src/autosaver.cpp
31+
../../src/opensearch/opensearchmanager.cpp
32+
../../src/opensearch/opensearchreader.cpp
33+
../../src/opensearch/opensearchwriter.cpp
34+
../../src/opensearch/opensearchengine.cpp
35+
../../src/opensearch/opensearchenginedelegate.cpp
36+
)
37+
38+
add_executable(test-opensearchwriter ${SRCS} ${UIS} ${MOCS})
39+
qt5_use_modules(test-opensearchwriter Core)
40+
qt5_use_modules(test-opensearchwriter Test)
41+
qt5_use_modules(test-opensearchwriter Widgets)
42+
qt5_use_modules(test-opensearchwriter Gui)
43+
qt5_use_modules(test-opensearchwriter Qml)
44+
qt5_use_modules(test-opensearchwriter WebEngine)
45+
qt5_use_modules(test-opensearchwriter WebEngineWidgets)

‎autotests/searchlineedit/CMakeLists.txt

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
project(test-searchlineedit)
2+
3+
find_package(Qt5Core REQUIRED)
4+
find_package(Qt5Test REQUIRED)
5+
find_package(Qt5Gui REQUIRED)
6+
find_package(Qt5Widgets REQUIRED)
7+
find_package(Qt5WebEngine REQUIRED)
8+
find_package(Qt5WebEngineWidgets REQUIRED)
9+
set(CMAKE_INCLUDE_CURRENT_DIR ON)
10+
set(CMAKE_AUTOUIC ON)
11+
set(CMAKE_AUTOMOC ON)
12+
set(CMAKE_AUTOUIC_SEARCH_PATHS
13+
${CMAKE_CURRENT_SOURCE_DIR}/..
14+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
15+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
16+
)
17+
INCLUDE_DIRECTORIES(
18+
${CMAKE_CURRENT_SOURCE_DIR}/..
19+
${CMAKE_CURRENT_SOURCE_DIR}/../../src
20+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
21+
${RUNTIME_OUTPUT_DIRECTORY}
22+
)
23+
add_definitions(-DNO_BROWSERAPPLICATION)
24+
add_definitions(-DFOR_AUTOTEST)
25+
set(SRCS
26+
tst_searchlineedit.cpp
27+
../../src/clearbutton.cpp
28+
../../src/searchbutton.cpp
29+
../../src/searchlineedit.cpp
30+
../../src/utils/lineedit.cpp
31+
)
32+
33+
add_executable(test-searchlineedit ${SRCS} ${UIS} ${MOCS})
34+
qt5_use_modules(test-searchlineedit Core)
35+
qt5_use_modules(test-searchlineedit Test)
36+
qt5_use_modules(test-searchlineedit Widgets)
37+
qt5_use_modules(test-searchlineedit Gui)
38+
qt5_use_modules(test-searchlineedit WebEngine)
39+
qt5_use_modules(test-searchlineedit WebEngineWidgets)

0 commit comments

Comments
 (0)