Merge lp:~osomon/webbrowser-app/separate-unittests into lp:webbrowser-app

[Olivier Tilloy]

Move unit tests to separate directories.

[lp:~osomon/webbrowser-app/separate-unittests]

205. By Olivier Tilloy on 2013-07-02

Define a variable with the name of the test executable.

206. By Olivier Tilloy on 2013-07-02

Remove unused target_link_libraries directive.

[Ugo Riboni (uriboni)]

Tests still pass and the new layout looks clearer to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:206
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/164/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/500

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/164/rebuild

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-06-06 10:51:04 +0000
+++ .bzrignore	2013-07-02 10:31:26 +0000
@@ -15,11 +15,7 @@
 src/config.h
 src/webbrowser-app
 src/webbrowser-app.desktop
-tests/unittests/tst_QmlTests
-tests/unittests/tst_CommandLineParserTests
-tests/unittests/tst_HistoryModelTests
-tests/unittests/tst_HistoryMatchesModelTests
-tests/unittests/tst_TabsModelTests
+RE:tests/unittests/.+/tst_\w+Tests$
 po/*.gmo
 
 obj-*

=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-06-12 07:04:55 +0000
+++ tests/unittests/CMakeLists.txt	2013-07-02 10:31:26 +0000
@@ -1,49 +1,5 @@
-add_executable(tst_QmlTests tst_QmlTests.cpp)
-qt5_use_modules(tst_QmlTests Core Qml Quick Test QuickTest)
-target_link_libraries(tst_QmlTests ${TPL_QT5_LIBRARIES})
-add_test(tst_QmlTests ${CMAKE_CURRENT_BINARY_DIR}/tst_QmlTests -import ${CMAKE_BINARY_DIR}/src)
-set_tests_properties(tst_QmlTests PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
-
-# copy qml test files to build dir
-file(GLOB qmlTestFiles RELATIVE ${CMAKE_SOURCE_DIR}/tests/unittests/ *qml)
-foreach(qmlTestFile ${qmlTestFiles})
-  file(COPY ${qmlTestFile} DESTINATION ${CMAKE_BINARY_DIR}/tests/unittests/)
-endforeach(qmlTestFile)
-
-set(CLP_SRC
-    ${webbrowser-app_SOURCE_DIR}/commandline-parser.cpp
-    tst_CommandLineParserTests.cpp
-)
-add_executable(tst_CommandLineParserTests ${CLP_SRC})
-include_directories(${webbrowser-app_SOURCE_DIR} ${webbrowser-app_BINARY_DIR})
-qt5_use_modules(tst_CommandLineParserTests Core Test)
-add_test(tst_CommandLineParserTests ${CMAKE_CURRENT_BINARY_DIR}/tst_CommandLineParserTests)
-
-set(HM_SRC
-    ${webbrowser-plugin_SOURCE_DIR}/history-model.cpp
-    tst_HistoryModelTests.cpp
-)
-add_executable(tst_HistoryModelTests ${HM_SRC})
-include_directories(${webbrowser-plugin_SOURCE_DIR})
-qt5_use_modules(tst_HistoryModelTests Core Sql Test)
-add_test(tst_HistoryModelTests ${CMAKE_CURRENT_BINARY_DIR}/tst_HistoryModelTests)
-
-set(HMM_SRC
-    ${webbrowser-plugin_SOURCE_DIR}/history-model.cpp
-    ${webbrowser-plugin_SOURCE_DIR}/history-matches-model.cpp
-    tst_HistoryMatchesModelTests.cpp
-)
-add_executable(tst_HistoryMatchesModelTests ${HMM_SRC})
-include_directories(${webbrowser-plugin_SOURCE_DIR})
-qt5_use_modules(tst_HistoryMatchesModelTests Core Sql Test)
-add_test(tst_HistoryMatchesModelTests ${CMAKE_CURRENT_BINARY_DIR}/tst_HistoryMatchesModelTests)
-
-set(TM_SRC
-    ${webbrowser-plugin_SOURCE_DIR}/tabs-model.cpp
-    tst_TabsModelTests.cpp
-)
-add_executable(tst_TabsModelTests ${TM_SRC})
-include_directories(${webbrowser-plugin_SOURCE_DIR})
-qt5_use_modules(tst_TabsModelTests Core Quick Test)
-add_test(tst_TabsModelTests ${CMAKE_CURRENT_BINARY_DIR}/tst_TabsModelTests)
-set_tests_properties(tst_TabsModelTests PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+add_subdirectory(qml)
+add_subdirectory(commandline-parser)
+add_subdirectory(history-model)
+add_subdirectory(history-matches-model)
+add_subdirectory(tabs-model)

=== added directory 'tests/unittests/commandline-parser'
=== added file 'tests/unittests/commandline-parser/CMakeLists.txt'
--- tests/unittests/commandline-parser/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/commandline-parser/CMakeLists.txt	2013-07-02 10:31:26 +0000
@@ -0,0 +1,9 @@
+set(TEST tst_CommandLineParserTests)
+set(SOURCES
+    ${webbrowser-app_SOURCE_DIR}/commandline-parser.cpp
+    tst_CommandLineParserTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-app_SOURCE_DIR} ${webbrowser-app_BINARY_DIR})
+qt5_use_modules(${TEST} Core Test)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST})

=== renamed file 'tests/unittests/tst_CommandLineParserTests.cpp' => 'tests/unittests/commandline-parser/tst_CommandLineParserTests.cpp'
=== added directory 'tests/unittests/history-matches-model'
=== added file 'tests/unittests/history-matches-model/CMakeLists.txt'
--- tests/unittests/history-matches-model/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/history-matches-model/CMakeLists.txt	2013-07-02 10:31:26 +0000
@@ -0,0 +1,10 @@
+set(TEST tst_HistoryMatchesModelTests)
+set(SOURCES
+    ${webbrowser-plugin_SOURCE_DIR}/history-model.cpp
+    ${webbrowser-plugin_SOURCE_DIR}/history-matches-model.cpp
+    tst_HistoryMatchesModelTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-plugin_SOURCE_DIR})
+qt5_use_modules(${TEST} Core Sql Test)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST})

=== renamed file 'tests/unittests/tst_HistoryMatchesModelTests.cpp' => 'tests/unittests/history-matches-model/tst_HistoryMatchesModelTests.cpp'
=== added directory 'tests/unittests/history-model'
=== added file 'tests/unittests/history-model/CMakeLists.txt'
--- tests/unittests/history-model/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/history-model/CMakeLists.txt	2013-07-02 10:31:26 +0000
@@ -0,0 +1,9 @@
+set(TEST tst_HistoryModelTests)
+set(SOURCES
+    ${webbrowser-plugin_SOURCE_DIR}/history-model.cpp
+    tst_HistoryModelTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-plugin_SOURCE_DIR})
+qt5_use_modules(${TEST} Core Sql Test)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST})

=== renamed file 'tests/unittests/tst_HistoryModelTests.cpp' => 'tests/unittests/history-model/tst_HistoryModelTests.cpp'
=== added directory 'tests/unittests/qml'
=== added file 'tests/unittests/qml/CMakeLists.txt'
--- tests/unittests/qml/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/qml/CMakeLists.txt	2013-07-02 10:31:26 +0000
@@ -0,0 +1,11 @@
+set(TEST tst_QmlTests)
+add_executable(${TEST} tst_QmlTests.cpp)
+qt5_use_modules(${TEST} Core Qml Quick Test QuickTest)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST} -import ${CMAKE_BINARY_DIR}/src)
+set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
+
+# copy qml test files to build dir
+file(GLOB qmlTestFiles RELATIVE ${CMAKE_SOURCE_DIR}/tests/unittests/qml/ *qml)
+foreach(qmlTestFile ${qmlTestFiles})
+  file(COPY ${qmlTestFile} DESTINATION ${CMAKE_BINARY_DIR}/tests/unittests/qml/)
+endforeach(qmlTestFile)

=== renamed file 'tests/unittests/tst_AddressBar.qml' => 'tests/unittests/qml/tst_AddressBar.qml'
=== renamed file 'tests/unittests/tst_Chrome.qml' => 'tests/unittests/qml/tst_Chrome.qml'
=== renamed file 'tests/unittests/tst_QmlTests.cpp' => 'tests/unittests/qml/tst_QmlTests.cpp'
=== added directory 'tests/unittests/tabs-model'
=== added file 'tests/unittests/tabs-model/CMakeLists.txt'
--- tests/unittests/tabs-model/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/tabs-model/CMakeLists.txt	2013-07-02 10:31:26 +0000
@@ -0,0 +1,10 @@
+set(TEST tst_TabsModelTests)
+set(SOURCES
+    ${webbrowser-plugin_SOURCE_DIR}/tabs-model.cpp
+    tst_TabsModelTests.cpp
+)
+add_executable(${TEST} ${SOURCES})
+include_directories(${webbrowser-plugin_SOURCE_DIR})
+qt5_use_modules(${TEST} Core Quick Test)
+add_test(${TEST} ${CMAKE_CURRENT_BINARY_DIR}/${TEST})
+set_tests_properties(${TEST} PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

=== renamed file 'tests/unittests/tst_TabsModelTests.cpp' => 'tests/unittests/tabs-model/tst_TabsModelTests.cpp'