!4364 【XTS】【事件通知子系统】isSticky+Support补

Merge pull request !4364 from 郅建文/master

notification/ces_standard/subscribeandpublish/actssubscriberunordersystemtest/entry/src/main/js/test/ActsSubscriber_test_unorder.js

@@ -115,7 +115,8 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
             Subscriber.Support.COMMON_EVENT_VOLUME_MOUNTED,
             Subscriber.Support.COMMON_EVENT_VOLUME_BAD_REMOVAL,
             Subscriber.Support.COMMON_EVENT_VOLUME_EJECT,
-            Subscriber.Support.COMMON_EVENT_SLOT_CHANGE
+            Subscriber.Support.COMMON_EVENT_SLOT_CHANGE,
+            Subscriber.Support.COMMON_EVENT_SPN_INFO_CHANGED 
     ];
 
     function publishCallback(err) {
@@ -200,7 +201,8 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
                     Subscriber.Support.COMMON_EVENT_VOLUME_MOUNTED,
                     Subscriber.Support.COMMON_EVENT_VOLUME_BAD_REMOVAL,
                     Subscriber.Support.COMMON_EVENT_VOLUME_EJECT,
-                    Subscriber.Support.COMMON_EVENT_SLOT_CHANGE
+                    Subscriber.Support.COMMON_EVENT_SLOT_CHANGE,
+                    Subscriber.Support.COMMON_EVENT_SPN_INFO_CHANGED 
                 ],
         };
 
@@ -309,7 +311,8 @@ describe('ActsSubscriberTestUnorderSystem', async function (done) {
                 Subscriber.Support.COMMON_EVENT_VOLUME_MOUNTED,
                 Subscriber.Support.COMMON_EVENT_VOLUME_BAD_REMOVAL,
                 Subscriber.Support.COMMON_EVENT_VOLUME_EJECT,
-                Subscriber.Support.COMMON_EVENT_SLOT_CHANGE
+                Subscriber.Support.COMMON_EVENT_SLOT_CHANGE,
+                Subscriber.Support.COMMON_EVENT_SPN_INFO_CHANGED 
             ],
         };
 

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/test/ActsSubscriber_test_unorder.js

@@ -12,11 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Subscriber from '@ohos.commonEvent'
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
+import Subscriber from "@ohos.commonEvent";
+import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect,} from "deccjsunit/index";
 
-describe('ActsSubscriberTestUnorder', async function (done) {
-    console.info("===========ActsSubscriberTestUnorder start====================>");
+describe("ActsSubscriberTestUnorder", async function (done) {
+  console.info(
+    "===========ActsSubscriberTestUnorder start====================>"
+  );
   let commonEventSubscriber001;
   let commonEventSubscriber002;
   let commonEventSubscriber003;
@@ -24,6 +26,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
   let commonEventSubscriber0051;
   let commonEventSubscriber0052;
   let commonEventSubscriber006;
+  let commonEventSubscriber007;
   let commonEventSubscriber008;
   let commonEventSubscriber0101;
   let commonEventSubscriber0102;
@@ -51,7 +54,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
    * @tc.name      : verify subscribe and publish : Check subscribe and publish common event data
    * @tc.desc      : Check the subscriber can receive event "publish_event0100" type of the interface (by Promise)
    */
-    it('ActsSubscriberTestUnorder_0100', 0, async function (done) {
+  it("ActsSubscriberTestUnorder_0100", 0, async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0100=============================>");
     function subscriberCallBack001(err, data) {
       console.info("==========================>subscriberCallBack001");
@@ -66,21 +69,19 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       events: ["publish_event0100"],
     };
 
-        Subscriber.createSubscriber(
-            commonEventSubscribeInfo
-        ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0100=========createSubscriber promise");
       commonEventSubscriber001 = data;
-            data.getSubscribeInfo().then(()=>{
-                console.info("===============ActsSubscriberTestUnorder_0100=========getSubscribeInfo promise");
+      data.getSubscribeInfo().then(() => {
+        console.info( "===============ActsSubscriberTestUnorder_0100=========getSubscribeInfo promise");
         Subscriber.subscribe(commonEventSubscriber001, subscriberCallBack001);
-                setTimeout(function (){
+        setTimeout(function () {
           console.info("==========ActsSubscriberTestUnorder_0100 publish start============");
           Subscriber.publish("publish_event0100", publishCallback);
         }, 1000);
       });
-        })
-    })
+    });
+  });
 
   /*
    * @tc.number    : ActsSubscriberTestUnorder_0200
@@ -88,7 +89,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
    *                 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) {
+  it("ActsSubscriberTestUnorder_0200", 0, async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0200==========================>");
 
     function subscriberCallBack002(err, data) {
@@ -104,21 +105,19 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       events: ["@#￥#3243adsafdf_"],
     };
 
-        Subscriber.createSubscriber(
-            commonEventSubscribeInfo
-        ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0200=========createSubscriber promise");
       commonEventSubscriber002 = data;
-            data.getSubscribeInfo().then(()=>{
+      data.getSubscribeInfo().then(() => {
         console.info("===============ActsSubscriberTestUnorder_0200=========getSubscribeInfo promise");
         Subscriber.subscribe(commonEventSubscriber002, subscriberCallBack002);
-                setTimeout(function (){
+        setTimeout(function () {
           console.info("==========ActsSubscriberTestUnorder_0200 publish start============");
           Subscriber.publish("@#￥#3243adsafdf_", publishCallback);
         }, 1000);
       });
-        })
-    })
+    });
+  });
 
   /*
    * @tc.number    : ActsSubscriberTestUnorder_0300
@@ -126,7 +125,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
    *                 with publishInfo data
    * @tc.desc      : Check the subscriber can receive event "publish_event0300" type of the interface (by Promise)
    */
-    it('ActsSubscriberTestUnorder_0300', 0, async function (done) {
+  it("ActsSubscriberTestUnorder_0300", 0, async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0300==========================>");
     let commonEventSubscribeInfo = {
       events: ["publish_event0300"],
@@ -138,7 +137,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       isOrdered: false,
       code: 55,
       data: "PublishData0300",
-        }
+    };
 
     function isOrderedCommonEventCallback003(err, data) {
       console.info("==========================>isOrderedCommonEventCallback003");
@@ -151,24 +150,24 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       expect(data.event).assertEqual("publish_event0300");
       expect(data.code).assertEqual(55);
       expect(data.data).assertEqual("PublishData0300");
-            commonEventSubscriber003.isOrderedCommonEvent(isOrderedCommonEventCallback003);
+      commonEventSubscriber003.isOrderedCommonEvent(
+        isOrderedCommonEventCallback003
+      );
     }
 
-        Subscriber.createSubscriber(
-            commonEventSubscribeInfo
-        ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0300=========createSubscriber promise");
       commonEventSubscriber003 = data;
-            data.getSubscribeInfo().then(()=>{
+      data.getSubscribeInfo().then(() => {
         console.info("===============ActsSubscriberTestUnorder_0300=========getSubscribeInfo promise");
         Subscriber.subscribe(commonEventSubscriber003, subscriberCallBack003);
-                setTimeout(function (){
+        setTimeout(function () {
           console.info("==========ActsSubscriberTestUnorder_0300 publish start============");
-                    Subscriber.publish("publish_event0300", commonEventPublishData, publishCallback);
+          Subscriber.publish("publish_event0300",commonEventPublishData,publishCallback);
         }, 1000);
       });
-        })
-    })
+    });
+  });
 
   /*
    * @tc.number    : ActsSubscriberTestUnorder_0400
@@ -176,7 +175,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
    *                 with publishInfo data
    * @tc.desc      : Check the subscriber can receive event "publish_event0300" type of the interface (by Promise)
    */
- it('ActsSubscriberTestUnorder_0400', 0, async function (done) {
+  it("ActsSubscriberTestUnorder_0400", 0, async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0400==========================>");
     let commonEventSubscribeInfo = {
       events: ["publish_event0400"],
@@ -189,7 +188,7 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       bundleName: "com.example.actssubscribertestunorder",
       code: 55,
       data: "PublishData0400",
-    }
+    };
 
     function isOrderedCommonEventCallback004(err, data) {
       console.info("==========================>isOrderedCommonEventCallback003");
@@ -202,24 +201,30 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       expect(data.event).assertEqual("publish_event0400");
       expect(data.code).assertEqual(55);
       expect(data.data).assertEqual("PublishData0400");
-        commonEventSubscriber004.isOrderedCommonEvent(isOrderedCommonEventCallback004);
+      commonEventSubscriber004.isOrderedCommonEvent(
+        isOrderedCommonEventCallback004
+      );
     }
 
-    Subscriber.createSubscriber(
-        commonEventSubscribeInfo
-    ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0400=========createSubscriber promise");
       commonEventSubscriber004 = data;
-        data.getSubscribeInfo().then(()=>{
-            console.info("===============ActsSubscriberTestUnorder_0400=========getSubscribeInfo promise");
+      data.getSubscribeInfo().then(() => {
+        console.info(
+          "===============ActsSubscriberTestUnorder_0400=========getSubscribeInfo promise"
+        );
         Subscriber.subscribe(commonEventSubscriber004, subscriberCallBack004);
-            setTimeout(function (){
+        setTimeout(function () {
           console.info("==========ActsSubscriberTestUnorder_0400 publish start============");
-                Subscriber.publish("publish_event0400", commonEventPublishData, publishCallback);
+          Subscriber.publish(
+            "publish_event0400",
+            commonEventPublishData,
+            publishCallback
+          );
         }, 1000);
       });
-    })
-})
+    });
+  });
 
   /*
    * @tc.number    : ActsSubscriberTestUnorder_0500
@@ -227,16 +232,16 @@ describe('ActsSubscriberTestUnorder', async function (done) {
    *                 and check unsubscribe event
    * @tc.desc      : Check the subscriber can receive event "publish_event0500" type of the interface (by Promise)
    */
-    it('ActsSubscriberTestUnorder_0500', 0, async function (done) {
+  it("ActsSubscriberTestUnorder_0500", 0, async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0500==========================>");
     let commonEventSubscribeInfo = {
-            events: ["publish_event0500"]
+      events: ["publish_event0500"],
     };
 
     let commonEventPublishData = {
       isOrdered: false,
       isSticky: false,
-        }
+    };
 
     function subscriberCallBack005(err, data) {
       console.info("==========================>subscriberCallBack0500");
@@ -247,54 +252,55 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       done();
     }
 
-        Subscriber.createSubscriber(
-            commonEventSubscribeInfo
-        ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0500_1=========createSubscriber promise");
       commonEventSubscriber0051 = data;
-            data.getSubscribeInfo().then(()=>{
+      data.getSubscribeInfo().then(() => {
         console.info("===============ActsSubscriberTestUnorder_0500_1=========getSubscribeInfo promise");
         Subscriber.subscribe(commonEventSubscriber0051, subscriberCallBack005);
       });
-        })
+    });
 
-        Subscriber.createSubscriber(
-            commonEventSubscribeInfo
-        ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0500_2=========createSubscriber promise");
       commonEventSubscriber0052 = data;
-            data.getSubscribeInfo().then(()=>{
+      data.getSubscribeInfo().then(() => {
         console.info("===============ActsSubscriberTestUnorder_0500_2=========getSubscribeInfo promise");
         Subscriber.subscribe(commonEventSubscriber0052, subscriberCallBack005);
         Subscriber.unsubscribe(commonEventSubscriber0051, unsubscriberCallBack);
-                setTimeout(function (){
-                    console.info("==========ActsSubscriberTestUnorder_0500 publish start============");
-                    Subscriber.publish("publish_event0500", commonEventPublishData, publishCallback);
+        setTimeout(function () {
+          console.info(
+            "==========ActsSubscriberTestUnorder_0500 publish start============"
+          );
+          Subscriber.publish(
+            "publish_event0500",
+            commonEventPublishData,
+            publishCallback
+          );
         }, 1000);
       });
-        })
-    })
-
+    });
+  });
 
   /*
    * @tc.number    : ActsSubscriberTestUnorder_0600
    * @tc.name      : verify subscribe and publish : Check whether the current public event is a sticky event
    * @tc.desc      : isStickyCommonEvent(callback: AsyncCallback<boolean>): void
    */
-    it('ActsSubscriberTestUnorder_0600', 0, async function (done) {
+  it("ActsSubscriberTestUnorder_0600", 0, async function (done) {
     console.info("===============ActsSubscriberTestUnorder_0600==========================>");
     let commonEventSubscribeInfo = {
-            events: ["publish_event0600"]
+      events: ["publish_event0600"],
     };
 
     let commonEventPublishData = {
       isOrdered: false,
       isSticky: false,
-        }
+    };
 
-        function isStickyCallback(err, data) {
+    function isStickyCallback(err, isSticky) {
       console.info("==========================>isStickyCallback");
-            expect(data).assertEqual(false);
+      expect(isSticky).assertEqual(false);
       done();
     }
 
@@ -303,22 +309,63 @@ describe('ActsSubscriberTestUnorder', async function (done) {
       commonEventSubscriber006.isStickyCommonEvent(isStickyCallback);
     }
 
-        Subscriber.createSubscriber(
-            commonEventSubscribeInfo
-        ).then((data)=>{
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
       console.info("===============ActsSubscriberTestUnorder_0600=========createSubscriber promise");
       commonEventSubscriber006 = data;
-            data.getSubscribeInfo().then(()=>{
+      data.getSubscribeInfo().then(() => {
         console.info("===============ActsSubscriberTestUnorder_0600=========getSubscribeInfo promise");
         Subscriber.subscribe(commonEventSubscriber006, subscriberCallBack006);
         Subscriber.unsubscribe(commonEventSubscriber006, unsubscriberCallBack);
-                setTimeout(function (){
+        setTimeout(function () {
           console.info("==========ActsSubscriberTestUnorder_0600 publish start============");
-                    Subscriber.publish("publish_event0600", commonEventPublishData, publishCallback);
+          Subscriber.publish("publish_event0600",commonEventPublishData,publishCallback);
         }, 1000);
       });
-        })
-    })
+    });
+  });
 
-})
+  /*
+   * @tc.number    : ActsSubscriberTestUnorder_0700
+   * @tc.name      : verify subscribe and publish : Check whether the current public event is a sticky event
+   * @tc.desc      : isStickyCommonEvent(): Promise<boolean>
+   */
+  it("ActsSubscriberTestUnorder_0700", 0, async function (done) {
+    console.info("===============ActsSubscriberTestUnorder_0700==========================>");
+    let commonEventSubscribeInfo = {
+      events: ["publish_event0700"],
+    };
 
+    let commonEventPublishData = {
+      isOrdered: false,
+      isSticky: false,
+    };
+
+    function subscriberCallBack007(err, data) {
+      console.info("subscriberCallBack007");
+      commonEventSubscriber007
+        .isStickyCommonEvent()
+        .then((isSticky) => {
+          console.info("isSticky " + JSON.stringify(isSticky));
+          expect(isSticky).assertEqual(false);
+          done();
+        })
+        .catch((err) => {
+          console.info("isSticky failed " + JSON.stringify(err));
+        });
+    }
+
+    Subscriber.createSubscriber(commonEventSubscribeInfo).then((data) => {
+      console.info("===============ActsSubscriberTestUnorder_0700=========createSubscriber promise");
+      commonEventSubscriber007 = data;
+      data.getSubscribeInfo().then(() => {
+        console.info("===============ActsSubscriberTestUnorder_0700=========getSubscribeInfo promise");
+        Subscriber.subscribe(commonEventSubscriber007, subscriberCallBack007);
+        Subscriber.unsubscribe(commonEventSubscriber007, unsubscriberCallBack);
+        setTimeout(function () {
+          console.info("==========ActsSubscriberTestUnorder_0700 publish start============");
+          Subscriber.publish("publish_event0700",commonEventPublishData,publishCallback);
+        }, 1000);
+      });
+    });
+  });
+});