From: qunfang.lin Date: Wed, 15 Apr 2020 02:31:56 +0000 (+0800) Subject: [mobile|wearable|tv][behavior][DPTTIZEN-3189, replace of deprecated method getCapabil... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F230818%2F1;p=test%2Ftct%2Fweb%2Fbehavior.git [mobile|wearable|tv][behavior][DPTTIZEN-3189, replace of deprecated method getCapabilities] add: 0, modify: 13, delete: 0 Change-Id: I23e241caaed26cc029f65cefc43f1b5b4b41f4d9 Signed-off-by: qunfang.lin --- diff --git a/mobile/tct-behavior-tests/tests/AppControl/js/main1.js b/mobile/tct-behavior-tests/tests/AppControl/js/main1.js index c01f954..99b668a 100755 --- 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 b60b084..0bd58b1 100755 --- 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 0d81c34..35091e2 100755 --- 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 1e27fc3..4a86332 100755 --- 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 faecc92..6cd9350 100755 --- 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 c01f954..99b668a 100755 --- 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 b60b084..0bd58b1 100755 --- 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 0d81c34..35091e2 100755 --- 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 1e27fc3..4a86332 100755 --- 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 faecc92..6cd9350 100755 --- 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 c01f954..99b668a 100755 --- 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 b60b084..0bd58b1 100755 --- 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 7cf03c4..b39b1fb 100755 --- 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";