afa7145 · unity8 · git.iko.soy

tests/copyright/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -2,5 +2,5 @@

2# Test that all source files contain a copyright header.

3#

4

5−add_test(copyright ${CMAKE_CURRENT_SOURCE_DIR}/check_copyright.sh

5+add_test(Copyright ${CMAKE_CURRENT_SOURCE_DIR}/check_copyright.sh

6 ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

tests/libs/UbuntuGestures/CMakeLists.txt+4−8

@@ -4,17 +4,13 @@ include_directories(

4 )

5

6macro(add_gesture_test CLASSNAME)

7− set(testCommand

8− ${CLASSNAME}TestExec -o ${CMAKE_BINARY_DIR}/test${CLASSNAME}.xml,xunitxml -o -,txt)

9−

10− add_test(NAME test${CLASSNAME} COMMAND ${testCommand})

11−

12− set_tests_properties(test${CLASSNAME} PROPERTIES

13− ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/libs/UbuntuGestures)

14−

15 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp)

7 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp)

16 qt5_use_modules(${CLASSNAME}TestExec Test Core Gui Quick)

8 qt5_use_modules(${CLASSNAME}TestExec Test Core Gui Quick)

17 target_link_libraries(${CLASSNAME}TestExec UbuntuGestures)

9 target_link_libraries(${CLASSNAME}TestExec UbuntuGestures)

10+

11+ add_unity8_unittest(${CLASSNAME} ${CLASSNAME}TestExec

12+ ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/libs/UbuntuGestures

13+ )

18endmacro(add_gesture_test)

14endmacro(add_gesture_test)

19

15

20add_gesture_test(TouchRegistry)

16add_gesture_test(TouchRegistry)

tests/plugins/AccountsService/CMakeLists.txt+5−4

@@ -43,12 +43,13 @@ add_executable(test-accountsservice

43 )

44qt5_use_modules(test-accountsservice Core DBus Test)

45

46−add_test(NAME test-accountsservice

47− COMMAND dbus-test-runner

46+add_unity8_unittest(AccountsService dbus-test-runner

47+ ARG_PREFIX "--parameter"

48+ ARGS

48− --task ${CMAKE_CURRENT_BINARY_DIR}/mock-server

49+ --task $<TARGET_FILE:mock-server>

49 --task-name server

50 --task-name server

50 --ignore-return

51 --ignore-return

51− --task ${CMAKE_CURRENT_BINARY_DIR}/test-accountsservice

52+ --task $<TARGET_FILE:test-accountsservice>

52 --task-name client

53 --task-name client

53 --wait-for org.freedesktop.Accounts

54 --wait-for org.freedesktop.Accounts

54 )

55 )

tests/plugins/Dash/CMakeLists.txt+10−17

@@ -32,7 +32,7 @@ macro(add_lvwph_test FILENAME TESTNAME)

32 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

33 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

34

35− add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")

35+ add_unity8_uitest(${TESTNAME} ${TESTNAME}TestExec DEPENDS Dash-qml)

36endmacro()

37

38add_lvwph_test(listviewwithpageheader ListViewWithPageHeader)

@@ -48,19 +48,16 @@ macro(add_dashview_try_test FILENAME TESTNAME)

48 qt5_use_modules(${TESTNAME}TestExec Test Core Qml)

49 target_link_libraries(${TESTNAME}TestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

50

51− add_binary_qml_test(${TESTNAME} "" "Dash-qml" "")

51+ add_unity8_uitest(${TESTNAME} ${TESTNAME}TestExec DEPENDS Dash-qml)

52

53− add_executable(${TESTNAME}tryExec

53+ add_executable(${TESTNAME}TryExec

54 ${FILENAME}try.cpp

55 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/${FILENAME}.cpp

56 ${CMAKE_CURRENT_SOURCE_DIR}/../../../plugins/Dash/abstractdashview.cpp

57 )

58− qt5_use_modules(${TESTNAME}tryExec Test Core Qml)

58+ qt5_use_modules(${TESTNAME}TryExec Test Core Qml)

59− target_link_libraries(${TESTNAME}tryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

59+ target_link_libraries(${TESTNAME}TryExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

60− add_custom_target(try${TESTNAME}

60+ add_manual_test(${TESTNAME} ${TESTNAME}TryExec DEPENDS Dash-qml)

61− ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}tryExec

62− DEPENDS ${TESTNAME}tryExec Dash-qml

63− )

64endmacro()

61endmacro()

65

62

66add_dashview_try_test(verticaljournal VerticalJournal)

63add_dashview_try_test(verticaljournal VerticalJournal)

@@ -71,13 +68,9 @@ add_dashview_try_test(organicgrid OrganicGrid)

71add_executable(CardCreatorTestExec cardcreatortest.cpp)

68add_executable(CardCreatorTestExec cardcreatortest.cpp)

72qt5_use_modules(CardCreatorTestExec Test Core Qml)

69qt5_use_modules(CardCreatorTestExec Test Core Qml)

73target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

70target_link_libraries(CardCreatorTestExec ${Qt5Gui_LIBRARIES} ${Qt5Quick_LIBRARIES})

74−add_binary_qml_test(CardCreator "" "Dash-qml" "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks/")

71+add_unity8_uitest(CardCreator CardCreatorTestExec DEPENDS Dash-qml)

75

72

76# plain qml test

73# plain qml test

77−set(qmltest_DEFAULT_TARGETS qmluitests)

74+foreach(dash_test ScopeStyle ListViewWithPageHeaderQML CardAttributes CroppedImageMinimumSourceSize)

78−set(qmltest_DEFAULT_NO_ADD_TEST TRUE)

75+ add_unity8_qmltest(. ${dash_test})

79−set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")

76+endforeach()

80−add_qml_test(. ScopeStyle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

81−add_qml_test(. ListViewWithPageHeaderQML IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

82−add_qml_test(. CardAttributes IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

83−add_qml_test(. CroppedImageMinimumSourceSize IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt+4−5

@@ -13,11 +13,6 @@ add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

13add_definitions(-DLAUNCHER_TESTING)

14

15### LauncherModelASTest

16−set(testModelCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/launchermodelastestExec

17− --parameter -o --parameter ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml

18− --parameter -o --parameter -,txt)

19−add_test(NAME launchermodelastest COMMAND ${testModelCommand})

20−add_custom_target(launchermodelastest ${testModelCommand})

21add_executable(launchermodelastestExec

16add_executable(launchermodelastestExec

22 launchermodelastest.cpp

17 launchermodelastest.cpp

23 AccountsServiceDBusAdaptor.cpp

18 AccountsServiceDBusAdaptor.cpp

@@ -36,6 +31,10 @@ target_link_libraries(launchermodelastestExec

36 ${GSETTINGS_QT_LDFLAGS}

31 ${GSETTINGS_QT_LDFLAGS}

37 )

32 )

38qt5_use_modules(launchermodelastestExec Test Core DBus Gui)

33qt5_use_modules(launchermodelastestExec Test Core DBus Gui)

34+add_unity8_unittest(LauncherModelAS dbus-test-runner

35+ ARG_PREFIX "--parameter"

36+ ARGS --task $<TARGET_FILE:launchermodelastestExec>

37+)

39

38

40# copy .desktop files into build directory for shadow builds

39# copy .desktop files into build directory for shadow builds

41file(GLOB DESKTOP_FILES *.desktop)

40file(GLOB DESKTOP_FILES *.desktop)

tests/plugins/LightDM/CMakeLists.txt+9−3

@@ -28,6 +28,12 @@ target_link_libraries(GreeterUsersModelTestExec

28

29add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")

30

31+add_unity8_uitest(GreeterDBus GreeterDBusTestExec

31−add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")

32+ ENVIRONMENT LD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm"

32−

33+ IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks

34+ DEPENDS MockLightDM

35+ )

36+add_unity8_uitest(GreeterUsers GreeterUsersModelTestExec

33−add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")

37+ ENVIRONMENT LD_LIBRARY_PATH="${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" LIBLIGHTDM_MOCK_MODE=full

38+ DEPENDS MockLightDM

39+ )

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+14−24

@@ -12,40 +12,30 @@ include_directories(

12 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}

13 )

14

15−file(GLOB qmlFiles *.qml)

15+export_qmlfiles(UbuntuGesturesTest .)

16−add_custom_target(UbuntuGesturesTestQmlFiles ALL

17− COMMAND cp ${qmlFiles} ${CMAKE_CURRENT_BINARY_DIR}

18− DEPENDS ${qmlFiles}

19−)

20

16

21add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

17add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

22

18

23−macro(add_gesture_ui_test CLASSNAME)

19+macro(add_gesture_test CLASSNAME)

24 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp)

20 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp)

25 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

21 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

26 target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml UbuntuGestures)

22 target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml UbuntuGestures)

27

23

28− add_binary_qml_test(${CLASSNAME} ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures UbuntuGesturesTestQmlFiles "")

24+ add_executable_test(${CLASSNAME} ${CLASSNAME}TestExec

29− add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

30−endmacro(add_gesture_ui_test)

31−

32−macro(add_gesture_test CLASSNAME)

33− set(testCommand

34− ${CLASSNAME}TestExec -o ${CMAKE_BINARY_DIR}/test${CLASSNAME}.xml,xunitxml -o -,txt)

35−

36− add_test(NAME test${CLASSNAME} COMMAND ${testCommand})

37−

38− set_tests_properties(test${CLASSNAME} PROPERTIES

39− ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)

25+ ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures

26+ DEPENDS UbuntuGesturesTest-qmlfiles

27+ ${ARGN}

28+ )

29+endmacro()

40

30

41− add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp)

31+macro(add_gesture_ui_test CLASSNAME)

42− qt5_use_modules(${CLASSNAME}TestExec Test Core)

32+ add_gesture_test(${CLASSNAME})

43− target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml)

33+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

44−endmacro(add_gesture_test)

34+endmacro()

45

35

46add_gesture_ui_test(DirectionalDragArea)

36add_gesture_ui_test(DirectionalDragArea)

47add_gesture_ui_test(PressedOutsideNotifier)

37add_gesture_ui_test(PressedOutsideNotifier)

48add_gesture_ui_test(TouchDispatcher)

38add_gesture_ui_test(TouchDispatcher)

49add_gesture_ui_test(TouchGate)

39add_gesture_ui_test(TouchGate)

50−add_gesture_test(Damper)

40+add_gesture_test(Damper ADD_TEST)

51−add_gesture_test(AxisVelocityCalculator)

41+add_gesture_test(AxisVelocityCalculator ADD_TEST)

tests/plugins/Unity/Indicators/CMakeLists.txt+9−12

@@ -17,13 +17,8 @@ macro(indicator_test TEST)

17 set(multi_value_keywords ADDITIONAL_CPPS ADDITIONAL_LIBS)

18 cmake_parse_arguments(test "" "" "${multi_value_keywords}" ${ARGN})

19

20− set(testCommand ${CMAKE_CURRENT_BINARY_DIR}/${TEST}Exec

21− -o ${CMAKE_BINARY_DIR}/${TEST}.xml,xunitxml

22− -o -,txt)

23− add_test(NAME ${TEST} COMMAND ${testCommand})

24− add_custom_target(${TEST} ${testCommand})

25 add_executable(${TEST}Exec

20 add_executable(${TEST}Exec

26− ${TEST}.cpp

21+ ${TEST}Test.cpp

27 ${test_ADDITIONAL_CPPS}

22 ${test_ADDITIONAL_CPPS}

28 )

23 )

29 qt5_use_modules(${TEST}Exec Test Core Qml)

24 qt5_use_modules(${TEST}Exec Test Core Qml)

@@ -33,11 +28,13 @@ macro(indicator_test TEST)

33 ${GIO_LIBRARIES}

28 ${GIO_LIBRARIES}

34 ${QMENUMODEL_LDFLAGS}

29 ${QMENUMODEL_LDFLAGS}

35 )

30 )

31+

32+ add_unity8_unittest(${TEST} ${TEST}Exec)

36endmacro(indicator_test)

33endmacro(indicator_test)

37

34

38−indicator_test(indicatorsmanagertest ADDITIONAL_LIBS IndicatorsQml)

35+indicator_test(IndicatorsManager ADDITIONAL_LIBS IndicatorsQml)

39−indicator_test(indicatorsmodeltest ADDITIONAL_LIBS IndicatorsQml)

36+indicator_test(IndicatorsModel ADDITIONAL_LIBS IndicatorsQml)

40−indicator_test(menucontentactivatortest ADDITIONAL_CPPS ${INDICATORS_DIR}/menucontentactivator.cpp)

37+indicator_test(MenuContentActivator ADDITIONAL_CPPS ${INDICATORS_DIR}/menucontentactivator.cpp)

41−indicator_test(unitymenumodelstacktest ADDITIONAL_CPPS ${TEST_DIR}/mocks/QMenuModel/unitymenumodel.cpp ${INDICATORS_DIR}/unitymenumodelstack.cpp)

38+indicator_test(UnityMenuModelStack ADDITIONAL_CPPS ${TEST_DIR}/mocks/QMenuModel/unitymenumodel.cpp ${INDICATORS_DIR}/unitymenumodelstack.cpp)

42−indicator_test(rootactionstatetest ADDITIONAL_LIBS IndicatorsQml)

39+indicator_test(RootActionState ADDITIONAL_LIBS IndicatorsQml)

43−indicator_test(sharedunitymenumodeltest ADDITIONAL_LIBS IndicatorsQml)

40+indicator_test(SharedUnityMenuModel ADDITIONAL_LIBS IndicatorsQml)

tests/plugins/Unity/Indicators/indicatorsmanagertest.cpp → tests/plugins/Unity/Indicators/IndicatorsManagerTest.cpprenamed+1−1

@@ -180,4 +180,4 @@ private Q_SLOTS:

180};

181

182QTEST_GUILESS_MAIN(IndicatorsManagerTest)

183−#include "indicatorsmanagertest.moc"

183+#include "IndicatorsManagerTest.moc"

tests/plugins/Unity/Indicators/indicatorsmodeltest.cpp → tests/plugins/Unity/Indicators/IndicatorsModelTest.cpprenamed+1−1

@@ -138,4 +138,4 @@ private Q_SLOTS:

138

139QTEST_GUILESS_MAIN(IndicatorsModelTest)

140

141−#include "indicatorsmodeltest.moc"

141+#include "IndicatorsModelTest.moc"

tests/plugins/Unity/Indicators/menucontentactivatortest.cpp → tests/plugins/Unity/Indicators/MenuContentActivatorTest.cpprenamed+1−1

@@ -299,4 +299,4 @@ private:

299};

300

301QTEST_GUILESS_MAIN(MenuConentActivatorTest)

302−#include "menucontentactivatortest.moc"

302+#include "MenuContentActivatorTest.moc"

tests/plugins/Unity/Indicators/rootactionstatetest.cpp → tests/plugins/Unity/Indicators/RootActionStateTest.cpprenamed+1−1

@@ -92,4 +92,4 @@ private Q_SLOTS:

92};

93

94QTEST_GUILESS_MAIN(RootActionStateTest)

95−#include "rootactionstatetest.moc"

95+#include "RootActionStateTest.moc"

tests/plugins/Unity/Indicators/sharedunitymenumodeltest.cpp → tests/plugins/Unity/Indicators/SharedUnityMenuModelTest.cpprenamed+1−1

@@ -99,4 +99,4 @@ private Q_SLOTS:

99};

100

101QTEST_GUILESS_MAIN(SharedUnityMenuModelTest)

102−#include "sharedunitymenumodeltest.moc"

102+#include "SharedUnityMenuModelTest.moc"

tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp → tests/plugins/Unity/Indicators/UnityMenuModelStackTest.cpprenamed+1−1

@@ -205,4 +205,4 @@ public:

205};

206

207QTEST_GUILESS_MAIN(UnityMenuModelStackTest)

208−#include "unitymenumodelstacktest.moc"

208+#include "UnityMenuModelStackTest.moc"

tests/plugins/Unity/Launcher/CMakeLists.txt+5−5

@@ -15,11 +15,6 @@ add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

15add_definitions(-DLAUNCHER_TESTING)

16

17### LauncherModelTest

18−set(testModelCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/launchermodeltestExec

19− --parameter -o --parameter ${CMAKE_BINARY_DIR}/launchermodeltest.xml,xunitxml

20− --parameter -o --parameter -,txt)

21−add_test(NAME launchermodeltest COMMAND ${testModelCommand})

22−add_custom_target(launchermodeltest ${testModelCommand})

23add_executable(launchermodeltestExec

18add_executable(launchermodeltestExec

24 launchermodeltest.cpp

19 launchermodeltest.cpp

25 gsettings.cpp

20 gsettings.cpp

@@ -43,6 +38,11 @@ target_link_libraries(launchermodeltestExec

43 )

38 )

44qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui)

39qt5_use_modules(launchermodeltestExec Test Core DBus Xml Gui)

45

40

41+add_unity8_unittest(LauncherModel dbus-test-runner

42+ ARG_PREFIX "--parameter"

43+ ARGS --task $<TARGET_FILE:launchermodeltestExec>

44+)

45+

46# copy .desktop files into build directory for shadow builds

47file(GLOB DESKTOP_FILES *.desktop)

48

tests/plugins/Unity/Session/CMakeLists.txt+5−5

@@ -9,11 +9,6 @@ add_definitions(-DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}")

9add_definitions(-DSESSION_TESTING)

10

11### SessionBackendTest

12−set(testBackendCommand dbus-test-runner --task ${CMAKE_CURRENT_BINARY_DIR}/sessionbackendtestExec

13− --parameter -o --parameter ${CMAKE_BINARY_DIR}/sessionbackendtest.xml,xunitxml

14− --parameter -o --parameter -,txt)

15−add_test(NAME sessionbackendtest COMMAND ${testBackendCommand})

16−add_custom_target(sessionbackendtest ${testBackendCommand})

17add_executable(sessionbackendtestExec

12add_executable(sessionbackendtestExec

18 sessionbackendtest.cpp

13 sessionbackendtest.cpp

19 ${CMAKE_SOURCE_DIR}/plugins/Unity/Session/dbusunitysessionservice.cpp

14 ${CMAKE_SOURCE_DIR}/plugins/Unity/Session/dbusunitysessionservice.cpp

@@ -22,3 +17,8 @@ target_link_libraries(sessionbackendtestExec

22 unity8-private

17 unity8-private

23 )

18 )

24qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)

19qt5_use_modules(sessionbackendtestExec Test Core Qml DBus)

20+

21+add_unity8_unittest(SessionBackend dbus-test-runner

22+ ARG_PREFIX "--parameter"

23+ ARGS --task $<TARGET_FILE:sessionbackendtestExec>

24+)

tests/plugins/Utils/CMakeLists.txt+12−26

@@ -4,31 +4,17 @@ include_directories(

4 ${CMAKE_CURRENT_BINARY_DIR}

5 )

6

7−macro(run_tests)

8− set(_test_list "")

9− foreach(_test ${ARGN})

7+foreach(util_test

10− set(testCommand env "LC_ALL=C.UTF-8" ${CMAKE_CURRENT_BINARY_DIR}/${_test}Exec

8+ QLimitProxyModel

11− -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml

9+ UnitySortFilterProxyModel

12− -o -,txt)

10+ TimeFormatter

13− add_test(NAME ${_test} COMMAND ${testCommand})

11+ HomeKeyWatcher

14− add_custom_target(${_test} ${testCommand})

12+)

15− add_executable(${_test}Exec ${_test}.cpp modeltest.cpp)

13+ add_executable(${util_test}TestExec ${util_test}Test.cpp ModelTest.cpp)

16− qt5_use_modules(${_test}Exec Test Core Qml)

14+ qt5_use_modules(${util_test}TestExec Test Core Qml)

17− target_link_libraries(${_test}Exec

15+ target_link_libraries(${util_test}TestExec Utils-qml)

18− Utils-qml

16+ add_unity8_unittest(${util_test} ${util_test}TestExec ADD_TEST)

19− )

20− set(_test_list "${_test_list};${_test}")

21− endforeach()

17+endforeach()

22−endmacro(run_tests)

23−

24−run_tests(

25− qlimitproxymodeltest

26− unitysortfilterproxymodeltest

27− timeformattertest

28− homekeywatchertest

29− )

30

18

31# plain qml test

19# plain qml test

32−set(qmltest_DEFAULT_TARGETS qmltests)

20+add_unity8_qmltest(. UtilsStyle)

33−set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")

34−add_qml_test(. UtilsStyle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

tests/plugins/Utils/homekeywatchertest.cpp → tests/plugins/Utils/HomeKeyWatcherTest.cpprenamed+1−1

@@ -320,4 +320,4 @@ AbstractTimer *FakeTimerFactory::create(QObject *parent)

320

321QTEST_GUILESS_MAIN(HomeKeyWatcherTest)

322

323−#include "homekeywatchertest.moc"

323+#include "HomeKeyWatcherTest.moc"

tests/plugins/Utils/modeltest.cpp → tests/plugins/Utils/ModelTest.cpprenamed+1−1

@@ -47,7 +47,7 @@

47

48#include <QtGui/QtGui>

49

50−#include "modeltest.h"

50+#include "ModelTest.h"

51

52#include <QtTest/QtTest>

53

tests/plugins/Utils/modeltest.h → tests/plugins/Utils/ModelTest.hrenamed

The content is the same.

tests/plugins/Utils/qlimitproxymodeltest.cpp → tests/plugins/Utils/QLimitProxyModelTest.cpprenamed+2−2

@@ -16,7 +16,7 @@

16

17// local

18#include "qlimitproxymodelqml.h"

19−#include "modeltest.h"

19+#include "ModelTest.h"

20

21// Qt

22#include <QTest>

@@ -608,4 +608,4 @@ private Q_SLOTS:

608

609QTEST_GUILESS_MAIN(QLimitProxyModelTest)

610

611−#include "qlimitproxymodeltest.moc"

611+#include "QLimitProxyModelTest.moc"

tests/plugins/Utils/timeformattertest.cpp → tests/plugins/Utils/TimeFormatterTest.cpprenamed+1−1

@@ -152,4 +152,4 @@ private Q_SLOTS:

152

153QTEST_GUILESS_MAIN(TimeFormatterTest)

154

155−#include "timeformattertest.moc"

155+#include "TimeFormatterTest.moc"

tests/plugins/Utils/unitysortfilterproxymodeltest.cpp → tests/plugins/Utils/UnitySortFilterProxyModelTest.cpprenamed+2−2

@@ -19,7 +19,7 @@

19

20// local

21#include "unitysortfilterproxymodelqml.h"

22−#include "modeltest.h"

22+#include "ModelTest.h"

23

24// Qt

25#include <QTest>

@@ -287,4 +287,4 @@ private Q_SLOTS:

287

288QTEST_GUILESS_MAIN(UnitySortFilterProxyModelTest)

289

290−#include "unitysortfilterproxymodeltest.moc"

290+#include "UnitySortFilterProxyModelTest.moc"

tests/plugins/Wizard/CMakeLists.txt+1−1

@@ -8,7 +8,7 @@ add_executable(tst-wizard-pagelist

8 ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp

9)

10qt5_use_modules(tst-wizard-pagelist Core Qml Test)

11−add_test(NAME wizardpagelisttest COMMAND env UNITY_TESTING=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-wizard-pagelist)

11+add_unity8_unittest(WizardPageList tst-wizard-pagelist)

12

13add_executable(tst-wizard-system

14 tst_system.cpp

tests/qmltests/Components/CMakeLists.txt+1−1

@@ -11,7 +11,7 @@ add_executable(DragHandleTestExec tst_DragHandle.cpp)

11qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

12target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)

13

14−add_binary_qml_test(DragHandle ${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures "" "")

14+add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)

15add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)

16

17add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

tests/whitespace/CMakeLists.txt+1−1

@@ -2,4 +2,4 @@

2# Test that all source files, cmakefiles, etc. do not contain trailing whitespace.

3#

4

5−add_test(whitespace ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

5+add_test(Whitespace ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})