From: nibha2 Date: Mon, 20 Aug 2018 09:29:19 +0000 (+0530) Subject: [TBT][Non-ACR][All][Changes done in script and code] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_4.0_mobile;p=test%2Ftct%2Fnative%2Fbehavior.git [TBT][Non-ACR][All][Changes done in script and code] Change-Id: Ib01b76cfa05c4fc6528b7200c4b096c276c63f01 Signed-off-by: nibha2 --- diff --git a/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk index be79ac8..23e00d4 100755 Binary files a/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.coretbtwidgetapp-dali-1.0.0-arm.tpk differ diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk index 6d26bbc..c1d83c1 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-1.0.0-arm.tpk differ diff --git a/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk b/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk index 3f19d8b..d2a75d6 100755 Binary files a/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk and b/release/binary-armv7l/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-arm.tpk differ diff --git a/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk index 1d1e801..bc9ce3b 100755 Binary files a/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.coretbtwidgetapp-dali-1.0.0-x86.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk index 7074e34..7f38058 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-1.0.0-x86.tpk differ diff --git a/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk b/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk index 04dd62e..3397932 100755 Binary files a/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk and b/release/binary-x86/org.tizen.tbtcoreapp-widget-new-dali-1.0.0-x86.tpk differ diff --git a/scripts_tpk/tpkbuild.sh b/scripts_tpk/tpkbuild.sh index 6d33af9..93b464e 100755 --- a/scripts_tpk/tpkbuild.sh +++ b/scripts_tpk/tpkbuild.sh @@ -152,6 +152,11 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz echo ""$reset fi done + sdb push $PWD/release/binary-$ARCH/org.example.widget-1.0.0-$ARCH_TYPE.tpk /tmp + echo ""$reset + echo $green"Installing Package $MOD_NAME" + sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER + echo ""$reset elif [ "$MOD_NAME" = "multiclass" ]; then eval launcher=(`sdb shell "app_launcher -l | grep org.example.$MOD_NAME"`) val=${launcher[1]} @@ -184,6 +189,16 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.tizen.$MOD_NAME-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER echo ""$reset fi + fi + echo "$MOD_NAME" + if [ "$MOD_NAME" = "tbtcoreapp-dali" ]; then + sdb push $PWD/release/binary-$ARCH/org.example.widget-1.0.0-$ARCH_TYPE.tpk /tmp + echo ""$reset + echo $green"Installing Package $MOD_NAME" + sdb shell su -c "pkgcmd -i -t tpk -p /tmp/org.example.widget-1.0.0-$ARCH_TYPE.tpk" $EXECUTION_USER + echo ""$reset + fi + echo ""$reset echo $yellow"Pushing media files" sdb push $PWD/release/binary-$ARCH/dog_1024_960.gif /home/$EXECUTION_USER/media/Images @@ -211,7 +226,6 @@ modulearray=(org.tizen.coretbt_dataprovider org.tizen.coretbt_serviceapp org.tiz sdb shell chsmack -e "User::App::Shared" /home/$EXECUTION_USER/apps_rw/org.tizen.$MOD_NAME/data/iotcon-test-svr-db-server.dat echo ""$reset - fi sdb root off } diff --git a/tbtcoreapp/src/model/tbt-list.c b/tbtcoreapp/src/model/tbt-list.c index 8f8c7ab..584464d 100755 --- a/tbtcoreapp/src/model/tbt-list.c +++ b/tbtcoreapp/src/model/tbt-list.c @@ -591,7 +591,8 @@ static tbt_info tbtapps[] = .icon_name = "dummy", .info = "Test Type One
" "1.Bluetooth On
" - "2. Destroy Bonding callback Invoked
" + "2.Open bluetooth setting page, connect with some device and then unpair with the connected device
" + "3. Destroy Bonding callback Invoked
" "
Test Type Two
" "1. Bluetooth Off
" "2. Correct Error Message Displayed", diff --git a/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c b/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c index 5270cfc..a7c9d08 100644 --- a/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c +++ b/tbtcoreapp/src/view/tbt-bluetooth-callback-view.c @@ -180,6 +180,8 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf ui_utils_guide_instruction_popup_button(navi, "Instructions:
Test Type One
1.Bluetooth On
2. Create Bonding callback Invoked

Test Type Two
1. Bluetooth Off
2. Correct Error Message Displayed
Note:You can also refer info section"); char resultc[256] ={0,}; + sprintf(resultc, "result = %s", "Maually ON bluetooth and invoke create bond callback"); + ui_utils_label_set_text(this->create_label, resultc, "left"); ret = bt_device_set_bond_created_cb(Bluetooth_bt_device_bond_created_cb_p, this); DBG("bt_device_set_bond_created_cb %d", ret); RETVM_IF(ret != BT_ERROR_NONE && ret != BT_ERROR_NOT_SUPPORTED, NULL, "bt_device_set_bond_created_cb failed : %s", get_bluetooth_error(ret)); @@ -191,10 +193,10 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf elm_object_text_set(popup, "Bluetooth is not supported"); RETVM_IF(!this->view, NULL,"Bluetooth is not supported"); } - ret = bt_device_create_bond(remote_address); - DBG("bt_device_create_bond %d", ret); - sprintf(resultc, "result = %s", get_bluetooth_error(ret)); - ui_utils_label_set_text(this->create_label, resultc, "left"); + //ret = bt_device_create_bond(remote_address); + //DBG("bt_device_create_bond %d", ret); + //sprintf(resultc, "result = %s", get_bluetooth_error(ret)); + //ui_utils_label_set_text(this->create_label, resultc, "left"); } else if (this->view->tbt_info->apptype == TBT_APP_BT_CALLBACK_DESTROY_BOND_TEST) @@ -205,6 +207,8 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf ui_utils_guide_instruction_popup_button(navi, "Instructions:
Test Type One
1.Bluetooth On
2. Destroy Bonding callback Invoked

Test Type Two
1. Bluetooth Off
2. Correct Error Message Displayed
Note:You can also refer info section"); char resultc[256] ={0,}; + sprintf(resultc, "result = %s", "Maually ON bluetooth and invoke destroy bond callback"); + ui_utils_label_set_text(this->create_label, resultc, "left"); ret = bt_device_set_bond_destroyed_cb(Bluetooth_bt_device_bond_destroyed_cb_p, this); RETVM_IF(ret != BT_ERROR_NONE && ret != BT_ERROR_NOT_SUPPORTED, NULL, "bt_device_set_bond_created_cb failed : %s", get_bluetooth_error(ret)); @@ -215,14 +219,14 @@ bluetooth_view *bluetooth_callback_view_add(Evas_Object *navi, tbt_info *tbt_inf elm_object_text_set(popup, "Bluetooth is not supported"); RETVM_IF(!this->view, NULL,"Bluetooth is not supported"); } - ret = bt_device_create_bond(remote_address); - DBG("bt_device_create_bond %d", ret); - sprintf(resultc, "result = %s", get_bluetooth_error(ret)); - ui_utils_label_set_text(this->create_label, resultc, "left"); - - ret = bt_device_destroy_bond(remote_address); - sprintf(resultc, "result = %s", get_bluetooth_error(ret)); - ui_utils_label_set_text(this->create_label, resultc, "left"); + //ret = bt_device_create_bond(remote_address); + //DBG("bt_device_create_bond %d", ret); + //sprintf(resultc, "result = %s", get_bluetooth_error(ret)); + //ui_utils_label_set_text(this->create_label, resultc, "left"); + + //ret = bt_device_destroy_bond(remote_address); + //sprintf(resultc, "result = %s", get_bluetooth_error(ret)); + //ui_utils_label_set_text(this->create_label, resultc, "left"); } else if (this->view->tbt_info->apptype == TBT_APP_BT_CALLBACK_DISCOVER_DEVICES_TEST)