未验证 提交 d4fdd1e1 编写于 作者: O openharmony_ci 提交者: Gitee

!2308 自动化测试问题修改

Merge pull request !2308 from LiAn/master
...@@ -363,7 +363,6 @@ callWithResult(method: string, data: rpc.Sequenceable): Promise<rpc.MessagePa ...@@ -363,7 +363,6 @@ callWithResult(method: string, data: rpc.Sequenceable): Promise<rpc.MessagePa
this.name = name; this.name = name;
this.str = str; this.str = str;
} }
constructor() {}
marshalling(messageParcel) { marshalling(messageParcel) {
messageParcel.writeInt(this.num); messageParcel.writeInt(this.num);
messageParcel.writeString(this.str); messageParcel.writeString(this.str);
...@@ -380,7 +379,6 @@ callWithResult(method: string, data: rpc.Sequenceable): Promise<rpc.MessagePa ...@@ -380,7 +379,6 @@ callWithResult(method: string, data: rpc.Sequenceable): Promise<rpc.MessagePa
var method = 'call_Function'; var method = 'call_Function';
var caller; var caller;
export default class MainAbility extends Ability { export default class MainAbility extends Ability {
onWindowStageCreate(windowStage) {
onWindowStageCreate(windowStage) { onWindowStageCreate(windowStage) {
this.context.startAbilityByCall({ this.context.startAbilityByCall({
bundleName: "com.example.myservice", bundleName: "com.example.myservice",
......
...@@ -40,8 +40,8 @@ let wantTemp = { ...@@ -40,8 +40,8 @@ let wantTemp = {
abilityName: "com.example.myapplication.MainAbility", abilityName: "com.example.myapplication.MainAbility",
}; };
let enterpriseInfo = { let enterpriseInfo = {
name = "enterprise name", name: "enterprise name",
description = "enterprise description" description: "enterprise description"
} }
enterpriseDeviceManager.activateAdmin(wantTemp, enterpriseInfo, enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, (error, result) => { enterpriseDeviceManager.activateAdmin(wantTemp, enterpriseInfo, enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL, (error, result) => {
if (error != null) { if (error != null) {
...@@ -86,8 +86,8 @@ let wantTemp = { ...@@ -86,8 +86,8 @@ let wantTemp = {
abilityName: "com.example.myapplication.MainAbility", abilityName: "com.example.myapplication.MainAbility",
}; };
let enterpriseInfo = { let enterpriseInfo = {
name = "enterprise name", name: "enterprise name",
description = "enterprise description" description: "enterprise description"
} }
enterpriseDeviceManager.activateAdmin(wantTemp, enterpriseInfo, enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL) enterpriseDeviceManager.activateAdmin(wantTemp, enterpriseInfo, enterpriseDeviceManager.AdminType.ADMIN_TYPE_NORMAL)
.then((result) => { .then((result) => {
...@@ -461,8 +461,8 @@ let wantTemp = { ...@@ -461,8 +461,8 @@ let wantTemp = {
abilityName: "com.example.myapplication.MainAbility", abilityName: "com.example.myapplication.MainAbility",
}; };
let enterpriseInfo = { let enterpriseInfo = {
name = "enterprise name", name: "enterprise name",
description = "enterprise description" description: "enterprise description"
} }
enterpriseDeviceManager.setEnterpriseInfo(wantTemp, enterpriseInfo) enterpriseDeviceManager.setEnterpriseInfo(wantTemp, enterpriseInfo)
.then((result) => { .then((result) => {
...@@ -503,8 +503,8 @@ let wantTemp = { ...@@ -503,8 +503,8 @@ let wantTemp = {
abilityName: "com.example.myapplication.MainAbility", abilityName: "com.example.myapplication.MainAbility",
}; };
let enterpriseInfo = { let enterpriseInfo = {
name = "enterprise name", name: "enterprise name",
description = "enterprise description" description: "enterprise description"
} }
enterpriseDeviceManager.setEnterpriseInfo(wantTemp, enterpriseInfo) enterpriseDeviceManager.setEnterpriseInfo(wantTemp, enterpriseInfo)
.then((result) => { .then((result) => {
......
...@@ -133,7 +133,7 @@ emit(event: string, ...args: Object[]): void; ...@@ -133,7 +133,7 @@ emit(event: string, ...args: Object[]): void;
// func1 is called,1,2 // func1 is called,1,2
this.context.eventHub.emit("123", 1, 2); this.context.eventHub.emit("123", 1, 2);
} }
func1(a: string, b: string) { func1(a, b) {
console.log("func1 is called," + a + "," + b); console.log("func1 is called," + a + "," + b);
} }
} }
......
...@@ -160,7 +160,7 @@ has(key: T): boolean ...@@ -160,7 +160,7 @@ has(key: T): boolean
let lightWeightSet = new LightWeightSet(); let lightWeightSet = new LightWeightSet();
let result = lightWeightSet.has(123); let result = lightWeightSet.has(123);
lightWeightSet.add(123); lightWeightSet.add(123);
let result = lightWeightSet.has(123); result = lightWeightSet.has(123);
``` ```
...@@ -188,7 +188,7 @@ equal(obj: Object): boolean ...@@ -188,7 +188,7 @@ equal(obj: Object): boolean
let lightWeightSet = new LightWeightSet(); let lightWeightSet = new LightWeightSet();
lightWeightSet.add("Ahfbrgrbgnutfodgorrogorgrogofdfdf"); lightWeightSet.add("Ahfbrgrbgnutfodgorrogorgrogofdfdf");
lightWeightSet.add("sdfs"); lightWeightSet.add("sdfs");
let obj = {"Ahfbrgrbgnutfodgorrogorgrogofdfdf", "sdfs"}; let obj = ["Ahfbrgrbgnutfodgorrogorgrogofdfdf", "sdfs"];
let result = lightWeightSet.equal(obj); let result = lightWeightSet.equal(obj);
``` ```
......
...@@ -110,7 +110,7 @@ function unregisterMissionListener(listenerId: number): Promise<void>; ...@@ -110,7 +110,7 @@ function unregisterMissionListener(listenerId: number): Promise<void>;
console.log("registerMissionListener") console.log("registerMissionListener")
var listenerid = missionManager.registerMissionListener(listener); var listenerid = missionManager.registerMissionListener(listener);
await missionManager.unregisterMissionListener(listenerid).catch(function (err){ missionManager.unregisterMissionListener(listenerid).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -145,7 +145,7 @@ function getMissionInfo(deviceId: string, missionId: number, callback: AsyncCall ...@@ -145,7 +145,7 @@ function getMissionInfo(deviceId: string, missionId: number, callback: AsyncCall
console.log("mission.timestamp = " + mission.timestamp); console.log("mission.timestamp = " + mission.timestamp);
console.log("mission.label = " + mission.label); console.log("mission.label = " + mission.label);
console.log("mission.iconPath = " + mission.iconPath); console.log("mission.iconPath = " + mission.iconPath);
} });
``` ```
...@@ -175,7 +175,7 @@ function getMissionInfo(deviceId: string, missionId: number): Promise<Mission ...@@ -175,7 +175,7 @@ function getMissionInfo(deviceId: string, missionId: number): Promise<Mission
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var mission = await missionManager.getMissionInfo("", id).catch(function (err){ var mission = missionManager.getMissionInfo("", id).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -236,7 +236,7 @@ function getMissionInfos(deviceId: string, numMax: number): Promise<Array< ...@@ -236,7 +236,7 @@ function getMissionInfos(deviceId: string, numMax: number): Promise<Array<
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var allMissions = await missionManager.getMissionInfos("", 10).catch(function (err){ var allMissions = missionManager.getMissionInfos("", 10).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -303,13 +303,13 @@ function getMissionSnapShot(deviceId: string, missionId: number): Promise<Mis ...@@ -303,13 +303,13 @@ function getMissionSnapShot(deviceId: string, missionId: number): Promise<Mis
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var allMissions = await missionManager.getMissionInfos("", 10).catch(function (err){ var allMissions = missionManager.getMissionInfos("", 10).catch(function (err){
console.log(err); console.log(err);
}); });
console.log("size = " + allMissions.length); console.log("size = " + allMissions.length);
console.log("missions = " + JSON.stringify(allMissions)); console.log("missions = " + JSON.stringify(allMissions));
var id = allMissions[0].missionId; var id = allMissions[0].missionId;
var snapshot = await missionManager.getMissionSnapShot("", id).catch(function (err){ var snapshot = missionManager.getMissionSnapShot("", id).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -367,14 +367,14 @@ function lockMission(missionId: number): Promise<void>; ...@@ -367,14 +367,14 @@ function lockMission(missionId: number): Promise<void>;
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var allMissions = await missionManager.getMissionInfos("", 10).catch(function (err){ var allMissions = missionManager.getMissionInfos("", 10).catch(function (err){
console.log(err); console.log(err);
}); });
console.log("size = " + allMissions.length); console.log("size = " + allMissions.length);
console.log("missions = " + JSON.stringify(allMissions)); console.log("missions = " + JSON.stringify(allMissions));
var id = allMissions[0].missionId; var id = allMissions[0].missionId;
await missionManager.lockMission(id).catch(function (err){ missionManager.lockMission(id).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -431,17 +431,17 @@ function unlockMission(missionId: number): Promise<void>; ...@@ -431,17 +431,17 @@ function unlockMission(missionId: number): Promise<void>;
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var allMissions = await missionManager.getMissionInfos("", 10).catch(function (err){ var allMissions = missionManager.getMissionInfos("", 10).catch(function (err){
console.log(err); console.log(err);
}); });
console.log("size = " + allMissions.length); console.log("size = " + allMissions.length);
console.log("missions = " + JSON.stringify(allMissions)); console.log("missions = " + JSON.stringify(allMissions));
var id = allMissions[0].missionId; var id = allMissions[0].missionId;
await missionManager.lockMission(id).catch(function (err){ missionManager.lockMission(id).catch(function (err){
console.log(err); console.log(err);
}); });
await missionManager.unlockMission(id).catch(function (err){ missionManager.unlockMission(id).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -499,14 +499,14 @@ function clearMission(missionId: number): Promise<void>; ...@@ -499,14 +499,14 @@ function clearMission(missionId: number): Promise<void>;
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var allMissions = await missionManager.getMissionInfos("", 10).catch(function (err){ var allMissions = missionManager.getMissionInfos("", 10).catch(function (err){
console.log(err); console.log(err);
}); });
console.log("size = " + allMissions.length); console.log("size = " + allMissions.length);
console.log("missions = " + JSON.stringify(allMissions)); console.log("missions = " + JSON.stringify(allMissions));
var id = allMissions[0].missionId; var id = allMissions[0].missionId;
await missionManager.clearMission(id).catch(function (err){ missionManager.clearMission(id).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -543,7 +543,7 @@ function clearAllMissions(): Promise<void>; ...@@ -543,7 +543,7 @@ function clearAllMissions(): Promise<void>;
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
await missionManager.clearAllMissions().catch(function (err){ missionManager.clearAllMissions().catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -636,14 +636,14 @@ function moveMissionToFront(missionId: number, options?: StartOptions): Promise& ...@@ -636,14 +636,14 @@ function moveMissionToFront(missionId: number, options?: StartOptions): Promise&
```js ```js
import missionManager from '@ohos.application.missionManager' import missionManager from '@ohos.application.missionManager'
var allMissions = await missionManager.getMissionInfos("", 10).catch(function (err){ var allMissions = missionManager.getMissionInfos("", 10).catch(function (err){
console.log(err); console.log(err);
}); });
console.log("size = " + allMissions.length); console.log("size = " + allMissions.length);
console.log("missions = " + JSON.stringify(allMissions)); console.log("missions = " + JSON.stringify(allMissions));
var id = allMissions[0].missionId; var id = allMissions[0].missionId;
await missionManager.moveMissionToFront(id).catch(function (err){ missionManager.moveMissionToFront(id).catch(function (err){
console.log(err); console.log(err);
}); });
``` ```
...@@ -34,24 +34,23 @@ export default { ...@@ -34,24 +34,23 @@ export default {
```js ```js
// API version 8 // API version 8
import userIAM_userAuth from '@ohos.userIAM.userAuth'; import userIAM_userAuth from '@ohos.userIAM.userAuth';
let auth = new userIAM_userAuth.UserAuth();
export default { export default {
let auth = new userIAM_userAuth.UserAuth();
getVersion() { getVersion() {
console.info("start get version"); console.info("start get version");
let version = auth.getVersion(); let version = this.auth.getVersion();
console.info("auth version = " + version); console.info("auth version = " + version);
}, },
startAuth() { startAuth() {
console.info("start auth"); console.info("start auth");
auth.auth(null, userIAM_userAuth.UserAuthType.FACE, userIAM_userAuth.AuthTrustLevel.ATL1, { this.auth.auth(null, userIAM_userAuth.UserAuthType.FACE, userIAM_userAuth.AuthTrustLevel.ATL1, {
onResult: (result, extraInfo) => { onResult: (result, extraInfo) => {
try { try {
console.info("auth onResult result = " + result); console.info("auth onResult result = " + result);
console.info("auth onResult extraInfo = " + JSON.stringify(extraInfo)); console.info("auth onResult extraInfo = " + JSON.stringify(extraInfo));
if (result == SUCCESS) { if (result == 'SUCCESS') {
// 此处添加认证成功逻辑 // 此处添加认证成功逻辑
} else { } else {
// 此处添加认证失败逻辑 // 此处添加认证失败逻辑
...@@ -75,7 +74,7 @@ export default { ...@@ -75,7 +74,7 @@ export default {
checkAuthSupport() { checkAuthSupport() {
console.info("start check auth support"); console.info("start check auth support");
let checkCode = auth.getAvailableStatus(userIAM_userAuth.UserAuthType.FACE, userIAM_userAuth.AuthTrustLevel.ATL1); let checkCode = this.auth.getAvailableStatus(userIAM_userAuth.UserAuthType.FACE, userIAM_userAuth.AuthTrustLevel.ATL1);
if (checkCode == userIAM_userAuth.ResultCode.SUCCESS) { if (checkCode == userIAM_userAuth.ResultCode.SUCCESS) {
console.info("check auth support success"); console.info("check auth support success");
// 此处添加支持指定类型认证的逻辑 // 此处添加支持指定类型认证的逻辑
...@@ -91,13 +90,13 @@ export default { ...@@ -91,13 +90,13 @@ export default {
let contextId = auth.auth(null, userIAM_userAuth.UserAuthType.FACE, userIAM_userAuth.AuthTrustLevel.ATL1, { let contextId = auth.auth(null, userIAM_userAuth.UserAuthType.FACE, userIAM_userAuth.AuthTrustLevel.ATL1, {
onResult: (result, extraInfo) => { onResult: (result, extraInfo) => {
console.info("auth onResult result = " + result); console.info("auth onResult result = " + result);
} },
onAcquireInfo: (module, acquire, extraInfo) => { onAcquireInfo: (module, acquire, extraInfo) => {
console.info("auth onAcquireInfo module = " + module); console.info("auth onAcquireInfo module = " + module);
} }
}); });
let cancelCode = auth.cancel(contextId); let cancelCode = this.auth.cancel(contextId);
if (cancelCode == userIAM_userAuth.Result.SUCCESS) { if (cancelCode == userIAM_userAuth.Result.SUCCESS) {
console.info("cancel auth success"); console.info("cancel auth success");
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册