wantAgent和commonEvent

Signed-off-by: Nfjr <fujiarui6@huawei.com>

notification/ans_standard/publish_test/activebtn/activebutton/entry/src/main/js/test/ActiveButton.js

@@ -14,7 +14,6 @@
  */
 import notify from '@ohos.notification'
 import WantAgent 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 +86,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 +171,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);
 

notification/ans_standard/publish_test/getwantagentinfo/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent from '@ohos.wantAgent';
-import { OperationType, WantAgentFlags } from '@ohos.wantagent';
 
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index';
 
@@ -54,9 +53,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
         wantAgent.getWantAgent(agentInfoa,
             (err, data) => {
@@ -134,9 +133,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
         wantAgent.getWantAgent(agentInfod).then(
             (data) => {
@@ -197,9 +196,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
         wantAgent.getWantAgent(agentInfob,(err,data)=>{
             WantAgentb = data
@@ -226,9 +225,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
 		setTimeout(function(){
 			wantAgent.getWantAgent(agentInfoc,
@@ -304,9 +303,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
         wantAgent.getWantAgent(agentInfoe,(err,data)=>{
             console.log("=======agentInfoe======="+err.code+JSON.stringify(data))
@@ -334,9 +333,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
 		setTimeout(function(){
 			wantAgent.getWantAgent(agentInfof,
@@ -399,9 +398,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
         wantAgent.getWantAgent(agentInfoe,(err,data)=>{
             WantAgentd = data
@@ -428,9 +427,9 @@ describe('ActsAnsGetWantAgentInfoTest', function () {
                         }
                     },
             ],
-            operationType: OperationType.START_ABILITY,
+            operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[WantAgentFlags.UPDATE_PRESENT_FLAG]
+            wantAgentFlags:[wantAgent.WantAgentFlags.UPDATE_PRESENT_FLAG]
         }
 		setTimeout(function(){
 			wantAgent.getWantAgent(agentInfof,

notification/ans_standard/publish_test/publishcontentype/publishtype/entry/src/main/js/test/ExampleJsunit.test.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import notification from '@ohos.notification'
-import Subscriber from '@ohos.commonevent'
+import Subscriber from '@ohos.commonEvent'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 var time = 5000
 var multiLineDataOne

notification/ans_standard/publish_test/publishcontentype/sub/entry/src/main/js/test/Subscriber.js

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Subscriber from '@ohos.commonevent'
+import Subscriber from '@ohos.commonEvent'
 import notification from '@ohos.notification'
 import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
 var multiLineDataOne

notification/ans_standard/publish_test/wantagent/wantagent1/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +49,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 +129,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 +182,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 +235,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 +288,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,
@@ -313,12 +312,12 @@ describe('ActsAnsWantAgentOneTest', function () {
         console.info('----getWantAgent after----');
     })
 
-     /*
+    /*
      * @tc.number: ACTS_SetWant_0600
      * @tc.name: getWantAgent(OperationType.START_ABILITY)
      * @tc.desc: verify the function of getWantAgent(OperationType.START_ABILITY)[REPLACE_ELEMENT]
      */
-     it('ACTS_SetWant_0600', 0, async function (done) {
+    it('ACTS_SetWant_0600', 0, async function (done) {
         console.info('----ACTS_SetWant_0600 start----');
         var agentInfo = {
             wants: [
@@ -557,7 +556,7 @@ describe('ActsAnsWantAgentOneTest', function () {
             ],
             operationType: wantAgent.OperationType.START_ABILITY,
             requestCode: 0,
-            wantAgentFlags:[wantAgent.WantAgentFlags.REPLACE_BUNDLE]
+            wantAgentFlags:[wantAgent.WantAgentFlags.REPLACE_ENTITIES]
         }
         console.info('----getWantAgent before----');
         await wantAgent.getWantAgent(agentInfo,

notification/ans_standard/publish_test/wantagent/wantagent1promise/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +47,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(

notification/ans_standard/publish_test/wantagent/wantagent2/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +64,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,

notification/ans_standard/publish_test/wantagent/wantagent2promise/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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;
@@ -26,6 +25,7 @@ describe('ActsAnsWantAgentTwoProTest', function () {
      * @tc.desc: verify the function of getWantAgent(OperationType.START_ABILITIES)
      */
     it('ACTS_SetWant_0400', 0, async function (done) {
+        expect(3).assertEqual(wantAgent.OperationType.START_SERVICE)
         var agentInfo = {
             wants: [
                     {
@@ -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(

notification/ans_standard/publish_test/wantagent/wantagent3/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +46,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,

notification/ans_standard/publish_test/wantagent/wantagent3promise/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +46,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(

notification/ans_standard/publish_test/wantagent/wantagent4/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +47,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,

notification/ans_standard/publish_test/wantagent/wantagent4promise/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +46,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(

notification/ans_standard/publish_test/wantagent/wantagent5/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +46,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,

notification/ans_standard/publish_test/wantagent/wantagent5promise/entry/src/main/js/test/WantAgent.test.js

@@ -14,7 +14,6 @@
  */
 
 import wantAgent 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 +46,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(