diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/test/ActsSubscriber_test_ordered.js b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/test/ActsSubscriber_test_ordered.js index 02a6e73c8ea2cfcca81cb7400bae5916019873d5..1fce0653349dab894808192e3aa8680f7dc3f8a9 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/test/ActsSubscriber_test_ordered.js +++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/test/ActsSubscriber_test_ordered.js @@ -18,6 +18,7 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' describe('ActsSubscriberTestOrder', function () { console.info("===========ActsSubscriberTestOrder start====================>"); var num = 0, num2 = 0; + var order = false; var commonEventSubscriber0100; var commonEventSubscriber0101; var commonEventSubscriber0200_1; @@ -26,6 +27,8 @@ describe('ActsSubscriberTestOrder', function () { var commonEventSubscriber0300_2; var commonEventSubscriber0400_1; var commonEventSubscriber0400_2; + var commonEventSubscriber0500_1; + var commonEventSubscriber0500_2; async function unsubscriber2_() { @@ -74,7 +77,7 @@ describe('ActsSubscriberTestOrder', function () { console.info("===============>subscriberCallBack0100 getAbortCommonEventCallback2 promise abort: " + data); }) - await commonEventSubscriber0100.finishCommonEvent().then(()=>{ + commonEventSubscriber0100.finishCommonEvent().then(()=>{ console.info("===============>subscriberCallBack0100 finishCommonEvent promise"); }) } @@ -148,11 +151,17 @@ describe('ActsSubscriberTestOrder', function () { console.info("===============>subscriberCallBack0300_1========bundleName: " + data.bundleName); console.info("===============>subscriberCallBack0300_1=========code: " + data.code); console.info("===============>subscriberCallBack0300_1=========dat: " + data.data); + console.info("===============>subscriberCallBack0300_1=========order: " + order); expect(data.event).assertEqual("publish_event0301"); expect(data.code).assertEqual(1); expect(data.data).assertEqual("publish_event0301_init"); expect(data.bundleName).assertEqual("publish_event0301_bundleName"); + expect(order).assertEqual(1); + + if (order == true) { + order = false; + } await commonEventSubscriber0300_1.isOrderedCommonEvent().then((data)=>{ console.info("========>subscriberCallBack0300_1 publish_event0301 isOrderedCommonEvent promise " + data); expect(data).assertEqual(1); @@ -167,11 +176,17 @@ describe('ActsSubscriberTestOrder', function () { console.info("===============>subscriberCallBack0300_2========bundleName: " + data.bundleName); console.info("===============>subscriberCallBack0300_2=========code: " + data.code); console.info("===============>subscriberCallBack0300_2=========data: " + data.data); + console.info("===============>subscriberCallBack0300_2=========order: " + order); expect(data.event).assertEqual("publish_event0301"); expect(data.code).assertEqual(1); expect(data.data).assertEqual("publish_event0301_init"); expect(data.bundleName).assertEqual("publish_event0301_bundleName"); + + if (order == false) { + order = true; + } + await commonEventSubscriber0300_2.isOrderedCommonEvent().then((data)=>{ console.info("===============>subscriberCallBack0300_2 isOrderedCommonEvent promise " + data); expect(data).assertEqual(1); @@ -209,6 +224,31 @@ describe('ActsSubscriberTestOrder', function () { expect().assertFail(); } + async function subscriberCallBack0500_1(err, data) { + console.info("===============>SubscriberPromise0500_1========event: " + data.event); + console.info("===============>SubscriberPromise0500_1========bundleName: " + data.bundleName); + console.info("===============>SubscriberPromise0500_1=========code: " + data.code); + console.info("===============>SubscriberPromise0500_1=========data: " + data.data); + expect(data.event).assertEqual("publish_event0500"); + expect(data.code).assertEqual(10); + expect(data.data).assertEqual("publish_event0500_init"); + expect(data.bundleName).assertEqual("publish_event0500_bundleName"); + commonEventSubscriber0500_1.finishCommonEvent().then(() => { + console.info("===============>SubscriberPromise0500_1==========>finishCommonEventPromise0500_1"); + }); + } + + async function subscriberCallBack0500_2(err, data) { + console.info("===============>SubscriberPromise0500_2========event: " + data.event); + console.info("===============>SubscriberPromise0500_2========bundleName: " + data.bundleName); + console.info("===============>SubscriberPromise0500_2=========code: " + data.code); + console.info("===============>SubscriberPromise0500_2========data: " + data.data); + expect(data.event).assertEqual("publish_event0500"); + expect(data.code).assertEqual(10); + expect(data.data).assertEqual("publish_event0500_init"); + expect(data.bundleName).assertEqual("publish_event0500_bundleName"); + } + async function GetSubscribeInfoCallBack(data) { console.info("===============>GetSubscribeInfoCallBack event = " + data.events[0]); switch (data.events[0]) { @@ -279,43 +319,46 @@ describe('ActsSubscriberTestOrder', function () { priority: 9 }; - await Subscriber.createSubscriber( + var commonEventPublishData = { + bundleName: "publish_event0100_bundleName", + code: 1, + data: "publish_event1001_init", + isOrdered: true, + isSticky: false, + } + + Subscriber.createSubscriber( commonEventSubscribeInfo_1 - ).then(async (data)=>{ + ).then(function (data) { console.info("===============ActsSubscriberTestOrder_0100==========createSubscriber promise1"); commonEventSubscriber0100 = data; - await commonEventSubscriber0100.getSubscribeInfo().then(async (data)=>{ + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestOrder_0100=========getSubscribeInfo promise1"); - await GetSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber0100, subscriberCallBack0100); }); }) - await Subscriber.createSubscriber( + Subscriber.createSubscriber( commonEventSubscribeInfo_2 - ).then(async (data)=>{ + ).then(function (data) { console.info("===============ActsSubscriberTestOrder_0100==========createSubscriber promise2"); commonEventSubscriber0101 = data; - await commonEventSubscriber0100.getSubscribeInfo().then(async (data)=>{ + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestOrder_0100=========getSubscribeInfo promise2"); - await GetSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber0101, subscriberCallBack0101); + Subscriber.publish("publish_event0100", commonEventPublishData, publishCallback); }); }) - var commonEventPublishData = { - bundleName: "publish_event0100_bundleName", - code: 1, - data: "publish_event1001_init", - isOrdered: true, - isSticky: false, - } - - Subscriber.publish("publish_event0100", commonEventPublishData, publishCallback); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestOrder_0100 end=================="); + done(); + }, 30000); }) /* * @tc.number : ActsSubscriberTestOrder_0200 - * @tc.name : verify subscribe and publish : Check subscribe different event + * @tc.name : verify subscribe and publish : Check subscribe different event * and twice publish common ordered event and check unsubscribe event * @tc.desc : Check the subscriber can receive event "publish_event0200" type of the interface (by Promise) */ @@ -333,28 +376,6 @@ describe('ActsSubscriberTestOrder', function () { priority: 9 }; - await Subscriber.createSubscriber( - commonEventSubscribeInfo_1, - ).then(async (data)=>{ - console.info("===============ActsSubscriberTestOrder_0200==========createSubscriber promise1"); - commonEventSubscriber0200_1 = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestOrder_0200=========getSubscribeInfo promise1"); - await getSubscribeInfoCallBack0200_1(data); - }); - }) - - await Subscriber.createSubscriber( - commonEventSubscribeInfo_2, - ).then(async (data)=>{ - console.info("===============ActsSubscriberTestOrder_0200==========createSubscriber promise2"); - commonEventSubscriber0200_2 = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestOrder_0200=========getSubscribeInfo promise2"); - await getSubscribeInfoCallBack0200_2(data); - }); - }) - var commonEventPublishData1 = { bundleName: "publish_event0200_bundleName", code: 1, @@ -371,16 +392,41 @@ describe('ActsSubscriberTestOrder', function () { isSticky: false, } - await unsubscriber2_(); + Subscriber.createSubscriber( + commonEventSubscribeInfo_1, + ).then(function (data) { + console.info("===============ActsSubscriberTestOrder_0200==========createSubscriber promise1"); + commonEventSubscriber0200_1 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestOrder_0200=========getSubscribeInfo promise1"); + Subscriber.subscribe(commonEventSubscriber0200_1, subscriberCallBack0200_1); + }); + }) + + Subscriber.createSubscriber( + commonEventSubscribeInfo_2, + ).then(function (data) { + console.info("===============ActsSubscriberTestOrder_0200==========createSubscriber promise2"); + commonEventSubscriber0200_2 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestOrder_0200=========getSubscribeInfo promise2"); + Subscriber.subscribe(commonEventSubscriber0200_2, subscriberCallBack0200_2); + Subscriber.unsubscribe(commonEventSubscriber0200_1,unsubscribeCallback); + Subscriber.publish("publish_event0200", commonEventPublishData1, publishCallback); + Subscriber.publish("publish_event0201", commonEventPublishData2, publishCallback); + + }); + }) - Subscriber.publish("publish_event0200", commonEventPublishData1, publishCallback); - Subscriber.publish("publish_event0201", commonEventPublishData2, publishCallback); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestOrder_0200 end=================="); + done(); + }, 30000); }) /* * @tc.number : ActsSubscriberTestOrder_0300 - * @tc.name : verify subscribe and publish : Check subscribe different events + * @tc.name : verify subscribe and publish : Check subscribe different events * and some publish common ordered events * @tc.desc : Check the subscriber can receive event "publish_event0301" type of the interface (by Promise) */ @@ -397,46 +443,49 @@ describe('ActsSubscriberTestOrder', function () { priority: 10 }; - await Subscriber.createSubscriber( + var commonEventPublishData2 = { + bundleName: "publish_event0301_bundleName", + code: 1, + data: "publish_event0301_init", + isOrdered: true, + isSticky: false, + } + + Subscriber.createSubscriber( commonEventSubscribeInfo_1, - ).then(async (data)=>{ + ).then(function (data) { console.info("===============ActsSubscriberTestOrder_0300==========createSubscriber promise1"); commonEventSubscriber0300_1 = data; - await data.getSubscribeInfo().then(async (data)=>{ + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestOrder_0300=========getSubscribeInfo promise1"); - await getSubscribeInfoCallBack0300_1(data); + Subscriber.subscribe(commonEventSubscriber0300_1, subscriberCallBack0300_1); }); }) - await Subscriber.createSubscriber( + Subscriber.createSubscriber( commonEventSubscribeInfo_2, - ).then(async (data)=>{ + ).then(function (data) { console.info("===============ActsSubscriberTestOrder_0300==========createSubscriber promise2"); commonEventSubscriber0300_2 = data; - await data.getSubscribeInfo().then(async (data)=>{ + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestOrder_0300=========getSubscribeInfo promise2"); - await getSubscribeInfoCallBack0300_2(data); + Subscriber.subscribe(commonEventSubscriber0300_2, subscriberCallBack0300_2); + var numindex = 0; + for (; numindex < 3; ++numindex) { + Subscriber.publish("publish_event0301", commonEventPublishData2, publishCallback); + } }); }) - var commonEventPublishData2 = { - bundleName: "publish_event0301_bundleName", - code: 1, - data: "publish_event0301_init", - isOrdered: true, - isSticky: false, - } - var numindex = 0; - for (; numindex < 3; ++numindex) { - Subscriber.publish("publish_event0301", commonEventPublishData2, publishCallback); - } - done(); - + setTimeout(function (){ + console.debug("===================ActsSubscriberTestOrder_0300 end=================="); + done(); + }, 30000); }) /* * @tc.number : ActsSubscriberTestOrder_0400 - * @tc.name : verify subscribe and publish : Check subscribe same events + * @tc.name : verify subscribe and publish : Check subscribe same events * and publish common ordered events and check abort event * @tc.desc : Check the subscriber can receive event "publish_event0400" type of the interface (by promise) */ @@ -453,38 +502,100 @@ describe('ActsSubscriberTestOrder', function () { priority: 9 }; - await Subscriber.createSubscriber( + var commonEventPublishData = { + bundleName: "publish_event0400_bundleName", + code: 1, + data: "publish_event0400_init", + isOrdered: true, + isSticky: false, + } + + Subscriber.createSubscriber( commonEventSubscribeInfo_1 - ).then(async (data) => { + ).then(function (data) { console.info("===============createSubscriberPromise0400_1:1"); commonEventSubscriber0400_1 = data; - await data.getSubscribeInfo().then(async (data)=>{ + data.getSubscribeInfo().then(function (data) { console.info("=============GetSubscribeInfoPromisek0400_1 data.events[0]: " + data.events[0]); expect(data.events[0]).assertEqual("publish_event0400"); - await Subscriber.subscribe(commonEventSubscriber0400_1, subscriberCallBack0400_1); + Subscriber.subscribe(commonEventSubscriber0400_1, subscriberCallBack0400_1); }) }) - await Subscriber.createSubscriber( + Subscriber.createSubscriber( commonEventSubscribeInfo_2 - ).then(async (data) => { + ).then(function (data) { console.info("==================createSubscriberPromise0400_1:2"); commonEventSubscriber0400_2 = data; - await data.getSubscribeInfo().then(async (data)=>{ + data.getSubscribeInfo().then(function (data) { console.info("==============GetSubscribeInfoPromisek0400_1 data.events[0] : " + data.events[0]); expect(data.events[0]).assertEqual("publish_event0400"); - await Subscriber.subscribe(commonEventSubscriber0400_2, subscriberCallBack0400_2); + Subscriber.subscribe(commonEventSubscriber0400_2, subscriberCallBack0400_2); + Subscriber.publish("publish_event0400", commonEventPublishData, publishCallback); }) }) + setTimeout(function (){ + console.debug("===================ActsSubscriberTestOrder_0400 end=================="); + done(); + }, 30000); + }) + + /* + * @tc.number : ActsSubscriberTestOrder_0500 + * @tc.name : verify subscribe and publish : Check subscriber same events + * and publish common ordered events and check subscriberInfo priority + * @tc.desc : Check the subscriber can receive event "publish_event0500" type of the interface (by promise) + */ + it ('ActsSubscriberTestOrder_0500', 0, async function (done) { + console.info("===============ActsSubscriberTestOrder_0500===============>"); + + var commonEventSubscribeInfo_1 = { + events: ["publish_event0500"], + priority: 1001 + }; + + var commonEventSubscribeInfo_2 = { + events: ["publish_event0500"], + priority: -101 + }; + var commonEventPublishData = { - bundleName: "publish_event0400_bundleName", - code: 1, - data: "publish_event0400_init", + bundleName: "publish_event0500_bundleName", + code: 10, + data: "publish_event0500_init", isOrdered: true, isSticky: false, } - Subscriber.publish("publish_event0400", commonEventPublishData, publishCallback); - done(); + + Subscriber.createSubscriber( + commonEventSubscribeInfo_1 + ).then(function (data) { + console.info("===============createSubscriberPromise0500_1:1"); + commonEventSubscriber0500_1 = data; + data.getSubscribeInfo().then(function (data) { + console.info("=============GetSubscribeInfoPromisek0500_1:1 data.events[0]: " + data.events[0]); + expect(data.events[0]).assertEqual("publish_event0500"); + Subscriber.subscribe(commonEventSubscriber0500_1, subscriberCallBack0500_1); + }) + }) + + Subscriber.createSubscriber( + commonEventSubscribeInfo_2 + ).then(function (data) { + console.info("==================createSubscriberPromise0500_1:2"); + commonEventSubscriber0500_2 = data; + data.getSubscribeInfo().then(function (data) { + console.info("==============GetSubscribeInfoPromisek0500_1:2 data.events[0] : " + data.events[0]); + expect(data.events[0]).assertEqual("publish_event0500"); + Subscriber.subscribe(commonEventSubscriber0500_2, subscriberCallBack0500_2); + Subscriber.publish("publish_event0500", commonEventPublishData, publishCallback); + }) + }) + + setTimeout(function (){ + console.debug("===================ActsSubscriberTestOrder_0500 end=================="); + done(); + }, 30000); }) }) diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/config.json b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/config.json index 23c1aa527feb1c11174668e74238133462455c66..73d0760ad94232e58b9cee418d34a000a68b5380 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/config.json +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/config.json @@ -30,11 +30,6 @@ "grantMode": "system_grant", "name": "publish_event0800_permission" }, - { - "availableScope": [], - "grantMode": "system_grant", - "name": "publish_event0900_subscriberPermissions" - }, { "availableScope": [], "grantMode": "system_grant", @@ -48,7 +43,7 @@ { "availableScope": [], "grantMode": "system_grant", - "name": "permission.COMMONEVENT_STICKY" + "name": "ohos.permission.COMMONEVENT_STICKY" } ], "reqPermissions": [ @@ -56,10 +51,6 @@ "name": "publish_event0800_permission", "reason": "ceshi" }, - { - "name": "publish_event0900_subscriberPermissions", - "reason": "ceshi" - }, { "name": "publish_event0900_publisherPermission", "reason": "ceshi" @@ -69,7 +60,7 @@ "reason": "ceshi" }, { - "name": "permission.COMMONEVENT_STICKY", + "name": "ohos.permission.COMMONEVENT_STICKY", "reason": "ceshi" } ], @@ -107,4 +98,4 @@ } ] } -} \ No newline at end of file +} diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/test/ActsSubscriber_test_unorder.js b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/test/ActsSubscriber_test_unorder.js index c2bde0519d03d12ea6dbf7e347b7593f8aad203a..896e60e3b1e20239014162b3acca4d338807dba1 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/test/ActsSubscriber_test_unorder.js +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/test/ActsSubscriber_test_unorder.js @@ -15,55 +15,21 @@ import Subscriber from '@ohos.commonevent' import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -describe('ActsSubscriberTestUnorder', function () { +describe('ActsSubscriberTestUnorder', async function (done) { console.info("===========ActsSubscriberTestUnorder start====================>"); - var num = 0; - var commonEventSubscriber; var commonEventSubscriber001; var commonEventSubscriber002; var commonEventSubscriber003; var commonEventSubscriber004; var commonEventSubscriber005; - var commonEventSubscriber006; + var commonEventSubscriber006_1; + var commonEventSubscriber006_2; var commonEventSubscriber007; var commonEventSubscriber008; var commonEventSubscriber009; var commonEventSubscriber010; - var commonEventSubscriber011; - var commonEventSubscriber_1; - var commonEventSubscriber_2; - var commonEventSubscribeInfo; - var commonEventPublishData_1; - var commonEventPublishData_2; - - async function unsubscriber_() - { - await Subscriber.unsubscribe(commonEventSubscriber_1, unsubscriberCallBack); - } - - //isOrderedCommonEventCallback004 - function isOrderedCommonEventCallback004(err, data) { - console.info("==========================>isOrderedCommonEventCallback004"); - expect(data).assertEqual(false); - } - - //isStickyCommonEventCallback005 - function isStickyCommonEventCallback005(err, data) { - console.info("==========================>isStickyCommonEventCallback005 isSticky:"+ data); - expect(data).assertEqual(true); - } - - //isOrderedCommonEventCallback009 - function isOrderedCommonEventCallback009(err, data) { - console.info("==========================>isOrderedCommonEventCallback009"); - expect(data).assertEqual(false); - } - - //isStickyCommonEventCallback010 - function isStickyCommonEventCallback010(err, data) { - console.info("==========================>isStickyCommonEventCallback010"); - expect(data).assertEqual(true); - } + var commonEventSubscriber011_1; + var commonEventSubscriber011_2; function publishCallback(err) { console.info("==========================>publishCallback"); @@ -81,193 +47,6 @@ describe('ActsSubscriberTestUnorder', function () { console.info("==========================>unsubscriberCallBack"); } - function subscriberCallBack001(err, data) { - console.info("==========================>subscriberCallBack001"); - expect(data.event).assertEqual("publish_event0100"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - } - - function subscriberCallBack002(err, data) { - console.info("==========================>subscriberCallBack002"); - expect(data.event).assertEqual("@#￥#3243adsafdf_"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - } - - function subscriberCallBack003(err, data) { - console.info("==========================>subscriberCallBack003"); - expect(data.event).assertEqual(Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - } - - function subscriberCallBack004(err, data) { - console.info("==========================>subscriberCallBack004"); - expect(data.event).assertEqual("publish_event0400"); - expect(data.bundleName).assertEqual("PublishBundleName0400"); - expect(data.code).assertEqual(55); - expect(data.data).assertEqual("PublishData0400"); - commonEventSubscriber004.isOrderedCommonEvent(isOrderedCommonEventCallback004); - } - - function subscriberCallBack005(err, data) { - console.info("==========================>subscriberCallBack0500"); - expect(data.event).assertEqual("publish_event0500"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - commonEventSubscriber005.isStickyCommonEvent(isStickyCommonEventCallback005); - } - - function subscriberCallBack006(err, data) { - console.info("==========================>subscriberCallBack0600"); - expect(data.event).assertEqual("publish_event0600"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - } - - function subscriberCallBack007(err, data) { - console.info("==========================>subscriberCallBack0700"); - expect(data.event).assertEqual("publish_event0700"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - } - - function subscriberCallBack008(err, data) { - console.info("==========================>subscriberCallBack0800"); - expect(data.event).assertEqual("publish_event0800"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - } - - function subscriberCallBack009(err, data) { - console.info("==========================>subscriberCallBack0900"); - expect(data.event).assertEqual("publish_event0900"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - commonEventSubscriber009.isOrderedCommonEvent(isOrderedCommonEventCallback009); - } - - function subscriberCallBack010(err, data) { - console.info("==========================>subscriberCallBack1000"); - expect(data.event).assertEqual("publish_event1000"); - expect(data.bundleName).assertEqual(""); - expect(data.code).assertEqual(0); - expect(data.data).assertEqual(""); - commonEventSubscriber010.isStickyCommonEvent(isStickyCommonEventCallback010); - } - - async function subscriberCallBack011_1(err, data) { - console.info("==========================>subscriberCallBack011_1"); - console.info("==========================>subscriberCallBack011_1 event:"+data.event); - console.info("==========================>subscriberCallBack011_1 bundleName:"+data.bundleName); - expect(data.event).assertEqual("publish_event1100_1"); - expect(data.bundleName).assertEqual("publish_event1100_bundleName1"); - expect(data.code).assertEqual(3); - expect(data.data).assertEqual("publish_event1100_data"); - await commonEventSubscriber011.FinishCommonEvent(); - } - - function subscriberCallBack011_2(err, data) { - console.info("==========================>subscriberCallBack011_2"); - console.info("==========================>subscriberCallBack011_2 event:"+data.event); - console.info("==========================>subscriberCallBack011_2 bundleName:"+data.bundleName); - expect(data.event).assertEqual("publish_event1100_2"); - expect(data.bundleName).assertEqual("publish_event1100_bundleName2"); - expect(data.code).assertEqual(5); - expect(data.data).assertEqual("publish_event1100_data"); - } - - async function getSubscribeInfoCallBack(data) { - console.info("==========================>getSubscribeInfoCallBack event = " + data.events[0]); - switch (data.events[0]) { - case "publish_event0100": - expect(data.events[0]).assertEqual("publish_event0100"); - commonEventSubscriber001 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber001, subscriberCallBack001); - break; - case "@#￥#3243adsafdf_": - expect(data.events[0]).assertEqual("@#￥#3243adsafdf_"); - commonEventSubscriber002 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber002, subscriberCallBack002); - break; - case Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED: - expect(data.events[0]).assertEqual("usual.event.BATTERY_CHANGED"); - commonEventSubscriber003 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber003, subscriberCallBack003); - break; - case "publish_event0400": - expect(data.events[0]).assertEqual("publish_event0400"); - expect(data.publisherDeviceId).assertEqual("PublishDeviceId0400"); - expect(data.priority).assertEqual(10); - commonEventSubscriber004 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber004, subscriberCallBack004); - break; - case "publish_event0500": - expect(data.events[0]).assertEqual("publish_event0500"); - commonEventSubscriber005 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber005, subscriberCallBack005); - break; - case "publish_event0600": - console.info("=====ActsSubscriberTestUnorder_0600====getSubscribeInfoCallBack"); - expect(data.events[0]).assertEqual("publish_event0600"); - if (num == 0) { - console.info("======test_0600====getSubscribeInfoCallBack=====num : " + num); - commonEventSubscriber_1 = commonEventSubscriber; - commonEventSubscriber006 = commonEventSubscriber_1; - } else { - console.info("======test_0600====getSubscribeInfoCallBack=====num : " + num); - commonEventSubscriber_2 = commonEventSubscriber; - commonEventSubscriber006 = commonEventSubscriber_2; - } - num ++; - console.info("======test_0600====getSubscribeInfoCallBack=====begin call subscribe num : "+ num); - await Subscriber.subscribe(commonEventSubscriber006, subscriberCallBack006); - console.info("======test_0600====getSubscribeInfoCallBack=====after call subscribe"); - break; - case "publish_event0700": - expect(data.events[0]).assertEqual("publish_event0700"); - commonEventSubscriber007 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber007, subscriberCallBack007); - break; - case "publish_event0800": - expect(data.events[0]).assertEqual("publish_event0800"); - commonEventSubscriber008 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber008, subscriberCallBack008); - break; - case "publish_event0900": - expect(data.events[0]).assertEqual("publish_event0900"); - commonEventSubscriber009 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber009, subscriberCallBack009); - break; - case "publish_event1000": - expect(data.events[0]).assertEqual("publish_event1000"); - commonEventSubscriber010 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber010, subscriberCallBack010); - break; - case "publish_event1100_1": - expect(data.events[0]).assertEqual("publish_event1100_1"); - commonEventSubscriber011 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber011, subscriberCallBack011_1); - break; - case "publish_event1100_2": - expect(data.events[0]).assertEqual("publish_event1100_2"); - commonEventSubscriber011 = commonEventSubscriber; - await Subscriber.subscribe(commonEventSubscriber011, subscriberCallBack011_2); - break; - default: - break; - } - } - /* * @tc.number : ActsSubscriberTestUnorder_0100 * @tc.name : verify subscribe and publish : Check subscribe and publish common event data @@ -275,51 +54,74 @@ describe('ActsSubscriberTestUnorder', function () { */ it('ActsSubscriberTestUnorder_0100', 0, async function (done) { console.info("===============ActsSubscriberTestUnorder_0100=============================>"); - commonEventSubscribeInfo = { + + function subscriberCallBack001(err, data) { + console.info("==========================>subscriberCallBack001"); + expect(data.event).assertEqual("publish_event0100"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + done(); + } + + var commonEventSubscribeInfo = { events: ["publish_event0100"], }; - await Subscriber.createSubscriber( + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0100=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber001 = data; + data.getSubscribeInfo().then(function (data){ console.info("===============ActsSubscriberTestUnorder_0100=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber001, subscriberCallBack001); + Subscriber.publish("publish_event0100", publishCallback); }); }) - console.info("===============ActsSubscriberTestUnorder_0100==============================>"); - await Subscriber.publish("publish_event0100", publishCallback); - done(); + + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0100 end=================="); + }, 30000); }) /* * @tc.number : ActsSubscriberTestUnorder_0200 - * @tc.name : verify subscribe and publish : Check subscribe and publish common event data + * @tc.name : verify subscribe and publish : Check subscribe and publish common event data * of containing special characters * @tc.desc : Check the subscriber can receive event "@#￥#3243adsafdf_" type of the interface (by Promise) */ it('ActsSubscriberTestUnorder_0200', 0, async function (done) { console.info("===============ActsSubscriberTestUnorder_0200==========================>"); + function subscriberCallBack002(err, data) { + console.info("==========================>subscriberCallBack002"); + expect(data.event).assertEqual("@#￥#3243adsafdf_"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + done(); + } + var commonEventSubscribeInfo = { events: ["@#￥#3243adsafdf_"], }; - await Subscriber.createSubscriber( + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0200=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber002 = data; + data.getSubscribeInfo().then(function (data){ console.info("===============ActsSubscriberTestUnorder_0200=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber002, subscriberCallBack002); + Subscriber.publish("@#￥#3243adsafdf_", publishCallback); }); }) - Subscriber.publish("@#￥#3243adsafdf_", publishCallback); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0200 end=================="); + }, 30000); }) /* @@ -334,24 +136,35 @@ describe('ActsSubscriberTestUnorder', function () { events: [Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED] }; - await Subscriber.createSubscriber( + function subscriberCallBack003(err, data) { + console.info("==========================>subscriberCallBack003"); + expect(data.event).assertEqual(Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + done(); + } + + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0300=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber003 = data; + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestUnorder_0300=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber003, subscriberCallBack003); + Subscriber.publish(Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED, publishCallback); }); }) - Subscriber.publish(Subscriber.Support.COMMON_EVENT_BATTERY_CHANGED, publishCallback); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0300 end=================="); + }, 30000); }) /* * @tc.number : ActsSubscriberTestUnorder_0400 - * @tc.name : verify subscribe and publish : Check subscribe and publish common event data + * @tc.name : verify subscribe and publish : Check subscribe and publish common event data * with publishInfo data * @tc.desc : Check the subscriber can receive event "publish_event0400" type of the interface (by Promise) */ @@ -363,17 +176,6 @@ describe('ActsSubscriberTestUnorder', function () { priority: 10, }; - await Subscriber.createSubscriber( - commonEventSubscribeInfo - ).then(async (data) =>{ - console.info("===============ActsSubscriberTestUnorder_0400=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestUnorder_0400=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); - }); - }) - var commonEventPublishData = { isOrdered: false, bundleName: "PublishBundleName0400", @@ -381,8 +183,35 @@ describe('ActsSubscriberTestUnorder', function () { data: "PublishData0400", } - Subscriber.publish("publish_event0400", commonEventPublishData, publishCallback); - done(); + function isOrderedCommonEventCallback004(err, data) { + console.info("==========================>isOrderedCommonEventCallback004"); + expect(data).assertEqual(false); + done(); + } + + function subscriberCallBack004(err, data) { + console.info("==========================>subscriberCallBack004"); + expect(data.event).assertEqual("publish_event0400"); + expect(data.bundleName).assertEqual("PublishBundleName0400"); + expect(data.code).assertEqual(55); + expect(data.data).assertEqual("PublishData0400"); + commonEventSubscriber004.isOrderedCommonEvent(isOrderedCommonEventCallback004); + } + + Subscriber.createSubscriber( + commonEventSubscribeInfo + ).then(function (data) { + console.info("===============ActsSubscriberTestUnorder_0400=========createSubscriber promise"); + commonEventSubscriber004 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestUnorder_0400=========getSubscribeInfo promise"); + Subscriber.subscribe(commonEventSubscriber004, subscriberCallBack004); + Subscriber.publish("publish_event0400", commonEventPublishData, publishCallback); + }); + }) + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0400 end=================="); + }, 30000); }) /* @@ -392,33 +221,50 @@ describe('ActsSubscriberTestUnorder', function () { */ it('ActsSubscriberTestUnorder_0500', 0, async function (done) { console.info("===============ActsSubscriberTestUnorder_0500==========================>"); - commonEventSubscribeInfo = { + var commonEventSubscribeInfo = { events: ["publish_event0500"] }; - await Subscriber.createSubscriber( + var commonEventPublishData = { + isOrdered: false, + isSticky: true, + } + + function isStickyCommonEventCallback005(err, data) { + console.info("==========================>isStickyCommonEventCallback005 isSticky:"+ data); + expect(data).assertEqual(true); + done(); + } + + function subscriberCallBack005(err, data) { + console.info("==========================>subscriberCallBack0500"); + expect(data.event).assertEqual("publish_event0500"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + commonEventSubscriber005.isStickyCommonEvent(isStickyCommonEventCallback005); + } + + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0500=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber005 = data; + data.getSubscribeInfo().then(function (data){ console.info("===============ActsSubscriberTestUnorder_0500=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber005, subscriberCallBack005); + Subscriber.publish("publish_event0500", commonEventPublishData, publishCallback); }); }) - var commonEventPublishData = { - isOrdered: false, - isSticky: true, - } - - Subscriber.publish("publish_event0500", commonEventPublishData, publishCallback); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0500 end=================="); + }, 30000); }) /* * @tc.number : ActsSubscriberTestUnorder_0600 - * @tc.name : verify subscribe and publish : Check the two different subscribe and one publish, + * @tc.name : verify subscribe and publish : Check the two different subscribe and one publish, * and check unsubscribe event * @tc.desc : Check the subscriber can receive event "publish_event0600" type of the interface (by Promise) */ @@ -428,37 +274,47 @@ describe('ActsSubscriberTestUnorder', function () { events: ["publish_event0600"] }; - await Subscriber.createSubscriber( + var commonEventPublishData = { + isOrdered: false, + isSticky: false, + } + + function subscriberCallBack006(err, data) { + console.info("==========================>subscriberCallBack0600"); + expect(data.event).assertEqual("publish_event0600"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + done(); + } + + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0600_1=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber006_1 = data; + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestUnorder_0600_1=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber006_1, subscriberCallBack006); }); }) - await Subscriber.createSubscriber( + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0600_2=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber006_2 = data; + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestUnorder_0600_2=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber006_2, subscriberCallBack006); + Subscriber.unsubscribe(commonEventSubscriber006_1, unsubscriberCallBack); + Subscriber.publish("publish_event0600", commonEventPublishData, publishCallback); }); }) - await unsubscriber_(); - var commonEventPublishData = { - isOrdered: false, - isSticky: false, - } - - Subscriber.publish("publish_event0600", commonEventPublishData, publishCallback); - console.info("===============ActsSubscriberTestUnorder_0600 end=========================>"); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0600 end=================="); + }, 30000); }) /* @@ -468,29 +324,48 @@ describe('ActsSubscriberTestUnorder', function () { */ it('ActsSubscriberTestUnorder_0700', 0, async function (done) { console.info("===============ActsSubscriberTestUnorder_0700==========================>"); + var num = 0; var commonEventSubscribeInfo = { events: ["publish_event0700"] }; - await Subscriber.createSubscriber( + var commonEventPublishData = { + isOrdered: false, + isSticky: false, + } + + function subscriberCallBack007(err, data) { + console.info("==========================>subscriberCallBack0700"); + expect(data.event).assertEqual("publish_event0700"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + console.info("==========================>subscriberCallBack0700 num = " + num); + if (num == 0) { + num++; + } else if(num == 1) { + num = 0; + done(); + } + } + console.info("===============ActsSubscriberTestUnorder_0700 11111111111111==========================>"); + Subscriber.createSubscriber( commonEventSubscribeInfo - ).then(async (data) =>{ + ).then(function (data) { console.info("===============ActsSubscriberTestUnorder_0700=========createSubscriber promise"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ + commonEventSubscriber007 = data; + console.info("===============ActsSubscriberTestUnorder_0700 22222222222222==========================>"); + data.getSubscribeInfo().then(function (data) { console.info("===============ActsSubscriberTestUnorder_0700=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); + Subscriber.subscribe(commonEventSubscriber007, subscriberCallBack007); + Subscriber.publish("publish_event0700", commonEventPublishData, publishCallback); + Subscriber.publish("publish_event0700", commonEventPublishData, publishCallback); }); }) - var commonEventPublishData = { - isOrdered: false, - isSticky: false, - } - - Subscriber.publish("publish_event0700", commonEventPublishData, publishCallback); - Subscriber.publish("publish_event0700", commonEventPublishData, publishCallback); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0700 end=================="); + }, 30000); }) /* @@ -505,30 +380,41 @@ describe('ActsSubscriberTestUnorder', function () { publisherPermission:"publish_event0800_permission" }; - await Subscriber.createSubscriber( - commonEventSubscribeInfo - ).then(async (data) => { - console.info("=================ActsSubscriberTestUnorder_0800=========createSubscriberPromise0800"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestUnorder_0800=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); - }); - }); - var commonEventPublishData = { subscriberPermissions:["publish_event0800_permission"], isOrdered: false, isSticky: false, } - Subscriber.publish("publish_event0800", commonEventPublishData, publishCallback); - done(); + function subscriberCallBack008(err, data) { + console.info("==========================>subscriberCallBack0800"); + expect(data.event).assertEqual("publish_event0800"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + done(); + } + + Subscriber.createSubscriber( + commonEventSubscribeInfo + ).then(function (data) { + console.info("=================ActsSubscriberTestUnorder_0800=========createSubscriberPromise0800"); + commonEventSubscriber008 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestUnorder_0800=========getSubscribeInfo promise"); + Subscriber.subscribe(commonEventSubscriber008, subscriberCallBack008); + Subscriber.publish("publish_event0800", commonEventPublishData, publishCallback); + }); + }); + + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0800 end=================="); + }, 30000); }) /* * @tc.number : ActsSubscriberTestUnorder_0900 - * @tc.name : verify subscribe and publish : Check subscribe and publish common event + * @tc.name : verify subscribe and publish : Check subscribe and publish common event * with permission and check IsOrderedCommonEvent * @tc.desc : Check the subscriber can receive event "publish_event0900" type of the interface (by Promise) */ @@ -539,30 +425,48 @@ describe('ActsSubscriberTestUnorder', function () { publisherPermission:"publish_event0900_publisherPermission" }; - await Subscriber.createSubscriber( - commonEventSubscribeInfo - ).then(async (data) => { - console.info("==========================>createSubscriberPromise0900=======================>"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestUnorder_0900=========getSubscribeInfo promise"); - await getSubscribeInfoCallBack(data); - }); - }); - var commonEventPublishData = { subscriberPermissions:["publish_event0900_subscriberPermissions"], isOrdered: false, isSticky: false } - Subscriber.publish("publish_event0900", commonEventPublishData, publishCallback); - done(); + function isOrderedCommonEventCallback009(err, data) { + console.info("==========================>isOrderedCommonEventCallback009"); + expect(data).assertEqual(false); + done(); + } + + function subscriberCallBack009(err, data) { + console.info("==========================>subscriberCallBack0900"); + expect(data.event).assertEqual("publish_event0900"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + commonEventSubscriber009.isOrderedCommonEvent(isOrderedCommonEventCallback009); + } + + Subscriber.createSubscriber( + commonEventSubscribeInfo + ).then(function (data) { + console.info("==========================>createSubscriberPromise0900=======================>"); + commonEventSubscriber009 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestUnorder_0900=========getSubscribeInfo promise"); + Subscriber.subscribe(commonEventSubscriber009, subscriberCallBack009); + Subscriber.publish("publish_event0900", commonEventPublishData, publishCallback); + }); + }); + + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_0900 end=================="); + done(); + }, 30000); }) /* * @tc.number : ActsSubscriberTestUnorder_1000 - * @tc.name : verify subscribe and publish : Check subscribe and publish sticky event + * @tc.name : verify subscribe and publish : Check subscribe and publish sticky event * with publishpermission and check IsStickyCommonEvent * @tc.desc : Check the subscriber can receive event "publish_event1000" type of the interface (by Promise) */ @@ -572,25 +476,42 @@ describe('ActsSubscriberTestUnorder', function () { events: ["publish_event1000"] }; - await Subscriber.createSubscriber( - commonEventSubscribeInfo - ).then(async (data) => { - console.info("==========================>createSubscriberPromise1000=======================>"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestUnorder_1000=========getSubscribeInfo promise="); - await getSubscribeInfoCallBack(data); - }); - }); - var commonEventPublishData = { subscriberPermissions:["publish_event1000_permission"], isOrdered: false, isSticky: true } - Subscriber.publish("publish_event1000", commonEventPublishData, publishCallback); - done(); + function isStickyCommonEventCallback010(err, data) { + console.info("==========================>isStickyCommonEventCallback010"); + expect(data).assertEqual(true); + done(); + } + + function subscriberCallBack010(err, data) { + console.info("==========================>subscriberCallBack1000"); + expect(data.event).assertEqual("publish_event1000"); + expect(data.bundleName).assertEqual(""); + expect(data.code).assertEqual(0); + expect(data.data).assertEqual(""); + commonEventSubscriber010.isStickyCommonEvent(isStickyCommonEventCallback010); + } + + Subscriber.createSubscriber( + commonEventSubscribeInfo + ).then(function (data) { + console.info("==========================>createSubscriberPromise1000=======================>"); + commonEventSubscriber010 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestUnorder_1000=========getSubscribeInfo promise="); + Subscriber.subscribe(commonEventSubscriber010, subscriberCallBack010); + Subscriber.publish("publish_event1000", commonEventPublishData, publishCallback); + }); + }); + + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_1000 end=================="); + }, 30000); }) @@ -612,29 +533,7 @@ describe('ActsSubscriberTestUnorder', function () { priority: 10 }; - await Subscriber.createSubscriber( - commonEventSubscribeInfo_1 - ).then(async (data) => { - console.info("=================ActsSubscriberTestUnorder_1100=========>createSubscriber Promise1100_1"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestUnorder_1100=========getSubscribeInfo promise1100_1"); - await getSubscribeInfoCallBack(data); - }); - }); - - await Subscriber.createSubscriber( - commonEventSubscribeInfo_2 - ).then(async (data) => { - console.info("=================ActsSubscriberTestUnorder_1100=========>createSubscriber Promise1100_2"); - commonEventSubscriber = data; - await data.getSubscribeInfo().then(async (data)=>{ - console.info("===============ActsSubscriberTestUnorder_1100=========getSubscribeInfo promise1100_2"); - await getSubscribeInfoCallBack(data); - }); - }); - - commonEventPublishData_1 = { + var commonEventPublishData_1 = { bundleName: "publish_event1100_bundleName1", code: 3, data: "publish_event1100_data", @@ -642,7 +541,7 @@ describe('ActsSubscriberTestUnorder', function () { isSticky: false, } - commonEventPublishData_2 = { + var commonEventPublishData_2 = { bundleName: "publish_event1100_bundleName2", code: 5, data: "publish_event1100_data", @@ -650,9 +549,53 @@ describe('ActsSubscriberTestUnorder', function () { isSticky: false, } - Subscriber.publish("publish_event1100_1", commonEventPublishData_1, publishCallback1100_1); - Subscriber.publish("publish_event1100_2", commonEventPublishData_2, publishCallback1100_2); + async function subscriberCallBack011_1(err, data) { + console.info("==========================>subscriberCallBack011_1"); + console.info("==========================>subscriberCallBack011_1 event:"+data.event); + console.info("==========================>subscriberCallBack011_1 bundleName:"+data.bundleName); + expect(data.event).assertEqual("publish_event1100_1"); + expect(data.bundleName).assertEqual("publish_event1100_bundleName1"); + expect(data.code).assertEqual(3); + expect(data.data).assertEqual("publish_event1100_data"); + } + + function subscriberCallBack011_2(err, data) { + console.info("==========================>subscriberCallBack011_2"); + console.info("==========================>subscriberCallBack011_2 event:"+data.event); + console.info("==========================>subscriberCallBack011_2 bundleName:"+data.bundleName); + expect(data.event).assertEqual("publish_event1100_2"); + expect(data.bundleName).assertEqual("publish_event1100_bundleName2"); + expect(data.code).assertEqual(5); + expect(data.data).assertEqual("publish_event1100_data"); + } + + Subscriber.createSubscriber( + commonEventSubscribeInfo_1 + ).then(function (data) { + console.info("=================ActsSubscriberTestUnorder_1100=========>createSubscriber Promise1100_1"); + commonEventSubscriber011_1 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestUnorder_1100=========getSubscribeInfo promise1100_1"); + Subscriber.subscribe(commonEventSubscriber011_1, subscriberCallBack011_1); + }); + }); + + Subscriber.createSubscriber( + commonEventSubscribeInfo_2 + ).then(function (data) { + console.info("=================ActsSubscriberTestUnorder_1100=========>createSubscriber Promise1100_2"); + commonEventSubscriber011_2 = data; + data.getSubscribeInfo().then(function (data) { + console.info("===============ActsSubscriberTestUnorder_1100=========getSubscribeInfo promise1100_2"); + Subscriber.subscribe(commonEventSubscriber011_2, subscriberCallBack011_2); + Subscriber.publish("publish_event1100_1", commonEventPublishData_1, publishCallback1100_1); + Subscriber.publish("publish_event1100_2", commonEventPublishData_2, publishCallback1100_2); + }); + }); - done(); + setTimeout(function (){ + console.debug("===================ActsSubscriberTestUnorder_1100 end=================="); + done(); + }, 30000); }) })