Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
未验证 提交 704b0289 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!6825 【communication】【同步monthly1018】修改WIFI,NFC,LBS,BT签名 

Merge pull request !6825 from 权力/cherry-pick-1670398763
上级 3ef89d38 8fda1aae
显示空白变更内容
内联 并排
Showing with 110 addition and 505 deletion
communication/bluetooth_on/src/main/js/test/BluetoothPair.test.js
浏览文件 @ 704b0289
......@@ -75,7 +75,7 @@ describe('bluetoothhostTest2', function() {
*/
it('SUB_COMMUNICATION_BLUETOOTH_BR_Pair_0100', 0, async function (done) {
let result = bluetooth.pairDevice("11:22:55:66:33:44");
await sleep(12000);
await sleep(32000);
console.info("[bluetooth_js] onStartpair001 -> " + JSON.stringify(result));
expect(result).assertTrue();
done()
......@@ -243,7 +243,7 @@ describe('bluetoothhostTest2', function() {
}
bluetooth.BLE.on('pinRequired', PinRequiredParam);
let result = bluetooth.pairDevice("11:22:55:66:33:44");
await sleep(12000);
await sleep(32000);
console.info("[bluetooth_js] onStartpair007 -> " + JSON.stringify(result));
expect(result).assertTrue();
bluetooth.BLE.off('pinRequired', PinRequiredParam);
......@@ -266,7 +266,7 @@ describe('bluetoothhostTest2', function() {
}
bluetooth.BLE.on('pinRequired', PinRequiredParam);
let result = bluetooth.pairDevice("11:22:55:66:33:44");
await sleep(12000);
await sleep(32000);
console.info("[bluetooth_js] onStartpair008 -> " + JSON.stringify(result));
expect(result).assertTrue();
bluetooth.BLE.off('pinRequired', PinRequiredParam);
......
communication/bluetooth_profile/src/main/js/test/BluetoothHid.test.js 已删除 100644 → 0
浏览文件 @ 3ef89d38
/*
* Copyright (C) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import bluetooth from '@ohos.bluetooth';
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium'
let hidHostProfile = bluetooth.getProfileInst(6);
function on(ON_VALUE_TEST_ELEMENT) {
return new Promise((resolve, reject) => {
hidHostProfile.on(ON_VALUE_TEST_ELEMENT, function (err, data) {
if (err != undefined) {
reject(err);
} else {
resolve(data);
}
})
});
}
function off(OFF_VALUE_TEST_ELEMENT) {
return new Promise((resolve, reject) => {
hidHostProfile.off(OFF_VALUE_TEST_ELEMENT, function (err, data) {
if (err != undefined) {
reject(err);
} else {
resolve(data);
}
})
});
}
let ProfId = {
PROFILE_A2DP_SINK : 0,
PROFILE_A2DP_SOURCE : 1,
PROFILE_AVRCP_CT : 2,
PROFILE_AVRCP_TG : 3,
PROFILE_HANDS_FREE_AUDIO_GATEWAY : 4,
PROFILE_HANDS_FREE_UNIT : 5
}
export default function bluetoothhostTest_host_2() {
describe('bluetoothhostTest_host_2', function () {
beforeAll(function () {
console.info('beforeAll called')
})
beforeEach(function () {
console.info('beforeEach called')
})
afterEach(function () {
console.info('afterEach called')
})
afterAll(function () {
console.info('afterAll called')
})
function sleep(delay) {
return new Promise(resovle => setTimeout(resovle, delay))
}
async function tryToEnableBt() {
let sta = bluetooth.getState();
switch(sta){
case 0:
console.info('[bluetooth_js] bt turn off:'+ JSON.stringify(sta));
bluetooth.enableBluetooth();
await sleep(3000);
break;
case 1:
console.info('[bluetooth_js] bt turning on:'+ JSON.stringify(sta));
await sleep(3000);
break;
case 2:
console.info('[bluetooth_js] bt turn on:'+ JSON.stringify(sta));
break;
case 3:
console.info('[bluetooth_js] bt turning off:'+ JSON.stringify(sta));
bluetooth.enableBluetooth();
await sleep(3000);
break;
default:
console.info('[bluetooth_js] enable success');
}
}
/**
* @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_PROFILE_LOOP_0001
* @tc.name looptestgetprofile(set parameterless)
* @tc.desc Test getProfile api 1000 times.
* @tc.author defu.zheng
* @tc.size SMALL
* @tc.type Function
* @tc.level Level 0
*/
it('SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_PROFILE_LOOP_0001', 0, async function (done) {
console.info('[bluetooth_js] loop get profile start');
await tryToEnableBt();
let proFile = bluetooth.getProfileInst(6);
console.info('[bluetooth_js] loop get profile result:' + JSON.stringify(proFile));
expect(proFile != null).assertEqual(true);
done();
})
/**
* @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_CONN_DEV_LOOP_0001
* @tc.name looptestgetConnectionDevices(bluetooth mode is off)
* @tc.desc Test getConnectionDevices api 1000 times.
* @tc.author defu.zheng
* @tc.size SMALL
* @tc.type Function
* @tc.level Level 0
*/
it('SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_CONN_DEV_LOOP_0001', 0, async function (done) {
console.info('[bluetooth_js] loop get connection devices start');
await tryToEnableBt();
let arrDev = hidHostProfile.getConnectionDevices();
console.info('[bluetooth_js] loop getconndev:' + JSON.stringify(arrDev)+ 'length'+ arrDev.length);
expect(arrDev.length).assertEqual(0);
done();
})
/**
* @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_DEV_STATE_LOOP_0001
* @tc.name looptestgetDeviceState(set a null value)
* @tc.desc Test getDeviceState api 1000 times.
* @tc.author defu.zheng
* @tc.size SMALL
* @tc.type Function
* @tc.level Level 0
*/
it('SUB_COMMUNACATION_bluetooth_DEVICE_JS_GET_DEV_STATE_LOOP_0001', 0, async function (done) {
console.info('[bluetooth_js] loop get device state start');
await tryToEnableBt();
let devState = hidHostProfile.getDeviceState('');
console.info('[bluetooth_js] loop get device state result:' + JSON.stringify(devState));
expect(devState).assertEqual(0);
done();
})
/**
* @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_HID_HOST_PROFILE_CONN_LOOP_0001
* @tc.name looptesthidhostprofileconnect(set a null value)
* @tc.desc Test hidHostProfile connect api 1000 times.
* @tc.author defu.zheng
* @tc.size SMALL
* @tc.type Function
* @tc.level Level 0
*/
it('SUB_COMMUNACATION_bluetooth_DEVICE_JS_HID_HOST_PROFILE_CONN_LOOP_0001', 0, async function (done) {
console.info('[bluetooth_js] loop HidHostProfile the connect start');
await tryToEnableBt();
let conn = hidHostProfile.connect('');
console.info('[bluetooth_js] loop HidHostProfile the connect result:' + JSON.stringify(conn));
expect(conn).assertFalse();
done();
})
/**
* @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_HID_HOST_PROFILE_DISCONN_LOOP_0001
* @tc.name looptesthidhostprofiledisconnect(set a null value)
* @tc.desc Test hidHostProfile disconnect api 1000 times.
* @tc.author defu.zheng
* @tc.size SMALL
* @tc.type Function
* @tc.level Level 0
*/
it('SUB_COMMUNACATION_bluetooth_DEVICE_JS_HID_HOST_PROFILE_DISCONN_LOOP_0001', 0, async function (done) {
console.info('[bluetooth_js] loop HidHostProfile the disconnect start');
await tryToEnableBt();
let disConn = hidHostProfile.disconnect('');
console.info('[bluetooth_js] loop HidHostProfile the disconnect result:' + JSON.stringify(disConn));
expect(disConn).assertFalse();
done();
})
/**
* @tc.number SUB_COMMUNACATION_bluetooth_DEVICE_JS_HID_HOST_PROFILE_ON_LOOP_0001
* @tc.name looptesthidhostprofileon
* @tc.desc Test hidHostProfile on api 1000 times.
* @tc.author defu.zheng
* @tc.size SMALL
* @tc.type Function
* @tc.level Level 0
*/
it('SUB_COMMUNACATION_bluetooth_DEVICE_JS_HID_HOST_PROFILE_ON_LOOP_0001', 0, async function (done) {
try {
await tryToEnableBt();
console.info('[bluetooth_js] loop HidHostProfile the on start');
on("connectionStateChange", function (data) {
console.info("[bluetooth_js] HidHostProfile_on data " + JSON.stringify(data));
expect(true).assertEqual(data !=null);
});
}catch(e) {
expect(null).assertFail();
}
try {
console.info('[bluetooth_js] HidHostProfile the off test start');
off("connectionStateChange", function (data) {
console.info("[bluetooth_js] HidHostProfile_off data-> " + JSON.stringify(data));
expect(true).assertEqual(data ==null);
});
}catch(e) {
expect(null).assertFail();
}
done();
})
/**
* @tc.number SUB_COMMUNACATION_bluetoothble_PANProfile_Tethering_0001
* @tc.name testonsppReadOn
* @tc.desc Test sppReadOn api .
* @tc.size MEDIUM
* @tc.type Function
* @tc.level Level 2
*/
it('SUB_COMMUNACATION_bluetoothble_PANProfile_Tethering_0001', 0, async function (done) {
await tryToEnableBt();
console.info('[bluetooth_js] tethering test start');
let panProfile = bluetooth.getProfileInst(bluetooth.ProfileId.PROFILE_PAN_NETWORK);
let ret = panProfile.setTethering(false);
console.info("[bluetooth_js] setTethering false result "+JSON.stringify(ret));
let result = panProfile.isTetheringOn();
console.info("[bluetooth_js] setTethering getTetheringOn result1 false== "+JSON.stringify(result));
expect(result).assertFalse();
done();
})
})
}
communication/bluetooth_profile/src/main/js/test/List.test.js
浏览文件 @ 704b0289
......@@ -15,9 +15,7 @@
import bluetoothhostTest_host_1 from './BluetoothHfp.test.js'
import bluetoothhostTest_host_3 from './BluetoothA2dp.test.js'
import bluetoothhostTest_host_2 from './BluetoothHid.test.js'
export default function testsuite() {
bluetoothhostTest_host_1()
bluetoothhostTest_host_3()
bluetoothhostTest_host_2()
}
communication/nfc_Controller/src/main/config.json
浏览文件 @ 704b0289
......@@ -86,132 +86,14 @@
}
}
],
"defPermissions": [
{
"availableScope": [],
"grantMode": "user_grant",
"name": "ohos.permission.ACCESS_LOCATION",
"availableLevel": "system_basic",
"provisionEnable": true,
"distributedSceneEnable": true,
"label": "ACCESS_LOCATION label",
"description": "ACCESS_LOCATION description"
},
{
"availableScope": [],
"grantMode": "system_grant",
"name": "ohos.permission.MANAGE_SECURE_SETTINGS",
"availableLevel": "system_basic",
"provisionEnable": true,
"distributedSceneEnable": false,
"label": "MANAGE_SECURE_SETTINGS label",
"description": "MANAGE_SECURE_SETTINGS description"
},
{
"availableScope": [],
"grantMode": "user_grant",
"name": "ohos.permission.LOCATION",
"availableLevel": "system_basic",
"provisionEnable": true,
"distributedSceneEnable": true,
"label": "LOCATION label",
"description": "LOCATION description"
}
],
"reqPermissions": [
{
"name": "ohos.permission.MANAGE_SECURE_SETTINGS",
"reason": "need use ohos.permission.MANAGE_SECURE_SETTINGS"
},
{
"name": "ohos.permission.NFC_CARD_EMULATION",
"reason": "use ohos.permission.SET_nfc_INFO"
},
{
"name": "ohos.permission.MANAGE_nfc_CONNECTION",
"reason": "use ohos.permission.MANAGE_nfc_CONNECTION"
},
{
"name": "ohos.permission.NFC_TAG",
"reason": "use ohos.permission.NFC_TAG"
},
{
"name": "ohos.permission.GET_nfc_CONFIG",
"reason": "use ohos.permission.GET_nfc_CONFIG"
},
{
"name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
"reason": "use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
},
{
"name": "ohos.permission.GET_nfc_LOCAL_MAC",
"reason": "use ohos.permission.GET_nfc_LOCAL_MAC"
},
{
"name": "ohos.permission.GET_nfc_PEERS_MAC",
"reason": "use ohos.permission.GET_nfc_PEERS_MAC"
},
{
"name": "ohos.permission.MANAGE_nfc_HOTSPOT",
"reason": "use ohos.permission.MANAGE_nfc_HOTSPOT"
},
{
"name": "ohos.permission.GET_nfc_INFO_INTERNAL",
"reason": "use ohos.permission.GET_nfc_INFO_INTERNAL"
},
{
"name": "ohos.permission.LOCATION",
"reason": "need use ohos.permission.LOCATION",
"usedScene": {
"ability": [
"ohos.acts.communication.nfc.nfcdevice"
],
"when": "inuse"
}
},
{
"name": "ohos.permission.ACCESS_LOCATION",
"reason": "need use ohos.permission.ACCESS_LOCATION",
"usedScene": {
"ability": [
"ohos.acts.communication.nfc.nfcdevice"
],
"when": "inuse"
}
},
{
"name": "ohos.permission.LOCATION_IN_BACKGROUND",
"reason": "need use ohos.permission.LOCATION_IN_BACKGROUND",
"usedScene": {
"ability": [
"ohos.acts.communication.nfc.nfcdevice"
],
"when": "inuse"
}
},
{
"name": "ohos.permission.MANAGE_SECURE_SETTINGS",
"reason": "need use ohos.permission.MANAGE_SECURE_SETTINGS",
"usedScene": {
"ability": [
"ohos.acts.communication.nfc.nfcdevice"
],
"when": "inuse"
}
},
{
"name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
"reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
},
{
"name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
"reason": "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
},
{
"name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
},
{
"name": "ohos.permission.GET_BUNDLE_INFO"
}
],
"testRunner": {
......
communication/nfc_Controller/src/main/js/test/nfc.Controller.js
浏览文件 @ 704b0289
......@@ -56,15 +56,6 @@ export default function nfcControllerTest() {
expect(result != null).assertTrue();
}
controller.on(NFC_STATE_NOTIFY, recvNfcStateNotifyFunc);
try {
let openNfcswitch = controller.openNfc();
sleep(5000);
console.info('[nfc_js] open Nfc switch ->' + openNfcswitch);
expect(openNfcswitch).assertTrue();
}catch(error) {
console.info('[nfc_js] Failed to enable the switch ->' + error);
expect(error != null).assertTrue();
}
controller.off(NFC_STATE_NOTIFY, recvNfcStateNotifyFunc);
})
......@@ -127,26 +118,9 @@ export default function nfcControllerTest() {
console.log("[nfc_test] checkopen the state of nfc-> " + JSON.stringify(checkopennfc));
})
/**
* @tc.number SUB_COMMUNICATION_NFC_Cont_0600
* @tc.name Test closeNfcapi
* @tc.desc Deregister the NFC switch status event and disable the NFC.
* @tc.size since 7
* @tc.type Function
* @tc.level Level 2
*/
it('SUB_COMMUNICATION_NFC_Cont_0600', 0, function () {
try {
let closeNfc = controller.closeNfc();
console.info('[nfc_js] clocse Nfc switch ->' + closeNfc);
expect(closeNfc).assertTrue();
}catch(error) {
console.info('[nfc_js] Failed to disable the switch ->' + error );
expect(error!=null).assertTrue();
}
})
console.log("*************[nfc_test] start nfc js unit test end*************");
})
}
communication/wifi_p2p/src/main/js/test/WifiManagerP2PFunction.test.js
浏览文件 @ 704b0289
......@@ -365,9 +365,9 @@ export default function actsWifiManagerFunctionTest() {
};
let p2pConnectResult = wifiMg.p2pConnect(wifiP2PConfig);
console.info("[wifi_test]test p2pConnect successful." );
let p2pCancelResult = wifiMg.p2pDisconnect();
let p2pCancelResult = wifiMg.p2pCancelConnect();
await sleep(2000);
console.info("[wifi_test]test p2pDisconnect successful." );
console.info("[wifi_test]test p2pCancelConnect successful." );
let removeGroupResult = wifiMg.removeGroup();
console.info("[wifi_test]test removeGroup successful " );
await wifiMg.getCurrentGroup()
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或