Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
大约 1 年 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts

体验新版 GitCode，发现更多精彩内容 >>

未验证 提交 076f5789 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!4222 【location】脚本优化 

Merge pull request !4222 from 权力/myfeature
上级 3df758c1 40bba722
展开全部 隐藏空白更改
内联 并排
Showing with 312 addition and 301 deletion
location/geolocation_standard/src/main/js/default/test/Geolocation.test.js
浏览文件 @ 076f5789
...@@ -17,7 +17,6 @@ import geolocations from '@system.geolocation'; ...@@ -17,7 +17,6 @@ import geolocations from '@system.geolocation';
import abilityAccessCtrl from '@ohos.abilityAccessCtrl' import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
import bundle from '@ohos.bundle' import bundle from '@ohos.bundle'
import osaccount from '@ohos.account.osAccount' import osaccount from '@ohos.account.osAccount'
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
function sleep(ms) { function sleep(ms) {
...@@ -26,48 +25,48 @@ function sleep(ms) { ...@@ -26,48 +25,48 @@ function sleep(ms) {
async function changedLocationMode(){ async function changedLocationMode(){
await geolocation.isLocationEnabled().then(async(result) => { await geolocation.isLocationEnabled().then(async(result) => {
console.info('[lbs_js] getLocationSwitchState result: ' + result); console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result));
if(!result){ if(!result){
await geolocation.requestEnableLocation().then(async(result) => { await geolocation.requestEnableLocation().then(async(result) => {
await sleep(3000); await sleep(3000);
console.info('[lbs_js] test requestEnableLocation promise result: ' + result); console.info('[lbs_js] test requestEnableLocation promise result: ' + JSON.stringify(result));
expect(result).assertTrue(); expect(result).assertTrue();
}).catch((error) => { }).catch((error) => {
console.info("[lbs_js] promise then error." + error.message); console.info("[lbs_js] promise then error." + JSON.stringify(error));
expect().assertFail(); expect().assertFail();
}); });
} }
}); });
await geolocation.isLocationEnabled().then(async(result) => { await geolocation.isLocationEnabled().then(async(result) => {
console.info('[lbs_js] check LocationSwitchState result: ' + result); console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result));
}); });
} }
async function applyPermission() { async function applyPermission() {
let osAccountManager = osaccount.getAccountManager(); let osAccountManager = osaccount.getAccountManager();
console.info('[permission] getAccountManager call end'); console.debug("=== getAccountManager finish");
let localId = await osAccountManager.getOsAccountLocalIdFromProcess(); let localId = await osAccountManager.getOsAccountLocalIdFromProcess();
console.info('[permission] getOsAccountLocalIdFromProcess localId' + localId); console.info("LocalId is :" + localId);
let appInfo = await bundle.getApplicationInfo('ohos.acts.location.geolocation.function', 0, localId); let appInfo = await bundle.getApplicationInfo('ohos.acts.location.geolocation.function', 0, localId);
let atManager = abilityAccessCtrl.createAtManager(); let atManager = abilityAccessCtrl.createAtManager();
if (atManager != null) { if (atManager != null) {
let tokenID = appInfo.accessTokenId; let tokenID = appInfo.accessTokenId;
console.info('[permission] case accessTokenID is ' + tokenID); console.info('[permission] case accessTokenID is ' + tokenID);
let permissionName1 = 'ohos.permission.LOCATION'; let permissionName1 = 'ohos.permission.LOCATION';
let permissionName2 = 'ohos.permission.LOCATION_IN_BACKGROUND'; let permissionName2 = 'ohos.permission.LOCATION_IN_BACKGROUND';
await atManager.grantUserGrantedPermission(tokenID, permissionName1, 1).then((result) => { await atManager.grantUserGrantedPermission(tokenID, permissionName1, 1).then((result) => {
console.info('[permission] case grantUserGrantedPermission success :' + result); console.info('[permission] case grantUserGrantedPermission success :' + JSON.stringify(result));
}).catch((err) => { }).catch((err) => {
console.info('[permission] case grantUserGrantedPermission failed :' + err); console.info('[permission] case grantUserGrantedPermission failed :' + JSON.stringify(err));
}); });
await atManager.grantUserGrantedPermission(tokenID, permissionName2, 1).then((result) => { await atManager.grantUserGrantedPermission(tokenID, permissionName2, 1).then((result) => {
console.info('[permission] case grantUserGrantedPermission success :' + result); console.info('[permission] case grantUserGrantedPermission success :' + JSON.stringify(result));
}).catch((err) => { }).catch((err) => {
console.info('[permission] case grantUserGrantedPermission failed :' + err); console.info('[permission] case grantUserGrantedPermission failed :' + JSON.stringify(err));
}); });
} else { } else {
console.info('[permission] case apply permission failed, createAtManager failed'); console.info('[permission] case apply permission failed, createAtManager failed');
} }
} }
describe('geolocationTest_geo2', function () { describe('geolocationTest_geo2', function () {
...@@ -201,14 +200,8 @@ describe('geolocationTest_geo2', function () { ...@@ -201,14 +200,8 @@ describe('geolocationTest_geo2', function () {
* @tc.level Level 2 * @tc.level Level 2
*/ */
it('SUB_HSS_LocationSystem_0005', 0, async function (done) { it('SUB_HSS_LocationSystem_0005', 0, async function (done) {
geolocation.unsubscribe( geolocation.unsubscribe();
(result) => { console.info("[lbs_js] unsubscribe called")
if(err){
return console.info("unsubscribe err: " + err);
}
console.info("unsubscribe result: " + JSON.stringify(result));
expect(true).assertEqual(result !=null);
});
done(); done();
}) })
......
location/geolocation_standard/src/main/js/default/test/LocationTest.test.js
浏览文件 @ 076f5789
...@@ -35,48 +35,48 @@ function sleep(ms) { ...@@ -35,48 +35,48 @@ function sleep(ms) {
async function changedLocationMode(){ async function changedLocationMode(){
await geolocation.isLocationEnabled().then(async(result) => { await geolocation.isLocationEnabled().then(async(result) => {
console.info('[lbs_js] getLocationSwitchState result: ' + result); console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result));
if(!result){ if(!result){
await geolocation.requestEnableLocation().then(async(result) => { await geolocation.requestEnableLocation().then(async(result) => {
await sleep(3000); await sleep(3000);
console.info('[lbs_js] test requestEnableLocation promise result: ' + result); console.info('[lbs_js] test requestEnableLocation promise result: ' + JSON.stringify(result));
expect(result).assertTrue(); expect(result).assertTrue();
}).catch((error) => { }).catch((error) => {
console.info("[lbs_js] promise then error." + error.message); console.info("[lbs_js] promise then error." + JSON.stringify(error));
expect().assertFail(); expect().assertFail();
}); });
} }
}); });
await geolocation.isLocationEnabled().then(async(result) => { await geolocation.isLocationEnabled().then(async(result) => {
console.info('[lbs_js] check LocationSwitchState result: ' + result); console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result));
}); });
} }
async function applyPermission() { async function applyPermission() {
let osAccountManager = osaccount.getAccountManager(); let osAccountManager = osaccount.getAccountManager();
console.info('[permission] getAccountManager call end'); console.debug("=== getAccountManager finish");
let localId = await osAccountManager.getOsAccountLocalIdFromProcess(); let localId = await osAccountManager.getOsAccountLocalIdFromProcess();
console.info('[permission] getOsAccountLocalIdFromProcess localId' + localId); console.info("LocalId is :" + localId);
let appInfo = await bundle.getApplicationInfo('ohos.acts.location.geolocation.function', 0, localId); let appInfo = await bundle.getApplicationInfo('ohos.acts.location.geolocation.function', 0, localId);
let atManager = abilityAccessCtrl.createAtManager(); let atManager = abilityAccessCtrl.createAtManager();
if (atManager != null) { if (atManager != null) {
let tokenID = appInfo.accessTokenId; let tokenID = appInfo.accessTokenId;
console.info('[permission] case accessTokenID is ' + tokenID); console.info('[permission] case accessTokenID is ' + tokenID);
let permissionName1 = 'ohos.permission.LOCATION'; let permissionName1 = 'ohos.permission.LOCATION';
let permissionName2 = 'ohos.permission.LOCATION_IN_BACKGROUND'; let permissionName2 = 'ohos.permission.LOCATION_IN_BACKGROUND';
await atManager.grantUserGrantedPermission(tokenID, permissionName1, 1).then((result) => { await atManager.grantUserGrantedPermission(tokenID, permissionName1, 1).then((result) => {
console.info('[permission] case grantUserGrantedPermission success :' + result); console.info('[permission] case grantUserGrantedPermission success :' + JSON.stringify(result));
}).catch((err) => { }).catch((err) => {
console.info('[permission] case grantUserGrantedPermission failed :' + err); console.info('[permission] case grantUserGrantedPermission failed :' + JSON.stringify(err));
}); });
await atManager.grantUserGrantedPermission(tokenID, permissionName2, 1).then((result) => { await atManager.grantUserGrantedPermission(tokenID, permissionName2, 1).then((result) => {
console.info('[permission] case grantUserGrantedPermission success :' + result); console.info('[permission] case grantUserGrantedPermission success :' + JSON.stringify(result));
}).catch((err) => { }).catch((err) => {
console.info('[permission] case grantUserGrantedPermission failed :' + err); console.info('[permission] case grantUserGrantedPermission failed :' + JSON.stringify(err));
}); });
} else { } else {
console.info('[permission] case apply permission failed, createAtManager failed'); console.info('[permission] case apply permission failed, createAtManager failed');
} }
} }
describe('geolocationTest_geo3', function () { describe('geolocationTest_geo3', function () {
...@@ -1045,6 +1045,8 @@ describe('geolocationTest_geo3', function () { ...@@ -1045,6 +1045,8 @@ describe('geolocationTest_geo3', function () {
geolocation.getCachedGnssLocationsSize((err, data) => { geolocation.getCachedGnssLocationsSize((err, data) => {
if (err) { if (err) {
console.info('[lbs_js] getCachedGnssLocationsSize callback err is : ' + err); console.info('[lbs_js] getCachedGnssLocationsSize callback err is : ' + err);
expect(true).assertTrue(err != null);
done();
}else { }else {
console.info("[lbs_js] getCachedGnssLocationsSize callback data is: " + JSON.stringify(data)); console.info("[lbs_js] getCachedGnssLocationsSize callback data is: " + JSON.stringify(data));
expect(true).assertTrue(data != null); expect(true).assertTrue(data != null);
...@@ -1094,7 +1096,8 @@ describe('geolocationTest_geo3', function () { ...@@ -1094,7 +1096,8 @@ describe('geolocationTest_geo3', function () {
done(); done();
}).catch((error) => { }).catch((error) => {
console.info("[lbs_js] promise then error." + error.message); console.info("[lbs_js] promise then error." + error.message);
expect().assertFail(); expect(true).assertTrue(error != null);
done();
done(); done();
}); });
}) })
...@@ -1114,6 +1117,8 @@ describe('geolocationTest_geo3', function () { ...@@ -1114,6 +1117,8 @@ describe('geolocationTest_geo3', function () {
(result) => { (result) => {
if(err){ if(err){
return console.info("oncachedGnssLocationsReporting callback err: " + err); return console.info("oncachedGnssLocationsReporting callback err: " + err);
expect(true).assertTrue(err != null);
done();
} }
console.info("cachedGnssLocationsReporting result: " + JSON.stringify(result)); console.info("cachedGnssLocationsReporting result: " + JSON.stringify(result));
expect(true).assertEqual(result !=null); expect(true).assertEqual(result !=null);
...@@ -1136,6 +1141,8 @@ describe('geolocationTest_geo3', function () { ...@@ -1136,6 +1141,8 @@ describe('geolocationTest_geo3', function () {
geolocation.flushCachedGnssLocations((err, data) => { geolocation.flushCachedGnssLocations((err, data) => {
if (err) { if (err) {
console.info('[lbs_js] flushCachedGnssLocations callback err is : ' + err); console.info('[lbs_js] flushCachedGnssLocations callback err is : ' + err);
expect(true).assertTrue(err != null);
done();
}else { }else {
console.info("[lbs_js] flushCachedGnssLocations callback data is: " + JSON.stringify(data)); console.info("[lbs_js] flushCachedGnssLocations callback data is: " + JSON.stringify(data));
expect(true).assertTrue(data); expect(true).assertTrue(data);
...@@ -1185,7 +1192,7 @@ describe('geolocationTest_geo3', function () { ...@@ -1185,7 +1192,7 @@ describe('geolocationTest_geo3', function () {
done(); done();
}).catch((error) => { }).catch((error) => {
console.info("[lbs_js] promise then error." + error.message); console.info("[lbs_js] promise then error." + error.message);
expect().assertFail(); expect(true).assertTrue(error != null);
done(); done();
}); });
}) })
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或