[mobile|wearable|tv][behavior][DPTTIZEN-3189, replace of deprecated method getCapabil...

add: 0, modify: 13, delete: 0

Change-Id: I23e241caaed26cc029f65cefc43f1b5b4b41f4d9
Signed-off-by: qunfang.lin <qunfang.lin@samsung.com>

diff --git a/mobile/tct-behavior-tests/tests/AppControl/js/main1.js b/mobile/tct-behavior-tests/tests/AppControl/js/main1.js
index c01f9545d30a2ddf34dfa7330b600aee3099fadb..99b668a0c5a26e1354259932795edb812c80d6a9 100755 (executable)
--- a/mobile/tct-behavior-tests/tests/AppControl/js/main1.js
+++ b/mobile/tct-behavior-tests/tests/AppControl/js/main1.js
@@ -100,12 +100,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/mobile/tct-behavior-tests/tests/AppControl/js/main2.js b/mobile/tct-behavior-tests/tests/AppControl/js/main2.js
index b60b0847a22e25e38c33034dc91ebb0cbe0cc441..0bd58b18d8dc4f02432c7121b41ae75310d177bb 100755 (executable)
--- a/mobile/tct-behavior-tests/tests/AppControl/js/main2.js
+++ b/mobile/tct-behavior-tests/tests/AppControl/js/main2.js
@@ -171,12 +171,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/mobile/tct-behavior-tests/tests/DynamicBox/js/main.js b/mobile/tct-behavior-tests/tests/DynamicBox/js/main.js
index 0d81c34fdde0cf0830231ca0a8be37b728df0def..35091e24bee85923a54d7565e428ecc539638b5a 100755 (executable)
--- a/mobile/tct-behavior-tests/tests/DynamicBox/js/main.js
+++ b/mobile/tct-behavior-tests/tests/DynamicBox/js/main.js
@@ -256,12 +256,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/mobile/tct-behavior-tests/tests/HybridApplication/js/main.js b/mobile/tct-behavior-tests/tests/HybridApplication/js/main.js
index 1e27fc386b56ab54f7255cd8cdd7824da4120f2e..4a863324391bd9010e4bd0b5d6d113a531b3ea56 100755 (executable)
--- a/mobile/tct-behavior-tests/tests/HybridApplication/js/main.js
+++ b/mobile/tct-behavior-tests/tests/HybridApplication/js/main.js
@@ -251,11 +251,11 @@ function packagePre() {
     }
 
     //add corssplatform support
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    platformName = deviceCapabilities.platformCoreCpuArch;
-    if (platformName.indexOf("armv7") >= 0) {
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         packagePath = "wgt-package/tests/HybridApplication/res/armv7/";
-    } else if (platformName.indexOf("x86") >= 0) {
+    } else if (arch == "x86") {
         packagePath = "wgt-package/tests/HybridApplication/res/x86/";
     } else {
         alert("Error: Unsupported platform");

diff --git a/mobile/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js b/mobile/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js
index faecc9220276d98b0edfe892e1395c7e6f7cbece..6cd9350c8c52784fa611e2eec5425d2bdbfda1fb 100755 (executable)
--- a/mobile/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js
+++ b/mobile/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js
@@ -19,7 +19,7 @@ Authors:
 */
 
 var h, m, s, day, year, month, date;
-var deviceCapabilities;
+var telephonyMms;
 
 $(document).delegate("#main", "pageinit", function() {
     $("#sms").bind("vclick", function() {
@@ -28,8 +28,9 @@ $(document).delegate("#main", "pageinit", function() {
     $("#mms").bind("vclick", function() {
         tizen.messaging.getMessageServices("messaging.mms", mmsSuccessCallback, errorCallback);
     });
-    deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(!deviceCapabilities.telephonyMms) {
+
+    telephonyMms = tizen.systeminfo.getCapability("http://tizen.org/feature/network.telephony.mms");
+    if(!telephonyMms) {
         $("#mms").addClass("ui-disabled");
     }
 });

diff --git a/tv/tct-behavior-tests/tests/AppControl/js/main1.js b/tv/tct-behavior-tests/tests/AppControl/js/main1.js
index c01f9545d30a2ddf34dfa7330b600aee3099fadb..99b668a0c5a26e1354259932795edb812c80d6a9 100755 (executable)
--- a/tv/tct-behavior-tests/tests/AppControl/js/main1.js
+++ b/tv/tct-behavior-tests/tests/AppControl/js/main1.js
@@ -100,12 +100,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/tv/tct-behavior-tests/tests/AppControl/js/main2.js b/tv/tct-behavior-tests/tests/AppControl/js/main2.js
index b60b0847a22e25e38c33034dc91ebb0cbe0cc441..0bd58b18d8dc4f02432c7121b41ae75310d177bb 100755 (executable)
--- a/tv/tct-behavior-tests/tests/AppControl/js/main2.js
+++ b/tv/tct-behavior-tests/tests/AppControl/js/main2.js
@@ -171,12 +171,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/tv/tct-behavior-tests/tests/DynamicBox/js/main.js b/tv/tct-behavior-tests/tests/DynamicBox/js/main.js
index 0d81c34fdde0cf0830231ca0a8be37b728df0def..35091e24bee85923a54d7565e428ecc539638b5a 100755 (executable)
--- a/tv/tct-behavior-tests/tests/DynamicBox/js/main.js
+++ b/tv/tct-behavior-tests/tests/DynamicBox/js/main.js
@@ -256,12 +256,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/tv/tct-behavior-tests/tests/HybridApplication/js/main.js b/tv/tct-behavior-tests/tests/HybridApplication/js/main.js
index 1e27fc386b56ab54f7255cd8cdd7824da4120f2e..4a863324391bd9010e4bd0b5d6d113a531b3ea56 100755 (executable)
--- a/tv/tct-behavior-tests/tests/HybridApplication/js/main.js
+++ b/tv/tct-behavior-tests/tests/HybridApplication/js/main.js
@@ -251,11 +251,11 @@ function packagePre() {
     }
 
     //add corssplatform support
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    platformName = deviceCapabilities.platformCoreCpuArch;
-    if (platformName.indexOf("armv7") >= 0) {
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         packagePath = "wgt-package/tests/HybridApplication/res/armv7/";
-    } else if (platformName.indexOf("x86") >= 0) {
+    } else if (arch == "x86") {
         packagePath = "wgt-package/tests/HybridApplication/res/x86/";
     } else {
         alert("Error: Unsupported platform");

diff --git a/tv/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js b/tv/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js
index faecc9220276d98b0edfe892e1395c7e6f7cbece..6cd9350c8c52784fa611e2eec5425d2bdbfda1fb 100755 (executable)
--- a/tv/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js
+++ b/tv/tct-behavior-tests/tests/MessagingSMSMMS/js/main.js
@@ -19,7 +19,7 @@ Authors:
 */
 
 var h, m, s, day, year, month, date;
-var deviceCapabilities;
+var telephonyMms;
 
 $(document).delegate("#main", "pageinit", function() {
     $("#sms").bind("vclick", function() {
@@ -28,8 +28,9 @@ $(document).delegate("#main", "pageinit", function() {
     $("#mms").bind("vclick", function() {
         tizen.messaging.getMessageServices("messaging.mms", mmsSuccessCallback, errorCallback);
     });
-    deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(!deviceCapabilities.telephonyMms) {
+
+    telephonyMms = tizen.systeminfo.getCapability("http://tizen.org/feature/network.telephony.mms");
+    if(!telephonyMms) {
         $("#mms").addClass("ui-disabled");
     }
 });

diff --git a/wearable/tct-behavior-tests/tests/AppControl/js/main1.js b/wearable/tct-behavior-tests/tests/AppControl/js/main1.js
index c01f9545d30a2ddf34dfa7330b600aee3099fadb..99b668a0c5a26e1354259932795edb812c80d6a9 100755 (executable)
--- a/wearable/tct-behavior-tests/tests/AppControl/js/main1.js
+++ b/wearable/tct-behavior-tests/tests/AppControl/js/main1.js
@@ -100,12 +100,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/wearable/tct-behavior-tests/tests/AppControl/js/main2.js b/wearable/tct-behavior-tests/tests/AppControl/js/main2.js
index b60b0847a22e25e38c33034dc91ebb0cbe0cc441..0bd58b18d8dc4f02432c7121b41ae75310d177bb 100755 (executable)
--- a/wearable/tct-behavior-tests/tests/AppControl/js/main2.js
+++ b/wearable/tct-behavior-tests/tests/AppControl/js/main2.js
@@ -171,12 +171,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";

diff --git a/wearable/tct-behavior-tests/tests/DynamicBox/js/main.js b/wearable/tct-behavior-tests/tests/DynamicBox/js/main.js
index 7cf03c413899b12dd5fb199d58e69b51af91106f..b39b1fb8f6f51b2343b55b8146419cf094948476 100755 (executable)
--- a/wearable/tct-behavior-tests/tests/DynamicBox/js/main.js
+++ b/wearable/tct-behavior-tests/tests/DynamicBox/js/main.js
@@ -166,12 +166,13 @@ var packageEventCallback = {
 };
 
 function gettpkInfoByPlatForm(){
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
-    if(deviceCapabilities.platformCoreCpuArch=="armv7"){
+    var arch = tizen.systeminfo.getCapability("http://tizen.org/feature/platform.core.cpu.arch");
+
+    if (arch == "armv7") {
         wgt_names.unshift("rMLtTXzQr2-2.0.0-arm.tpk");
         package_ids.unshift("rMLtTXzQr2");
         launch_tpk = "rMLtTXzQr2.DBV";
-    }else if(deviceCapabilities.platformCoreCpuArch=="x86"){
+    } else if (arch == "x86") {
         wgt_names.unshift("SD2nFxbyeA-2.0.0-i386.tpk");
         package_ids.unshift("SD2nFxbyeA");
         launch_tpk = "SD2nFxbyeA.DBV";