[common][privilege][DPTTIZEN-3189, replace of deprecated method getCapabilities]

add: 0, modify: 12, del: 0

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

diff --git a/common/tct-privilege-tizen-tests/privilege/BluetoothManager_getDefaultAdapter.html b/common/tct-privilege-tizen-tests/privilege/BluetoothManager_getDefaultAdapter.html
index 01333bb52e3d6c58286d158752bfc73fbfa3611c..5539ff78d4758b3aaa98eeb7b839115cd90cc6d4 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/BluetoothManager_getDefaultAdapter.html
+++ b/common/tct-privilege-tizen-tests/privilege/BluetoothManager_getDefaultAdapter.html
@@ -37,11 +37,10 @@ Authors:
 //==== SPEC_URL https://developer.tizen.org/help/topic/org.tizen.web.device.apireference/tizen/bluetooth.html
 //==== PRIORITY P2
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var bluetooth = tizen.systeminfo.getCapability("http://tizen.org/feature/network.bluetooth");
 
     // if bluetooth is not supported then skip this test
-    assert_own_property(deviceCapabilities, "bluetooth", "deviceCapabilities");
-    if (!deviceCapabilities.bluetooth) {
+    if (!bluetooth) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/NFCManager_getDefaultAdapter.html b/common/tct-privilege-tizen-tests/privilege/NFCManager_getDefaultAdapter.html
index 05b12d14a21a843d90a6df75620633478f63d660..48a08e8bf0bc3e420769bb38d91fa4b88ac8980b 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/NFCManager_getDefaultAdapter.html
+++ b/common/tct-privilege-tizen-tests/privilege/NFCManager_getDefaultAdapter.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var nfc = tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc");
 
     // if nfc is not supported then skip this test
-    assert_own_property(deviceCapabilities, "nfc", "deviceCapabilities");
-    if (!deviceCapabilities.nfc) {
+    if (!nfc) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/NFCManager_setExclusiveMode.html b/common/tct-privilege-tizen-tests/privilege/NFCManager_setExclusiveMode.html
index ab9cc28cec2bf8b899340f5ff86bbdcae8bb54c9..6b5fe3e9bd393a8ef65790187a4ebb59be81ddd2 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/NFCManager_setExclusiveMode.html
+++ b/common/tct-privilege-tizen-tests/privilege/NFCManager_setExclusiveMode.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var nfc = tizen.systeminfo.getCapability("http://tizen.org/feature/network.nfc");
 
     // if nfc is not supported then skip this test
-    assert_own_property(deviceCapabilities, "nfc", "deviceCapabilities");
-    if (!deviceCapabilities.nfc) {
+    if (!nfc) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/PushManager_connectService.html b/common/tct-privilege-tizen-tests/privilege/PushManager_connectService.html
index f5ce07c8e37a60ace1d5870dcb31925080412711..ae5989c90c428076b84e16030756d44eaaa4c0d6 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/PushManager_connectService.html
+++ b/common/tct-privilege-tizen-tests/privilege/PushManager_connectService.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var push = tizen.systeminfo.getCapability("http://tizen.org/feature/network.push");
 
     // if push is not supported then skip this test
-    assert_own_property(deviceCapabilities, "push", "deviceCapabilities");
-    if (!deviceCapabilities.push) {
+    if (!push) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/PushManager_disconnectService.html b/common/tct-privilege-tizen-tests/privilege/PushManager_disconnectService.html
index a219d7b6f77e52fadcaaaa755e9e03577143ec71..50cc9cf2fa21036b7671ae06c910d7b50195b26a 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/PushManager_disconnectService.html
+++ b/common/tct-privilege-tizen-tests/privilege/PushManager_disconnectService.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var push = tizen.systeminfo.getCapability("http://tizen.org/feature/network.push");
 
     // if push is not supported then skip this test
-    assert_own_property(deviceCapabilities, "push", "deviceCapabilities");
-    if (!deviceCapabilities.push) {
+    if (!push) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/PushManager_getRegistrationId.html b/common/tct-privilege-tizen-tests/privilege/PushManager_getRegistrationId.html
index b0a1306c99a17eee21a82c183aa3148b1a00325e..23278fc529d836bf6e011d4e11ae60fae0bac576 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/PushManager_getRegistrationId.html
+++ b/common/tct-privilege-tizen-tests/privilege/PushManager_getRegistrationId.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var push = tizen.systeminfo.getCapability("http://tizen.org/feature/network.push");
 
     // if push is not supported then skip this test
-    assert_own_property(deviceCapabilities, "push", "deviceCapabilities");
-    if (!deviceCapabilities.push) {
+    if (!push) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/PushManager_registerService.html b/common/tct-privilege-tizen-tests/privilege/PushManager_registerService.html
index d910fd6a636455378ea417978f30aa714eb696c2..b2b356ae9bfae9fe458958edbda95b9136c26fda 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/PushManager_registerService.html
+++ b/common/tct-privilege-tizen-tests/privilege/PushManager_registerService.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities(), service;
+    var push = tizen.systeminfo.getCapability("http://tizen.org/feature/network.push");
 
     // if push is not supported then skip this test
-    assert_own_property(deviceCapabilities, "push", "deviceCapabilities");
-    if (!deviceCapabilities.push) {
+    if (!push) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/PushManager_unregisterService.html b/common/tct-privilege-tizen-tests/privilege/PushManager_unregisterService.html
index 2dc20a42738327fd316ade37cb1c085229adace4..d012f11ff9bd31b981afc2fcbbd6487bf7bff911 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/PushManager_unregisterService.html
+++ b/common/tct-privilege-tizen-tests/privilege/PushManager_unregisterService.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var push = tizen.systeminfo.getCapability("http://tizen.org/feature/network.push");
 
     // if push is not supported then skip this test
-    assert_own_property(deviceCapabilities, "push", "deviceCapabilities");
-    if (!deviceCapabilities.push) {
+    if (!push) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/SEService_getReaders.html b/common/tct-privilege-tizen-tests/privilege/SEService_getReaders.html
index 2760b8591071d153ec2836a88d08c52a3f903476..9e4099d4d5d3f2981524120941e465bf971e5fdb 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/SEService_getReaders.html
+++ b/common/tct-privilege-tizen-tests/privilege/SEService_getReaders.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var secureElement = tizen.systeminfo.getCapability("http://tizen.org/feature/network.secure_element");
 
     // if secureElement is not supported then skip this test
-    assert_own_property(deviceCapabilities, "secureElement", "deviceCapabilities");
-    if (!deviceCapabilities.secureElement) {
+    if (!secureElement) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/SEService_registerSEListener.html b/common/tct-privilege-tizen-tests/privilege/SEService_registerSEListener.html
index 4dd7507a910548efdb6e875e626fb99f5832cd56..915820f707d468650e4862f2dcfe6a21a6936bfb 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/SEService_registerSEListener.html
+++ b/common/tct-privilege-tizen-tests/privilege/SEService_registerSEListener.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var secureElement = tizen.systeminfo.getCapability("http://tizen.org/feature/network.secure_element");
 
     // if secureElement is not supported then skip this test
-    assert_own_property(deviceCapabilities, "secureElement", "deviceCapabilities");
-    if (!deviceCapabilities.secureElement) {
+    if (!secureElement) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/SEService_shutdown.html b/common/tct-privilege-tizen-tests/privilege/SEService_shutdown.html
index 95cfcd8a89e8141ff9017926a54124101d76c998..07a42bc9141a2c2f2ad3bcfa1e40b3b638de46e0 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/SEService_shutdown.html
+++ b/common/tct-privilege-tizen-tests/privilege/SEService_shutdown.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var secureElement = tizen.systeminfo.getCapability("http://tizen.org/feature/network.secure_element");
 
     // if secureElement is not supported then skip this test
-    assert_own_property(deviceCapabilities, "secureElement", "deviceCapabilities");
-    if (!deviceCapabilities.secureElement) {
+    if (!secureElement) {
         return;    // test will PASS
     }
 

diff --git a/common/tct-privilege-tizen-tests/privilege/SEService_unregisterSEListener.html b/common/tct-privilege-tizen-tests/privilege/SEService_unregisterSEListener.html
index bfa1f57c1791b66397617ad05f7fb664c8a64f68..d60924495c83a4adffd8a4893ff95f8329ba6876 100755 (executable)
--- a/common/tct-privilege-tizen-tests/privilege/SEService_unregisterSEListener.html
+++ b/common/tct-privilege-tizen-tests/privilege/SEService_unregisterSEListener.html
@@ -38,11 +38,10 @@ Authors:
 //==== PRIORITY P2
 
 test(function () {
-    var deviceCapabilities = tizen.systeminfo.getCapabilities();
+    var secureElement = tizen.systeminfo.getCapability("http://tizen.org/feature/network.secure_element");
 
     // if secureElement is not supported then skip this test
-    assert_own_property(deviceCapabilities, "secureElement", "deviceCapabilities");
-    if (!deviceCapabilities.secureElement) {
+    if (!secureElement) {
         return;    // test will PASS
     }