Modify unittests for automation 13/196713/2
authorhyunho <hhstark.kang@samsung.com>
Fri, 4 Jan 2019 01:46:08 +0000 (10:46 +0900)
committerhyunho <hhstark.kang@samsung.com>
Fri, 4 Jan 2019 01:56:51 +0000 (10:56 +0900)
Change-Id: I8a02f62ea4a2aeff39d8b9d06501b8ac0af9369d
Signed-off-by: hyunho <hhstark.kang@samsung.com>
CMakeLists.txt
packaging/libwatchface-complication.spec
unittest/CMakeLists.txt
unittest/post_execution.sh [new file with mode: 0644]
unittest/pre_execution.sh [new file with mode: 0644]

index 30a1270..de87d83 100644 (file)
@@ -12,4 +12,4 @@ ADD_DEPENDENCIES(watchface-complication watchface-common)
 ADD_DEPENDENCIES(watchface-editor watchface-complication)
 ADD_DEPENDENCIES(watchface-complication-provider watchface-complication)
 ADD_DEPENDENCIES(complication-parser watchface-complication)
-ADD_DEPENDENCIES(gtest-watchface-complication watchface-complication-provider)
+ADD_DEPENDENCIES(watchface-complication_unittests watchface-complication-provider)
index e73d128..60c60d8 100644 (file)
@@ -241,17 +241,25 @@ Header & package configuration files to support development of the watchface edi
 
 
 #################################################
-# gtest-watchface-complication
+# watchface-complication-unittests
 #################################################
-%package -n gtest-watchface-complication
+%package -n watchface-complication-unittests
 Summary:    GTest for watchface-complication
 Group:      Development/Libraries
 
-%description -n gtest-watchface-complication
+%description -n watchface-complication-unittests
 GTest for watchface-complication
 
-%files -n gtest-watchface-complication
-%{_bindir}/gtest-watchface-complication
+%files -n watchface-complication-unittests
+%{_bindir}/watchface-complication_unittests
+%{_bindir}/pre_execution.sh
+%{_bindir}/post_execution.sh
+%attr(0755,root,root) %{_bindir}/pre_execution.sh
+%attr(0755,root,root) %{_bindir}/post_execution.sh
+/tmp/org.tizen.gmock_comp_provider-1.0.0-arm.tpk
+/tmp/org.tizen.gmock_comp_provider-1.0.0-x86.tpk
+/tmp/org.tizen.gmock_comp_provider2-1.0.0-arm.tpk
+/tmp/org.tizen.gmock_comp_provider2-1.0.0-x86.tpk
 
 
 # End of a file
index 3d0a999..2e68b79 100644 (file)
@@ -1,15 +1,15 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
-PROJECT(gtest-watchface-complication CXX)
+PROJECT(watchface-complication_unittests CXX)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(gtest-watchface-complication REQUIRED
+pkg_check_modules(watchface-complication_unittests REQUIRED
     glib-2.0
     dlog
     gmock
     capi-appfw-app-control
 )
 
-FOREACH(flag ${gtest-watchface-complication_CFLAGS})
+FOREACH(flag ${watchface-complication_unittests_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline")
@@ -22,13 +22,14 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-common/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication/include)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../watchface-complication/res)
 
 AUX_SOURCE_DIRECTORY(src SOURCES)
 ADD_EXECUTABLE(${PROJECT_NAME}
     ${SOURCES}
 )
 
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest-watchface-complication_LDFLAGS}
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${watchface-complication_unittests_LDFLAGS}
     ${pkgs_LDFLAGS}
     ${pkgs_LIBRARIES}
     gmock
@@ -38,3 +39,9 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${gtest-watchface-complication_LDFLAGS}
 )
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/post_execution.sh DESTINATION /usr/bin/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pre_execution.sh DESTINATION /usr/bin/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/org.tizen.gmock_comp_provider-1.0.0-arm.tpk DESTINATION /tmp/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/org.tizen.gmock_comp_provider-1.0.0-x86.tpk DESTINATION /tmp/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/org.tizen.gmock_comp_provider2-1.0.0-arm.tpk DESTINATION /tmp/)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/res/org.tizen.gmock_comp_provider2-1.0.0-x86.tpk DESTINATION /tmp/)
diff --git a/unittest/post_execution.sh b/unittest/post_execution.sh
new file mode 100644 (file)
index 0000000..e0857f2
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+su -c "pkgcmd -un org.tizen.gmock_comp_provider"
+su -c "pkgcmd -un org.tizen.gmock_comp_provider2"
\ No newline at end of file
diff --git a/unittest/pre_execution.sh b/unittest/pre_execution.sh
new file mode 100644 (file)
index 0000000..94ebda4
--- /dev/null
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$(echo $HOSTTYPE)" == "armv7l" ]; then
+   su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.gmock_comp_provider-1.0.0-arm.tpk"
+   su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.gmock_comp_provider2-1.0.0-arm.tpk"
+else
+   su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.gmock_comp_provider-1.0.0-x86.tpk"
+   su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.gmock_comp_provider2-1.0.0-x86.tpk"
+fi
\ No newline at end of file