summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2016-04-06 08:21:09 +0200
committerMontel Laurent <[email protected]>2016-04-06 08:21:09 +0200
commitd3686f1af0b396f654011590fba70376baa3489c (patch)
tree0f1ce2ef005aeee9e7ecd8fd1893825cef80f880
parent180433ae3f1497ddcddce94b93f00816f80e0dc4 (diff)
Reactivate tests
-rw-r--r--webengineviewer/src/CMakeLists.txt6
-rw-r--r--webengineviewer/src/autotests/CMakeLists.txt2
-rw-r--r--webengineviewer/src/tests/CMakeLists.txt14
-rw-r--r--webengineviewer/src/tests/testmailwebengine.cpp2
-rw-r--r--webengineviewer/src/tests/testwebengine.cpp2
-rw-r--r--webengineviewer/src/tests/testwebenginescrolladdattachment.cpp2
-rw-r--r--webengineviewer/src/webengineaccesskey/autotests/CMakeLists.txt4
7 files changed, 18 insertions, 14 deletions
diff --git a/webengineviewer/src/CMakeLists.txt b/webengineviewer/src/CMakeLists.txt
index a0efd96..737f184 100644
--- a/webengineviewer/src/CMakeLists.txt
+++ b/webengineviewer/src/CMakeLists.txt
@@ -2,9 +2,9 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libwebengineviewer\")
if(BUILD_TESTING)
- #add_subdirectory(tests)
- #add_subdirectory(autotests)
- #add_subdirectory(webengineaccesskey/autotests)
+ add_subdirectory(tests)
+ add_subdirectory(autotests)
+ add_subdirectory(webengineaccesskey/autotests)
endif()
diff --git a/webengineviewer/src/autotests/CMakeLists.txt b/webengineviewer/src/autotests/CMakeLists.txt
index 2675ee9..0e165c2 100644
--- a/webengineviewer/src/autotests/CMakeLists.txt
+++ b/webengineviewer/src/autotests/CMakeLists.txt
@@ -1,7 +1,7 @@
ecm_add_test(webhittestresulttest.cpp ../webhittestresult.cpp
TEST_NAME webhittestresulttest
NAME_PREFIX "messageviewer-webengine-"
- LINK_LIBRARIES Qt5::Test KF5::MessageViewer
+ LINK_LIBRARIES Qt5::Test KF5::WebEngineViewer
)
diff --git a/webengineviewer/src/tests/CMakeLists.txt b/webengineviewer/src/tests/CMakeLists.txt
index edd69d1..240bacc 100644
--- a/webengineviewer/src/tests/CMakeLists.txt
+++ b/webengineviewer/src/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ set(webengine_test_SRCS
add_executable(webenginetest ${webengine_test_SRCS})
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
add_executable(webenginescripttest ${webenginescript_test_SRCS})
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
add_executable(webengineaccesskeytest ${webengineaccesskey_test_SRCS})
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()
####
+
+#laurent move to messageviewer test
+if (0)
set(scrolladdattachment_test_SRCS
testwebenginescrolladdattachment.cpp
)
@@ -39,7 +42,7 @@ set(scrolladdattachment_test_SRCS
add_executable(scrolladdattachmenttest ${scrolladdattachment_test_SRCS})
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
add_executable(testmailwebengine ${testmailwebengine_test_SRCS})
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()
diff --git a/webengineviewer/src/tests/testmailwebengine.cpp b/webengineviewer/src/tests/testmailwebengine.cpp
index 9a1604f..96377af 100644
--- a/webengineviewer/src/tests/testmailwebengine.cpp
+++ b/webengineviewer/src/tests/testmailwebengine.cpp
@@ -23,7 +23,7 @@
#include <QVBoxLayout>
#include <QWebEngineSettings>
-#include <viewer/webengine/mailwebengineview.h>
+#include <webengineviewer/mailwebengineview.h>
TestMailWebEngine::TestMailWebEngine(QWidget *parent)
: QWidget(parent)
diff --git a/webengineviewer/src/tests/testwebengine.cpp b/webengineviewer/src/tests/testwebengine.cpp
index 1a06caf..673521e 100644
--- a/webengineviewer/src/tests/testwebengine.cpp
+++ b/webengineviewer/src/tests/testwebengine.cpp
@@ -24,7 +24,7 @@
#include <QDebug>
#include <QWebEngineSettings>
#include <QContextMenuEvent>
-#include <webengine/webhittest.h>
+#include <webengineviewer/webhittest.h>
TestWebEngine::TestWebEngine(QWidget *parent)
: QWidget(parent)
diff --git a/webengineviewer/src/tests/testwebenginescrolladdattachment.cpp b/webengineviewer/src/tests/testwebenginescrolladdattachment.cpp
index 90d244a..e04fd90 100644
--- a/webengineviewer/src/tests/testwebenginescrolladdattachment.cpp
+++ b/webengineviewer/src/tests/testwebenginescrolladdattachment.cpp
@@ -24,7 +24,7 @@
#include <QVBoxLayout>
#include <QWebEngineSettings>
-#include <viewer/webengine/mailwebengineview.h>
+#include <webengineviewer/mailwebengineview.h>
template<typename Arg, typename R, typename C>
struct InvokeWrapper {
diff --git a/webengineviewer/src/webengineaccesskey/autotests/CMakeLists.txt b/webengineviewer/src/webengineaccesskey/autotests/CMakeLists.txt
index a7a6034..6ed434c 100644
--- a/webengineviewer/src/webengineaccesskey/autotests/CMakeLists.txt
+++ b/webengineviewer/src/webengineaccesskey/autotests/CMakeLists.txt
@@ -1,11 +1,11 @@
ecm_add_test(webengineaccesskeyanchortest.cpp ../webengineaccesskeyanchor.cpp ../webengineaccesskeyutils.cpp
TEST_NAME webengineaccesskeyanchortest
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
TEST_NAME webengineaccesskeyanchorfromhtmltest
NAME_PREFIX "messageviewer-webengine-"
- LINK_LIBRARIES Qt5::Test KF5::MessageViewer Qt5::WebEngine Qt5::WebEngineWidgets
+ LINK_LIBRARIES Qt5::Test KF5::WebEngineViewer Qt5::WebEngine Qt5::WebEngineWidgets
)