Don't use OSP and WRT installers in security tests

Security tests used to install WRT and OSP test applications in
post installation script. This is not necessary and can be replaced by
shipping binaries and symlinks required by test in RPM package.

To verify check if libprivilege-control tests' results are unaffected by
this change.

Change-Id: Id1d73bfb0249bc63bd33613c40d04a673783642d
Signed-off-by: Jacek Bukarewicz <j.bukarewicz@samsung.com>

diff --git a/packaging/security-tests.manifest b/packaging/security-tests.manifest
index 19720dd..8533a46 100644 (file)
--- a/packaging/security-tests.manifest
+++ b/packaging/security-tests.manifest
@@ -17,7 +17,8 @@
         <filesystem path="/usr/bin/security-server-tests-dbus" exec_label="_" />
         <filesystem path="/usr/bin/security-manager-tests" exec_label="_" />
 
-        <filesystem path="/usr/bin/hello-tizen" exec_label="User" />
+        <filesystem path="/usr/bin/test-app-efl" exec_label="User" />
+        <filesystem path="/usr/bin/test-app-osp" exec_label="User" />
     </assign>
     <request>
         <domain name="_" />

diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec
index 70d3aef..33b04aa 100644 (file)
--- a/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@ -48,15 +48,8 @@ find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755
 # Load permissions templates
 api_feature_loader --verbose
 
-wrt-installer --install /usr/bin/TestMisiuPysiu123.wgt
-osp-installer -i /usr/bin/uqNfgEjqc7-1.0.0-arm.tpk
-
 echo "security-tests postinst done ..."
 
-%postun
-wrt-installer --uninstall-name QwCqJ0ttyS
-osp-installer -u uqNfgEjqc7
-
 %files
 %manifest %{name}.manifest
 %defattr(-, root, root, -)
@@ -87,7 +80,7 @@ osp-installer -u uqNfgEjqc7
 /etc/smack/test_smack_rules_lnk
 /usr/share/privilege-control/*
 /etc/smack/test_privilege_control_DIR/*
-/usr/bin/TestMisiuPysiu123.wgt
-/usr/bin/uqNfgEjqc7-1.0.0-arm.tpk
-/usr/bin/hello-tizen
+/usr/bin/test-app-efl
+/usr/bin/test-app-osp
+/usr/bin/test-app-wgt
 

diff --git a/tests/libprivilege-control-tests/CMakeLists.txt b/tests/libprivilege-control-tests/CMakeLists.txt
index 4eabea3..6ffa49d 100644 (file)
--- a/tests/libprivilege-control-tests/CMakeLists.txt
+++ b/tests/libprivilege-control-tests/CMakeLists.txt
@@ -21,12 +21,14 @@
 #
 INCLUDE(FindPkgConfig)
 
-SET(HELLO_TIZEN_TEST "hello-tizen")
+SET(TEST_APP_EFL "test-app-efl")
+SET(TEST_APP_WGT "test-app-wgt")
+SET(TEST_APP_OSP "test-app-osp")
 SET(HELLO_TIZEN_TEST_SOURCES
     ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/hello-tizen.cpp
     )
-ADD_EXECUTABLE( ${HELLO_TIZEN_TEST} ${HELLO_TIZEN_TEST_SOURCES} )
-INSTALL(TARGETS ${HELLO_TIZEN_TEST}
+ADD_EXECUTABLE( ${TEST_APP_EFL} ${HELLO_TIZEN_TEST_SOURCES} )
+INSTALL(TARGETS ${TEST_APP_EFL}
     DESTINATION /usr/bin
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
@@ -37,6 +39,21 @@ INSTALL(TARGETS ${HELLO_TIZEN_TEST}
                 WORLD_EXECUTE
     )
 
+INSTALL(FILES ${TEST_APP_EFL}
+    DESTINATION  /usr/bin
+    RENAME ${TEST_APP_OSP}
+    PERMISSIONS OWNER_READ
+                OWNER_WRITE
+                OWNER_EXECUTE
+                GROUP_READ
+                GROUP_EXECUTE
+                WORLD_READ
+                WORLD_EXECUTE)
+
+execute_process(COMMAND ln -s /usr/bin/wrt-client ${CMAKE_CURRENT_BINARY_DIR}/${TEST_APP_WGT} )
+
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TEST_APP_WGT}
+    DESTINATION  /usr/bin)
 
 SET(LPC_TARGET_TEST "libprivilege-control-test")
 
@@ -125,16 +142,6 @@ INSTALL(DIRECTORY
 )
 
 INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/TestMisiuPysiu123.wgt
-    DESTINATION /usr/bin/
-  )
-
-INSTALL(FILES
-    ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/uqNfgEjqc7-1.0.0-arm.tpk
-    DESTINATION /usr/bin/
-  )
-
-INSTALL(FILES
     ${PROJECT_SOURCE_DIR}/tests/libprivilege-control-tests/WRT_test_privilege_control_rules_wgt.smack
     DESTINATION /usr/share/privilege-control/
   )

diff --git a/tests/libprivilege-control-tests/TestMisiuPysiu123.wgt b/tests/libprivilege-control-tests/TestMisiuPysiu123.wgt
deleted file mode 100644 (file)
index d30020e..0000000
Binary files a/tests/libprivilege-control-tests/TestMisiuPysiu123.wgt and /dev/null differ

diff --git a/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h b/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
index 20f773a..7175dc6 100644 (file)
--- a/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
+++ b/tests/libprivilege-control-tests/common/libprivilege-control_test_common.h
@@ -60,9 +60,9 @@
 
 #define OSP_APP_ID            "uqNfgEjqc7"
 
-#define WGT_APP_PATH          "/opt/usr/apps/QwCqJ0ttyS/bin/QwCqJ0ttyS.TestMisiuPysiu123"
-#define OSP_APP_PATH          "/opt/usr/apps/uqNfgEjqc7/bin/PysiuMisiu123Osp"
-#define EFL_APP_PATH          "/usr/bin/hello-tizen"
+#define WGT_APP_PATH          "/usr/bin/test-app-wgt"
+#define OSP_APP_PATH          "/usr/bin/test-app-osp"
+#define EFL_APP_PATH          "/usr/bin/test-app-efl"
 
 #define APP_SET_PRIV_PATH      "/etc/smack/test_privilege_control_DIR/test_set_app_privilege/test_APP"
 

diff --git a/tests/libprivilege-control-tests/uqNfgEjqc7-1.0.0-arm.tpk b/tests/libprivilege-control-tests/uqNfgEjqc7-1.0.0-arm.tpk
deleted file mode 100644 (file)
index a36ba67..0000000
Binary files a/tests/libprivilege-control-tests/uqNfgEjqc7-1.0.0-arm.tpk and /dev/null differ