Commit d3686f1a authored by Laurent Montel's avatar Laurent Montel 😁

Reactivate tests

parent 180433ae
...@@ -2,9 +2,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libwebengineviewer\") ...@@ -2,9 +2,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libwebengineviewer\")
if(BUILD_TESTING) if(BUILD_TESTING)
#add_subdirectory(tests) add_subdirectory(tests)
#add_subdirectory(autotests) add_subdirectory(autotests)
#add_subdirectory(webengineaccesskey/autotests) add_subdirectory(webengineaccesskey/autotests)
endif() endif()
......
ecm_add_test(webhittestresulttest.cpp ../webhittestresult.cpp ecm_add_test(webhittestresulttest.cpp ../webhittestresult.cpp
TEST_NAME webhittestresulttest TEST_NAME webhittestresulttest
NAME_PREFIX "messageviewer-webengine-" NAME_PREFIX "messageviewer-webengine-"
LINK_LIBRARIES Qt5::Test KF5::MessageViewer LINK_LIBRARIES Qt5::Test KF5::WebEngineViewer
) )
...@@ -5,7 +5,7 @@ set(webengine_test_SRCS ...@@ -5,7 +5,7 @@ set(webengine_test_SRCS
add_executable(webenginetest ${webengine_test_SRCS}) add_executable(webenginetest ${webengine_test_SRCS})
target_link_libraries(webenginetest target_link_libraries(webenginetest
Qt5::Widgets KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets
) )
##### #####
...@@ -16,7 +16,7 @@ set(webenginescript_test_SRCS ...@@ -16,7 +16,7 @@ set(webenginescript_test_SRCS
add_executable(webenginescripttest ${webenginescript_test_SRCS}) add_executable(webenginescripttest ${webenginescript_test_SRCS})
target_link_libraries(webenginescripttest target_link_libraries(webenginescripttest
Qt5::Widgets KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets
) )
###### ######
...@@ -28,10 +28,13 @@ set(webengineaccesskey_test_SRCS ...@@ -28,10 +28,13 @@ set(webengineaccesskey_test_SRCS
add_executable(webengineaccesskeytest ${webengineaccesskey_test_SRCS}) add_executable(webengineaccesskeytest ${webengineaccesskey_test_SRCS})
target_link_libraries(webengineaccesskeytest target_link_libraries(webengineaccesskeytest
Qt5::Widgets KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes KF5::WebKit Qt5::WebKitWidgets Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes KF5::WebKit Qt5::WebKitWidgets
) )
endif() endif()
#### ####
#laurent move to messageviewer test
if (0)
set(scrolladdattachment_test_SRCS set(scrolladdattachment_test_SRCS
testwebenginescrolladdattachment.cpp testwebenginescrolladdattachment.cpp
) )
...@@ -39,7 +42,7 @@ set(scrolladdattachment_test_SRCS ...@@ -39,7 +42,7 @@ set(scrolladdattachment_test_SRCS
add_executable(scrolladdattachmenttest ${scrolladdattachment_test_SRCS}) add_executable(scrolladdattachmenttest ${scrolladdattachment_test_SRCS})
target_link_libraries(scrolladdattachmenttest target_link_libraries(scrolladdattachmenttest
Qt5::Widgets KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes
) )
#### ####
...@@ -50,5 +53,6 @@ set(testmailwebengine_test_SRCS ...@@ -50,5 +53,6 @@ set(testmailwebengine_test_SRCS
add_executable(testmailwebengine ${testmailwebengine_test_SRCS}) add_executable(testmailwebengine ${testmailwebengine_test_SRCS})
target_link_libraries(testmailwebengine target_link_libraries(testmailwebengine
Qt5::Widgets KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes Qt5::Widgets KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets KF5::XmlGui KF5::IconThemes
) )
endif()
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWebEngineSettings> #include <QWebEngineSettings>
#include <viewer/webengine/mailwebengineview.h> #include <webengineviewer/mailwebengineview.h>
TestMailWebEngine::TestMailWebEngine(QWidget *parent) TestMailWebEngine::TestMailWebEngine(QWidget *parent)
: QWidget(parent) : QWidget(parent)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <QDebug> #include <QDebug>
#include <QWebEngineSettings> #include <QWebEngineSettings>
#include <QContextMenuEvent> #include <QContextMenuEvent>
#include <webengine/webhittest.h> #include <webengineviewer/webhittest.h>
TestWebEngine::TestWebEngine(QWidget *parent) TestWebEngine::TestWebEngine(QWidget *parent)
: QWidget(parent) : QWidget(parent)
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWebEngineSettings> #include <QWebEngineSettings>
#include <viewer/webengine/mailwebengineview.h> #include <webengineviewer/mailwebengineview.h>
template<typename Arg, typename R, typename C> template<typename Arg, typename R, typename C>
struct InvokeWrapper { struct InvokeWrapper {
......
ecm_add_test(webengineaccesskeyanchortest.cpp ../webengineaccesskeyanchor.cpp ../webengineaccesskeyutils.cpp ecm_add_test(webengineaccesskeyanchortest.cpp ../webengineaccesskeyanchor.cpp ../webengineaccesskeyutils.cpp
TEST_NAME webengineaccesskeyanchortest TEST_NAME webengineaccesskeyanchortest
NAME_PREFIX "messageviewer-webengine-" NAME_PREFIX "messageviewer-webengine-"
LINK_LIBRARIES Qt5::Test KF5::MessageViewer LINK_LIBRARIES Qt5::Test KF5::WebEngineViewer
) )
ecm_add_test(webengineaccesskeyanchorfromhtmltest.cpp ../webengineaccesskeyanchor.cpp ../webengineaccesskeyutils.cpp ecm_add_test(webengineaccesskeyanchorfromhtmltest.cpp ../webengineaccesskeyanchor.cpp ../webengineaccesskeyutils.cpp
TEST_NAME webengineaccesskeyanchorfromhtmltest TEST_NAME webengineaccesskeyanchorfromhtmltest
NAME_PREFIX "messageviewer-webengine-" NAME_PREFIX "messageviewer-webengine-"
LINK_LIBRARIES Qt5::Test KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets LINK_LIBRARIES Qt5::Test KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets
) )
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