Skip to content

X
Xts Acts

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

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

!7301 【OpenHarmony】【location】【master】LBS新框架适配及用例优化 

Merge pull request !7301 from 权力/myfeature
上级 5abf4154 3604745e
展开全部 显示空白变更内容
内联 并排
Showing with 2120 addition and 958 deletion
location/geolocation_standard/BUILD.gn
浏览文件 @ 84166d74
......@@ -29,7 +29,9 @@ ohos_js_hap_suite("ActslocationJsTest") {
subsystem_name = "location"
}
ohos_js_assets("geolocation_js_assets") {
source_dir = "./src/main/js/default"
js2abc = true
hap_profile = "./src/main/config.json"
source_dir = "./src/main/js"
}
ohos_resources("geolocation_resources") {
sources = [ "./src/main/resources" ]
......
location/geolocation_standard/Test.json
浏览文件 @ 84166d74
{
"description": "Configuration for geolocation js api Tests",
"driver": {
"type": "JSUnitTest",
"type": "OHJSUnitTest",
"bundle-name": "ohos.acts.location.geolocation.function",
"package-name":"ohos.acts.location.geolocation.function",
"test-timeout": "600000",
"package": "ohos.acts.location.geolocation.function",
"shell-timeout": "60000"
"shell-timeout": "60000",
"testcase-timeout": 70000
},
"kits": [
{
......
location/geolocation_standard/src/main/config.json
浏览文件 @ 84166d74
......@@ -15,8 +15,9 @@
"deviceConfig": {},
"module": {
"package": "ohos.acts.location.geolocation.function",
"name": ".MyApplication",
"mainAbility": "ohos.acts.location.geolocation.function.MainAbility",
"name": ".entry",
"mainAbility": ".MainAbility",
"srcPath":"",
"deviceType": [
"tablet",
"default",
......@@ -39,12 +40,29 @@
]
}
],
"orientation": "unspecified",
"formsEnabled": false,
"name": ".MainAbility",
"srcLanguage": "js",
"srcPath": "MainAbility",
"icon": "$media:icon",
"description": "$string:MainAbility_desc",
"label": "$string:MainAbility_label",
"type": "page",
"visible": true,
"name": "ohos.acts.location.geolocation.function.MainAbility",
"launchType": "standard"
},
{
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:mainability_description",
"label": "$string:app_name",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "standard"
}
],
......@@ -124,8 +142,22 @@
"designWidth": 720,
"autoDesignWidth": false
}
},
{
"pages": [
"pages/index/index"
],
"name": ".TestAbility",
"window": {
"designWidth": 720,
"autoDesignWidth": false
}
}
],
"testRunner": {
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
}
]
}
}
location/geolocation_standard/src/main/js/default/test/List.test.js → location/geolocation_standard/src/main/js/MainAbility/pages/index/index.js
浏览文件 @ 84166d74
......@@ -13,10 +13,18 @@
* limitations under the License.
*/
require('./GeocoderTest.test.js')
require('./GeocoderMTest.test.js')
require('./GetCountryCode.test.js')
require('./GetCountryCodeM.test.js')
require('./LocationTest.test.js')
require('./LocationMTest.test.js')
require('./SystemLocation.test.js')
import app from '@system.app'
export default {
data: {
title: ""
},
onInit() {
this.title = this.$t('strings.world');
},
onShow() {
console.info('onShow finish')
},
onReady() {
},
}
location/geolocation_standard/src/main/js/TestAbility/app.js 0 → 100644
浏览文件 @ 84166d74
/*
* 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
import { Hypium } from '@ohos/hypium'
import testsuite from '../test/List.test'
export default {
onCreate() {
console.info('TestApplication onCreate')
var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('start run testcase!!!')
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
},
onDestroy() {
console.info("TestApplication onDestroy");
}
};
location/geolocation_standard/src/main/js/TestAbility/i18n/en-US.json 0 → 100644
浏览文件 @ 84166d74
{
"strings": {
"hello": "Hello",
"world": "World"
},
"Files": {
}
}
\ No newline at end of file
location/geolocation_standard/src/main/js/TestAbility/i18n/zh-CN.json 0 → 100644
浏览文件 @ 84166d74
{
"strings": {
"hello": "您好",
"world": "世界"
},
"Files": {
}
}
\ No newline at end of file
location/geolocation_standard/src/main/js/TestAbility/pages/index/index.css 0 → 100644
浏览文件 @ 84166d74
.container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
.title {
font-size: 60px;
text-align: center;
width: 100%;
height: 40%;
margin: 10px;
}
@media screen and (device-type: phone) and (orientation: landscape) {
.title {
font-size: 60px;
}
}
@media screen and (device-type: tablet) and (orientation: landscape) {
.title {
font-size: 100px;
}
}
\ No newline at end of file
location/geolocation_standard/src/main/js/TestAbility/pages/index/index.hml 0 → 100644
浏览文件 @ 84166d74
<div class="container">
<text class="title">
{{ $t('strings.hello') }} {{ title }}
</text>
</div>
location/geolocation_standard/src/main/js/default/pages/index/index.js → location/geolocation_standard/src/main/js/TestAbility/pages/index/index.js
浏览文件 @ 84166d74
/*
* Copyright (C) 2021 Huawei Device Co., Ltd.
* 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
......@@ -13,31 +13,14 @@
* limitations under the License.
*/
import app from '@system.app'
import {Core, ExpectExtend} from 'deccjsunit/index'
export default {
data: {
title: ""
},
onInit() {
this.title = this.$t('strings.world');
},
onShow() {
console.info('onShow finish')
const core = Core.getInstance()
const expectExtend = new ExpectExtend({
'id': 'extend'
})
core.addService('expect', expectExtend)
core.init()
}
}
const configService = core.getDefaultService('config')
configService.setConfig(this)
require('../../test/List.test')
core.execute()
},
onReady() {
},
}
location/geolocation_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js 0 → 100644
浏览文件 @ 84166d74
/*
* 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
function translateParamsToString(parameters) {
const keySet = new Set([
'-s class', '-s notClass', '-s suite', '-s itName',
'-s level', '-s testType', '-s size', '-s timeout',
'-s package', '-s dryRun'
])
let targetParams = '';
for (const key in parameters) {
if (keySet.has(key)) {
targetParams += ' ' + key + ' ' + parameters[key]
}
}
return targetParams.trim()
}
export default {
onPrepare() {
console.info('OpenHarmonyTestRunner OnPrepare')
},
onRun() {
console.log('OpenHarmonyTestRunner onRun run')
var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"]
console.info('debug value : '+debug)
if (debug == 'true')
{
cmd += ' -D'
}
console.info('cmd : '+cmd)
abilityDelegator.executeShellCommand(cmd, (err, data) => {
console.info('executeShellCommand : err : ' + JSON.stringify(err));
console.info('executeShellCommand : data : ' + data.stdResult);
console.info('executeShellCommand : data : ' + data.exitCode);
})
}
};
location/geolocation_standard/src/main/js/default/test/GeocoderMTest.test.js → location/geolocation_standard/src/main/js/test/GeocoderMTest.test.js
浏览文件 @ 84166d74
......@@ -13,12 +13,12 @@
* limitations under the License.
*/
import geolocation from '@ohos.geolocation';
import geolocationm from '@ohos.geoLocationManager';
import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
import bundle from '@ohos.bundle'
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 '@ohos/hypium'
let LocationRequestScenario = {
UNSET: 0x300,
......@@ -44,7 +44,7 @@ async function changedLocationMode(){
let result1 = geolocationm.isLocationEnabled();
console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result1));
if(!result1){
await geolocationm.requestEnableLocation().then(async(result) => {
await geolocation.requestEnableLocation().then(async(result) => {
await sleep(3000);
console.info('[lbs_js] test requestEnableLocation promise result: ' + JSON.stringify(result));
}).catch((error) => {
......@@ -83,7 +83,9 @@ async function applyPermission() {
}
}
describe('geolocationTest_geo5', function () {
export default function geolocationTest_geo5() {
describe('geolocationTest_geo5', function () {
console.log('#start AccessTokenTests#');
beforeAll(async function (done) {
......@@ -98,6 +100,7 @@ describe('geolocationTest_geo5', function () {
done();
})
/**
* @tc.number SUB_HSS_LocationSystem_Geo_1900
* @tc.name testIsGeoServiceAvailable
......@@ -126,19 +129,23 @@ describe('geolocationTest_geo5', function () {
* @tc.level Level 2
*/
it('SUB_HSS_LocationSystem_Geo_2000', 0, async function (done) {
try {
let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 1, "locale": "zh" };
let promise = new Promise((resolve, reject) => {
geolocationm.getAddressesFromLocation(reverseGeocodeRequest, (err, data) => {
if (err) {
console.info('[lbs_js] getAddressesFromLocation20 callback err is:' + JSON.stringify(err));
console.info('[lbs_js] getAddressesFromLocation4 callback err is:' + JSON.stringify(err));
return;
} else {
console.info("[lbs_js] getAddressesFromLocation20 callback data is:" + JSON.stringify(data));
console.info("[lbs_js] getAddressesFromLocation4 callback data is:" + JSON.stringify(data));
expect(true).assertEqual((JSON.stringify(data)) != null);
}
resolve();
});
})
await promise.then(done);
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation4 callback try error:"+ error);
expect(true).assertEqual(JSON.stringify(error) != null);
}
await sleep(2000);
done();
})
/**
......@@ -150,6 +157,7 @@ describe('geolocationTest_geo5', function () {
* @tc.level Level 2
*/
it('SUB_HSS_LocationSystem_Geo_2100', 0, async function (done) {
try {
let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 1 };
await geolocationm.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
console.info('[lbs_js] getAddressesFromLocation21 promise: ' + JSON.stringify(data));
......@@ -164,13 +172,16 @@ describe('geolocationTest_geo5', function () {
+ JSON.stringify(data)[0].roadName + JSON.stringify(data)[0].subAdministrativeArea
+ JSON.stringify(data)[0].subLocality + JSON.stringify(data)[0].subRoadName
+ JSON.stringify(data)[0].isFromMock);
done();
}).catch(error => {
console.info("[lbs_js] getAddressesFromLocation21 promise then error." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
done();
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation21 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
/**
......@@ -182,17 +193,21 @@ describe('geolocationTest_geo5', function () {
* @tc.level Level 2
*/
it('SUB_HSS_LocationSystem_Geo_2200', 0, async function (done) {
try {
let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 5 };
await geolocationm.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
console.info('[lbs_js] getAddressesFromLocation22 promise:' + JSON.stringify(data));
expect(true).assertEqual((JSON.stringify(data)) != null);
done();
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocation22 promise then error." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
done();
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation22 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
/**
......@@ -403,6 +418,7 @@ describe('geolocationTest_geo5', function () {
*/
it('SUB_HSS_LocationSystem_Geo_2600', 0, async function (done) {
let geocodeRequest = { "description": "上海市浦东新区金穗路1800号", "maxItems": 1 };
try {
await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation09 callback data is:" + JSON.stringify(result));
expect(true).assertEqual((JSON.stringify(result)) != null);
......@@ -410,6 +426,10 @@ describe('geolocationTest_geo5', function () {
console.info("[lbs_js] getAddressesFromLocationName09 promise then error." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocationName26 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
......@@ -422,6 +442,7 @@ describe('geolocationTest_geo5', function () {
* @tc.level Level 2
*/
it('SUB_HSS_LocationSystem_Geo_2700', 0, async function (done) {
try {
let geocodeRequest = { "description": "上海市浦东新区金穗路1800号", "maxItems": 5 };
await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation10 promise data is:" + JSON.stringify(result));
......@@ -431,6 +452,10 @@ describe('geolocationTest_geo5', function () {
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocationName27 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
......@@ -490,6 +515,7 @@ describe('geolocationTest_geo5', function () {
"maxLatitude": 31.1537977881,
"maxLongitude": 121.8026736943
};
try {
await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation29 promise data is:" + JSON.stringify(result));
expect(true).assertEqual((JSON.stringify(result)) != null);
......@@ -498,6 +524,10 @@ describe('geolocationTest_geo5', function () {
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocationName29 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
......@@ -572,6 +602,7 @@ describe('geolocationTest_geo5', function () {
"maxLatitude": 40.95,
"maxLongitude": 116.45
};
try {
await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocationName31 promise data is:" + JSON.stringify(result));
expect(result.length >= 0).assertTrue();
......@@ -580,6 +611,10 @@ describe('geolocationTest_geo5', function () {
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocationName31 message." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
......@@ -601,6 +636,7 @@ describe('geolocationTest_geo5', function () {
"maxLatitude": 39.85,
"maxLongitude": 116.35
};
try {
await geolocationm.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocationName32 promise data is:" + JSON.stringify(result));
expect(result.length >= 0).assertTrue();
......@@ -609,6 +645,10 @@ describe('geolocationTest_geo5', function () {
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocationName32 message." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
}
done();
})
......@@ -961,4 +1001,8 @@ describe('geolocationTest_geo5', function () {
}
done();
})
})
})
}
location/geolocation_standard/src/main/js/default/test/GeocoderTest.test.js → location/geolocation_standard/src/main/js/test/GeocoderTest.test.js
浏览文件 @ 84166d74
......@@ -18,7 +18,7 @@ import {LocationEventListener} from '@ohos.geolocation';
import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
import bundle from '@ohos.bundle'
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 '@ohos/hypium'
let LocationRequestScenario = {
UNSET: 0x300,
......@@ -85,7 +85,10 @@ async function applyPermission() {
}
}
describe('geolocationTest_geo1', function () {
export default function geolocationTest_geo1() {
describe('geolocationTest_geo1', function () {
console.log('#start AccessTokenTests#');
beforeAll(async function (done) {
......@@ -100,6 +103,7 @@ describe('geolocationTest_geo1', function () {
done();
})
/**
* @tc.number SUB_HSS_LocationSystem_Geo_0100
* @tc.name testIsGeoServiceAvailable
......@@ -109,18 +113,23 @@ describe('geolocationTest_geo1', function () {
* @tc.level Level 2
*/
it('SUB_HSS_LocationSystem_Geo_0100', 0, async function (done) {
try {
geolocation.isGeoServiceAvailable(async (err, data) => {
if (err) {
console.info('[lbs_js] getGeoServiceState err is : ' + JSON.stringify(err));
} else {
console.info('[lbs_js] isGeoServiceAvailable callback result: ' + JSON.stringify(data));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(data) != null);
done();
}
done();
})
} catch (error) {
console.info("[lbs_js] isGeoServiceAvailable callback err." + JSON.stringify(error));
console.info('[lbs_js] The geocode interface is not connected to a third-party service.');
expect(true).assertEqual(JSON.stringify(error) != null);
}
await sleep(500);
done();
});
/**
......@@ -139,10 +148,12 @@ describe('geolocationTest_geo1', function () {
expect(true).assertEqual(JSON.stringify(result) != null);
}).catch((error) => {
console.info("[lbs_js] promise then error." + JSON.stringify(error));
expect().assertFail();
expect(true).assertEqual(JSON.stringify(error) != null);
});
} catch (error) {
console.info("[lbs_js] isGeoServiceAvailable error." + JSON.stringify(error));
console.info('[lbs_js] The geocode interface is not connected to a third-party service.');
expect(true).assertEqual(JSON.stringify(error) != null);
}
done();
})
......@@ -157,7 +168,7 @@ describe('geolocationTest_geo1', function () {
*/
it('SUB_HSS_LocationSystem_Geo_0300', 0, async function (done) {
let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 1, "locale": "zh" };
let promise = new Promise((resolve, reject) => {
try {
geolocation.getAddressesFromLocation(reverseGeocodeRequest, (err, data) => {
if (err) {
console.info('[lbs_js] getAddressesFromLocation callback err is : ' + JSON.stringify(err));
......@@ -165,10 +176,13 @@ describe('geolocationTest_geo1', function () {
console.info("[lbs_js] getAddressesFromLocation callback data is: " + JSON.stringify(data));
expect(true).assertEqual((JSON.stringify(data)) != null);
}
resolve();
});
})
await promise.then(done)
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation callback try err:" + JSON.stringify(error));
expect(true).assertEqual(JSON.stringify(error) != null);
}
await sleep(1000);
done();
})
/**
......@@ -181,6 +195,7 @@ describe('geolocationTest_geo1', function () {
*/
it('SUB_HSS_LocationSystem_Geo_0400', 0, async function (done) {
let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 1 };
try {
await geolocation.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
console.info('[lbs_js] getAddressesFromLocation04 promise: ' + JSON.stringify(data));
console.info('addressUrl: ' + JSON.stringify(data)[0].addressUrl
......@@ -194,13 +209,16 @@ describe('geolocationTest_geo1', function () {
+ JSON.stringify(data)[0].roadName + JSON.stringify(data)[0].subAdministrativeArea
+ JSON.stringify(data)[0].subLocality + JSON.stringify(data)[0].subRoadName
+ JSON.stringify(data)[0].isFromMock);
done();
}).catch(error => {
console.info("[lbs_js] getAddressesFromLocation promise then error." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
done();
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation04 promise try err:" + JSON.stringify(error));
expect(true).assertEqual(JSON.stringify(error) != null);
}
done();
})
/**
......@@ -213,16 +231,20 @@ describe('geolocationTest_geo1', function () {
*/
it('SUB_HSS_LocationSystem_Geo_0500', 0, async function (done) {
let reverseGeocodeRequest = { "latitude": 31.265496, "longitude": 121.62771, "maxItems": 5 };
try {
await geolocation.getAddressesFromLocation(reverseGeocodeRequest).then((data) => {
console.info('[lbs_js] getAddressesFromLocation05 promise: ' + JSON.stringify(data));
expect(true).assertEqual((JSON.stringify(data)) != null);
done();
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocation promise then error." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
done();
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation05 promise try err:" + JSON.stringify(error));
expect(true).assertEqual(JSON.stringify(error) != null);
}
done();
})
/**
......@@ -435,13 +457,18 @@ describe('geolocationTest_geo1', function () {
*/
it('SUB_HSS_LocationSystem_Geo_0900', 0, async function (done) {
let geocodeRequest = { "description": "上海市浦东新区金穗路1800号", "maxItems": 1 };
try {
await geolocation.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation callback data is: " + JSON.stringify(result));
console.info("[lbs_js] getAddressesFromLocation09 promise data: " + JSON.stringify(result));
expect(true).assertEqual((JSON.stringify(result)) != null);
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocationName09 promise then error." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation09 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
}
done();
})
......@@ -455,14 +482,19 @@ describe('geolocationTest_geo1', function () {
*/
it('SUB_HSS_LocationSystem_Geo_1000', 0, async function (done) {
let geocodeRequest = { "description": "上海市浦东新区金穗路1800号", "maxItems": 5 };
try {
await geolocation.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation m callback data is: " + JSON.stringify(result));
console.info("[lbs_js] getAddressesFromLocation10 promise data: " + JSON.stringify(result));
expect(true).assertEqual((JSON.stringify(result)) != null);
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocationName m promise then error." + JSON.stringify(error));
console.info("[lbs_js] getAddressesFromLocationName10 promise then error." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
} catch (error) {
console.info("[lbs_js] getAddressesFromLocation10 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
}
done();
})
......@@ -478,10 +510,10 @@ describe('geolocationTest_geo1', function () {
try {
let geocodeRequest = { "description": "", "maxItems": 1 };
await geolocation.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation promise data is: " + JSON.stringify(result));
console.info("[lbs_js] getAddressesFromLocation111 promise data: " + JSON.stringify(result));
expect(true).assertEqual((JSON.stringify(result)) != null);
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocationName promise then error." + JSON.stringify(error));
console.info("[lbs_js] getAddressesFromLocationName111 promise then error." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
......@@ -492,15 +524,15 @@ describe('geolocationTest_geo1', function () {
let geocodeRequest1 = { "description": null, "maxItems": 1 };
try {
await geolocation.getAddressesFromLocationName(geocodeRequest1).then((result) => {
console.info("[lbs_js] getAddressesFromLocation callback data is: " + JSON.stringify(result));
console.info("[lbs_js] getAddressesFromLocation112 promise data: " + JSON.stringify(result));
expect(result.length == 0).assertTrue();
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocationName promise then error." + JSON.stringify(error));
console.info("[lbs_js] getAddressesFromLocationName112 promise then error." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
});
}catch(error){
console.info("[lbs_js] getAddressesFromLocationName message." + JSON.stringify(error.message));
expect(true).assertEqual((JSON.stringify(error.message)) != null);
console.info("[lbs_js] getAddressesFromLocation11 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
}
done();
})
......@@ -522,6 +554,7 @@ describe('geolocationTest_geo1', function () {
"maxLatitude": 31.1537977881,
"maxLongitude": 121.8026736943
};
try {
await geolocation.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation callback data is: " + JSON.stringify(result));
expect(true).assertEqual((JSON.stringify(result)) != null);
......@@ -530,6 +563,10 @@ describe('geolocationTest_geo1', function () {
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
}catch(error){
console.info("[lbs_js] getAddressesFromLocation12 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
}
done();
})
......@@ -604,14 +641,19 @@ describe('geolocationTest_geo1', function () {
"maxLatitude": 40.95,
"maxLongitude": 116.45
};
try {
await geolocation.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation callback data is: " + JSON.stringify(result));
console.info("[lbs_js] getAddressesFromLocation14 promise data: " + JSON.stringify(result));
expect(result.length >= 0).assertTrue();
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocationName promise then error." + JSON.stringify(error));
console.info("[lbs_js] getAddressesFromLocationName14 promise then err." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
}catch(error){
console.info("[lbs_js] getAddressesFromLocation14 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
}
done();
})
......@@ -633,14 +675,19 @@ describe('geolocationTest_geo1', function () {
"maxLatitude": 39.85,
"maxLongitude": 116.35
};
try {
await geolocation.getAddressesFromLocationName(geocodeRequest).then((result) => {
console.info("[lbs_js] getAddressesFromLocation callback data is: " + JSON.stringify(result));
console.info("[lbs_js] getAddressesFromLocation15 promise data is: " + JSON.stringify(result));
expect(result.length >= 0).assertTrue();
}).catch((error) => {
console.info("[lbs_js] getAddressesFromLocationName promise then error." + JSON.stringify(error));
console.info("[lbs_js] getAddressesFromLocationName15 promise then err." + JSON.stringify(error));
console.info('[lbs_js] not support now');
expect(true).assertEqual(JSON.stringify(error) != null);
});
}catch(error){
console.info("[lbs_js] getAddressesFromLocation15 try err." + JSON.stringify(error));
expect(true).assertEqual((JSON.stringify(error)) != null);
}
done();
})
......@@ -993,7 +1040,8 @@ describe('geolocationTest_geo1', function () {
}
done();
})
})
})
}
location/geolocation_standard/src/main/js/default/test/GetCountryCode.test.js → location/geolocation_standard/src/main/js/test/GetCountryCode.test.js
浏览文件 @ 84166d74
......@@ -17,7 +17,7 @@ import geolocationm from '@ohos.geoLocationManager';
import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
import bundle from '@ohos.bundle'
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 '@ohos/hypium'
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
......@@ -76,7 +76,10 @@ let CountryCodeType = {
COUNTRY_CODE_FROM_NETWORK:4,
}
describe('geolocationTest_4', function () {
export default function geolocationTest_4() {
describe('geolocationTest_4', function () {
beforeAll(async function (done) {
console.info('beforeAll case');
await applyPermission();
......@@ -97,18 +100,23 @@ describe('geolocationTest_4', function () {
* @tc.level since 9
*/
it('SUB_HSS_LocationSystem_CountryCode_0100', 0, async function (done) {
try {
await geolocationm.getCountryCode().then((result) => {
console.info("[lbs_js] getCountryCode promise result: " + JSON.stringify(result));
console.info("[lbs_js] country :" + result.country);
console.info("[lbs_js] type: " + result.type);
expect(true).assertTrue(JSON.stringify(result)==CountryCodeType.COUNTRY_CODE_FROM_LOCALE);
expect(true).assertTrue(JSON.stringify(result)!=CountryCodeType.COUNTRY_CODE_FROM_SIM);
expect(true).assertTrue(JSON.stringify(result)!=CountryCodeType.COUNTRY_CODE_FROM_LOCATION);
expect(true).assertTrue(JSON.stringify(result)!=CountryCodeType.COUNTRY_CODE_FROM_NETWORK);
expect(true).assertEqual(JSON.stringify(result.type)==CountryCodeType.COUNTRY_CODE_FROM_LOCALE);
expect(true).assertEqual(JSON.stringify(result.type)!=CountryCodeType.COUNTRY_CODE_FROM_SIM);
expect(true).assertEqual(JSON.stringify(result.type)!=CountryCodeType.COUNTRY_CODE_FROM_LOCATION);
expect(true).assertEqual(JSON.stringify(result.type)!=CountryCodeType.COUNTRY_CODE_FROM_NETWORK);
}).catch((error) => {
console.info("[lbs_js] getCountryCode promise then error." + JSON.stringify(error));
expect().assertFail();
});
} catch (error) {
console.info("[lbs_js] getCountryCode promise try err." + JSON.stringify(error));
expect().assertFail();
}
done();
})
......@@ -120,8 +128,7 @@ describe('geolocationTest_4', function () {
* @tc.level since 9
*/
it('SUB_HSS_LocationSystem_CountryCode_0200', 0, async function (done) {
function getCountryCodeCallback() {
return new Promise((resolve, reject) => {
try {
geolocationm.getCountryCode((err,data) => {
if (err) {
return console.info("getCountryCode callback err: " + JSON.stringify(err));
......@@ -129,11 +136,12 @@ describe('geolocationTest_4', function () {
console.info("getCountryCode callback success"+ JSON.stringify(data));
expect(true).assertEqual(data != null);
}
resolve();
})
})
});
} catch (error) {
console.info("[lbs_js] getCountryCode callback try err." + JSON.stringify(error));
expect().assertFail();
}
await getCountryCodeCallback();
await sleep(1000);
done();
})
......@@ -146,21 +154,37 @@ describe('geolocationTest_4', function () {
*/
it('SUB_HSS_LocationSystem_CountryCode_0300', 0, async function (done) {
console.info("[lbs_js] countryCodeChange");
try {
geolocationm.on('countryCodeChange', function (data) {
console.info('[lbs_js] countryCodeChange' +JSON.stringify(data) );
});
} catch (error) {
console.info("[lbs_js] countryCodeChangeOn try err." + JSON.stringify(error));
expect(true).assertEqual(JSON.stringify(error)!=null);
}
try {
await geolocationm.getCountryCode().then((result) => {
console.info("[lbs_js] getCountryCode promise result: " + JSON.stringify(result));
expect(true).assertTrue(JSON.stringify(result)!=null);
expect(true).assertEqual(JSON.stringify(result)!=null);
}).catch((error) => {
console.info("[lbs_js] getCountryCode promise then error." + JSON.stringify(error));
expect().assertFail();
});
} catch (error) {
console.info("[lbs_js] getCountryCode callback try err." + JSON.stringify(error));
expect().assertFail();
}
try {
geolocationm.off('countryCodeChange', function (data) {
console.info('[lbs_js] countryCodeChange' + JSON.stringify(data));
done();
})
} catch (error) {
console.info("[lbs_js] countryCodeChangeOff try err." + JSON.stringify(error));
expect(true).assertEqual(JSON.stringify(error)!=null);
}
done();
})
})
})
}
location/geolocation_standard/src/main/js/default/test/GetCountryCodeM.test.js → location/geolocation_standard/src/main/js/test/GetCountryCodeM.test.js
浏览文件 @ 84166d74
......@@ -13,11 +13,12 @@
* limitations under the License.
*/
import geolocation from '@ohos.geolocation';
import geolocationm from '@ohos.geoLocationManager';
import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
import bundle from '@ohos.bundle'
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 '@ohos/hypium'
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
......@@ -28,7 +29,7 @@ async function changedLocationMode(){
let result1 = geolocationm.isLocationEnabled();
console.info('[lbs_js] getLocationSwitchState result: ' + JSON.stringify(result1));
if(!result1){
await geolocationm.requestEnableLocation().then(async(result) => {
await geolocation.requestEnableLocation().then(async(result) => {
await sleep(3000);
console.info('[lbs_js] test requestEnableLocation promise result: ' + JSON.stringify(result));
}).catch((error) => {
......@@ -74,7 +75,10 @@ let CountryCodeType = {
COUNTRY_CODE_FROM_NETWORK:4,
}
describe('geolocationTest_6', function () {
export default function geolocationTest_6() {
describe('geolocationTest_6', function () {
beforeAll(async function (done) {
console.info('beforeAll case');
await applyPermission();
......@@ -95,18 +99,23 @@ describe('geolocationTest_6', function () {
* @tc.level since 9
*/
it('SUB_HSS_LocationSystem_CountryCode_0400', 0, async function (done) {
try {
await geolocationm.getCountryCode().then((result) => {
console.info("[lbs_js] getCountryCode promise result: " + JSON.stringify(result));
console.info("[lbs_js] country :" + result.country);
console.info("[lbs_js] type: " + result.type);
expect(true).assertTrue(JSON.stringify(result)==CountryCodeType.COUNTRY_CODE_FROM_LOCALE);
expect(true).assertTrue(JSON.stringify(result)!=CountryCodeType.COUNTRY_CODE_FROM_SIM);
expect(true).assertTrue(JSON.stringify(result)!=CountryCodeType.COUNTRY_CODE_FROM_LOCATION);
expect(true).assertTrue(JSON.stringify(result)!=CountryCodeType.COUNTRY_CODE_FROM_NETWORK);
expect(true).assertEqual(JSON.stringify(result.type)==CountryCodeType.COUNTRY_CODE_FROM_LOCALE);
expect(true).assertEqual(JSON.stringify(result.type)!=CountryCodeType.COUNTRY_CODE_FROM_SIM);
expect(true).assertEqual(JSON.stringify(result.type)!=CountryCodeType.COUNTRY_CODE_FROM_LOCATION);
expect(true).assertEqual(JSON.stringify(result.type)!=CountryCodeType.COUNTRY_CODE_FROM_NETWORK);
}).catch((error) => {
console.info("[lbs_js] getCountryCode promise then error." + JSON.stringify(error));
expect().assertFail();
});
} catch (error) {
console.info("[lbs_js] getCountryCode promise try err." + JSON.stringify(error));
expect().assertFail();
}
done();
})
......@@ -118,8 +127,7 @@ describe('geolocationTest_6', function () {
* @tc.level since 9
*/
it('SUB_HSS_LocationSystem_CountryCode_0500', 0, async function (done) {
function getCountryCodeCallback() {
return new Promise((resolve, reject) => {
try {
geolocationm.getCountryCode((err,data) => {
if (err) {
return console.info("[lbs_js] getCountryCode callback err: " + JSON.stringify(err));
......@@ -127,11 +135,12 @@ describe('geolocationTest_6', function () {
console.info("[lbs_js] getCountryCode callback success"+ JSON.stringify(data));
expect(true).assertEqual(data != null);
}
resolve();
})
})
} catch (error) {
console.info("[lbs_js] getCountryCode callback try err." + JSON.stringify(error));
expect().assertFail();
}
await getCountryCodeCallback();
await sleep(1500);
done();
})
......@@ -144,21 +153,37 @@ describe('geolocationTest_6', function () {
*/
it('SUB_HSS_LocationSystem_CountryCode_0600', 0, async function (done) {
console.info("[lbs_js] countryCodeChange");
try {
geolocationm.on('countryCodeChange', function (data) {
console.info('[lbs_js] countryCodeChange' +JSON.stringify(data) );
});
} catch (error) {
console.info("[lbs_js] countryCodeChangeOn try err." + JSON.stringify(error));
expect(true).assertEqual(error != null);
}
try {
await geolocationm.getCountryCode().then((result) => {
console.info("[lbs_js] getCountryCode promise result: " + JSON.stringify(result));
expect(true).assertTrue(JSON.stringify(result)!=null);
expect(true).assertEqual(JSON.stringify(result)!=null);
}).catch((error) => {
console.info("[lbs_js] getCountryCode promise then error." + JSON.stringify(error));
expect().assertFail();
});
} catch (error) {
console.info("[lbs_js] getCountryCode promise try err." + JSON.stringify(error));
expect().assertFail();
}
try {
geolocationm.off('countryCodeChange', function (data) {
console.info('[lbs_js] countryCodeChange' + JSON.stringify(data));
done();
})
} catch (error) {
console.info("[lbs_js] countryCodeChangeOn try err." + JSON.stringify(error));
expect(true).assertEqual(error != null);
}
done();
})
})
})
}
location/geolocation_standard/src/main/js/test/List.test.js 0 → 100644
浏览文件 @ 84166d74
/*
* Copyright (C) 2021 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 geolocationTest_geo5 from './GeocoderMTest.test.js'
import geolocationTest_geo1 from './GeocoderTest.test.js'
import geolocationTest_4 from './GetCountryCode.test.js'
import geolocationTest_6 from './GetCountryCodeM.test.js'
import geolocationTest_geo3 from './LocationTest.test.js'
import geolocationTest_geo7 from './LocationMTest.test.js'
import geolocationTest_geo2 from './SystemLocation.test.js'
export default function testsuite() {
geolocationTest_geo5()
geolocationTest_geo1()
geolocationTest_4()
geolocationTest_6()
geolocationTest_geo3()
geolocationTest_geo7()
geolocationTest_geo2()
}
location/geolocation_standard/src/main/js/default/test/SystemLocation.test.js → location/geolocation_standard/src/main/js/test/SystemLocation.test.js
浏览文件 @ 84166d74
......@@ -17,7 +17,7 @@ import geolocations from '@system.geolocation';
import abilityAccessCtrl from '@ohos.abilityAccessCtrl'
import bundle from '@ohos.bundle'
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 '@ohos/hypium'
function sleep(ms) {
return new Promise(resolve => setTimeout(resolve, ms));
......@@ -67,8 +67,9 @@ async function applyPermission() {
console.info('[permission] case apply permission failed, createAtManager failed');
}
}
export default function geolocationTest_geo2() {
describe('geolocationTest_geo2', function () {
describe('geolocationTest_geo2', function () {
beforeAll(async function (done) {
console.info('beforeAll case');
await applyPermission();
......@@ -82,6 +83,7 @@ describe('geolocationTest_geo2', function () {
afterEach(function () {
})
/**
* @tc.number SUB_HSS_LocationSystem_systemapi_0100
* @tc.name Test getLocation
......@@ -191,7 +193,9 @@ describe('geolocationTest_geo2', function () {
expect(true).assertEqual(types.length !=0);
})
})
})
}
......
location/geolocation_standard/src/main/resources/base/element/string.json
浏览文件 @ 84166d74
......@@ -7,6 +7,22 @@
{
"name": "mainability_description",
"value": "JS_Phone_Empty Feature Ability"
},
{
"name": "MainAbility_desc",
"value": "description"
},
{
"name": "MainAbility_label",
"value": "label"
},
{
"name": "TestAbility_desc",
"value": "description"
},
{
"name": "TestAbility_label",
"value": "label"
}
]
}
\ No newline at end of file
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或