@@ -16,12 +16,15 @@ export_qmlfiles(UbuntuGesturesTest .)
1616
1717add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")
1818
19−macro(add_gesture_test CLASSNAME)
19+macro(build_gesture_test CLASSNAME)
2020 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp)
2121 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)
2222 target_link_libraries(${CLASSNAME}TestExec UbuntuGesturesQml UbuntuGestures)
23+endmacro()
2324
24− add_executable_test(${CLASSNAME} ${CLASSNAME}TestExec
25+macro(add_gesture_unit_test CLASSNAME)
26+ build_gesture_test(${CLASSNAME})
27+ add_unity8_unittest(${CLASSNAME} ${CLASSNAME}TestExec
2528 ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
2629 DEPENDS UbuntuGesturesTest-qmlfiles
2730 ${ARGN}
@@ -29,7 +32,12 @@ macro(add_gesture_test CLASSNAME)
2932endmacro()
3033
3134macro(add_gesture_ui_test CLASSNAME)
32− add_gesture_test(${CLASSNAME})
35+ build_gesture_test(${CLASSNAME})
36+ add_unity8_uitest(${CLASSNAME} ${CLASSNAME}TestExec
37+ ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures
38+ DEPENDS UbuntuGesturesTest-qmlfiles
39+ ${ARGN}
40+ )
3341 add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
3442endmacro()
3543
@@ -37,5 +45,5 @@ add_gesture_ui_test(DirectionalDragArea)
3745add_gesture_ui_test(PressedOutsideNotifier)
3846add_gesture_ui_test(TouchDispatcher)
3947add_gesture_ui_test(TouchGate)
40−add_gesture_test(Damper ADD_TEST)
41−add_gesture_test(AxisVelocityCalculator ADD_TEST)
48+add_gesture_unit_test(Damper)
49+add_gesture_unit_test(AxisVelocityCalculator)