From 002e475e279611ed5e50639bd72e6d8357d25b27 Mon Sep 17 00:00:00 2001 From: fjr Date: Thu, 23 Jun 2022 11:53:43 +0800 Subject: [PATCH] fixed 600fede from https://gitee.com/fwx1083616/xts_acts/pulls/3700 wangagent Signed-off-by: fjr --- .../entry/src/main/js/test/ActiveButton.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 22 +++++++++---------- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- .../entry/src/main/js/test/WantAgent.test.js | 6 ++--- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActiveButton.js b/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActiveButton.js index d17df90ba..4c4416ecb 100644 --- a/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActiveButton.js +++ b/notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActiveButton.js @@ -14,7 +14,7 @@ */ import notify from '@ohos.notification' import WantAgent from '@ohos.wantAgent' -import { OperationType, WantAgentFlags } from '@ohos.wantagent' +//import { OperationType, WantAgentFlags } from '@ohos.wantagent' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' describe('ActsAnsActionButtonTest', function () { @@ -87,7 +87,7 @@ describe('ActsAnsActionButtonTest', function () { ], operationType: WantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[WantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] }; var wantAgentData = await WantAgent.getWantAgent(agentInfoA); @@ -172,7 +172,7 @@ describe('ActsAnsActionButtonTest', function () { ], operationType: WantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[WantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] }; var wantAgentDataB = await WantAgent.getWantAgent(agentInfoB); diff --git a/notification/ans_standard/publish_test/wantagent/wantagent1/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent1/entry/src/main/js/test/WantAgent.test.js index bf3d49d39..d3f86a8e3 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent1/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent1/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -50,9 +50,9 @@ describe('ActsAnsWantAgentOneTest', function () { } }, ], - operationType: OperationType.START_ABILITY, + operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); await wantAgent.getWantAgent(agentInfo, @@ -130,9 +130,9 @@ describe('ActsAnsWantAgentOneTest', function () { } }, ], - operationType: OperationType.START_ABILITY, + operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.ONE_TIME_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.ONE_TIME_FLAG] } console.info('----getWantAgent before----'); await wantAgent.getWantAgent(agentInfo, @@ -183,9 +183,9 @@ describe('ActsAnsWantAgentOneTest', function () { } }, ], - operationType: OperationType.START_ABILITY, + operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.NO_BUILD_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.NO_BUILD_FLAG] } console.info('----getWantAgent before----'); await wantAgent.getWantAgent(agentInfo, @@ -236,9 +236,9 @@ describe('ActsAnsWantAgentOneTest', function () { } }, ], - operationType: OperationType.START_ABILITY, + operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.CANCEL_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.CANCEL_PRESENT_FLAG] } console.info('----getWantAgent before----'); await wantAgent.getWantAgent(agentInfo, @@ -289,9 +289,9 @@ describe('ActsAnsWantAgentOneTest', function () { } }, ], - operationType: OperationType.START_ABILITY, + operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.CONSTANT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.CONSTANT_FLAG] } console.info('----getWantAgent before----'); await wantAgent.getWantAgent(agentInfo, diff --git a/notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/src/main/js/test/WantAgent.test.js index e29ac3c2f..79c87079e 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -48,9 +48,9 @@ describe('ActsAnsWantAgentOneProTest', function () { } }, ], - operationType: OperationType.START_ABILITY, + operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo).then( diff --git a/notification/ans_standard/publish_test/wantagent/wantagent2/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent2/entry/src/main/js/test/WantAgent.test.js index 8018d2dff..d98dec110 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent2/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent2/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -65,9 +65,9 @@ describe('ActsAnsWantAgentTwoTest', function () { } } ], - operationType: OperationType.START_ABILITIES, + operationType: wantAgent.OperationType.START_ABILITIES, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo, diff --git a/notification/ans_standard/publish_test/wantagent/wantagent2promise/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent2promise/entry/src/main/js/test/WantAgent.test.js index 187ae8454..778cf404d 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent2promise/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent2promise/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -65,9 +65,9 @@ describe('ActsAnsWantAgentTwoProTest', function () { } } ], - operationType: OperationType.START_ABILITIES, + operationType: wantAgent.OperationType.START_ABILITIES, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo).then( diff --git a/notification/ans_standard/publish_test/wantagent/wantagent3/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent3/entry/src/main/js/test/WantAgent.test.js index 379f7386c..cc3ee3cc4 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent3/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent3/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -47,9 +47,9 @@ describe('ActsAnsWantAgentTreeTest', function () { } }, ], - operationType: OperationType.SEND_COMMON_EVENT, + operationType: wantAgent.OperationType.SEND_COMMON_EVENT, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo, diff --git a/notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/src/main/js/test/WantAgent.test.js index 6f5ac1ad1..004957a74 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -47,9 +47,9 @@ describe('ActsAnsWantAgentTreeProTest', function () { } }, ], - operationType: OperationType.SEND_COMMON_EVENT, + operationType: wantAgent.OperationType.SEND_COMMON_EVENT, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo).then( diff --git a/notification/ans_standard/publish_test/wantagent/wantagent4/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent4/entry/src/main/js/test/WantAgent.test.js index 70592d302..387a60d77 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent4/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent4/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -48,9 +48,9 @@ describe('ActsAnsWantAgentFourTest', function () { } }, ], - operationType: OperationType.UNKNOWN_TYPE, + operationType: wantAgent.OperationType.UNKNOWN_TYPE, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo, diff --git a/notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/src/main/js/test/WantAgent.test.js index 28241ea30..8bd013f9f 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -47,9 +47,9 @@ describe('ActsAnsWantAgentFourProTest', function () { } }, ], - operationType: OperationType.UNKNOWN_TYPE, + operationType: wantAgent.OperationType.UNKNOWN_TYPE, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo).then( diff --git a/notification/ans_standard/publish_test/wantagent/wantagent5/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent5/entry/src/main/js/test/WantAgent.test.js index 34c0d7152..14fdc4590 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent5/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent5/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -47,9 +47,9 @@ describe('ActsAnsWantAgentFiveTest', function () { } }, ], -// operationType: OperationType.START_ABILITY, +// operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo, diff --git a/notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/src/main/js/test/WantAgent.test.js b/notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/src/main/js/test/WantAgent.test.js index 2e8620332..8c3ea2da0 100644 --- a/notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/src/main/js/test/WantAgent.test.js +++ b/notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/src/main/js/test/WantAgent.test.js @@ -14,7 +14,7 @@ */ import wantAgent from '@ohos.wantAgent'; -import { OperationType, WantAgentFlags } from '@ohos.wantagent'; +//import { OperationType, WantAgentFlags } from '@ohos.wantagent'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'; var time = 1000 var WantAgent; @@ -47,9 +47,9 @@ describe('ActsAnsWantAgentFiveProTest', function () { } }, ], -// operationType: OperationType.START_ABILITY, +// operationType: wantAgent.OperationType.START_ABILITY, requestCode: 0, - wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG] + wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG] } console.info('----getWantAgent before----'); wantAgent.getWantAgent(agentInfo).then( -- GitLab