Merge remote-tracking branch 'origin/feature/20220530' into feature/20220530

aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/test/StartAbilityJsunit.test.js

@@ -362,7 +362,7 @@ describe('ConnectAbilityTest', function () {
     /*
     * @tc.number: SUB_AA_JsApi_Ability_1900
     * @tc.name: testAblity1900.
-    * @tc.desc: startAbilityForResult-wrong input parameter format want a layer outside.(by callback)
+    * @tc.desc: startAbilityForResult-wrong input parameter format want a layer outside.(by promise)
     */
     it("SUB_AA_JsApi_Ability_1900", 0, async function (done) {
         let parameter = {
@@ -377,19 +377,47 @@ describe('ConnectAbilityTest', function () {
                 }
             }
         }
-        featureAbility.startAbilityForResult(parameter, (error, data) => {
-            console.log('testAblity1900' + JSON.stringify(error));
+        await featureAbility.startAbilityForResult(parameter).then((data) => {
+            console.log('testAblity1900 data: ' + JSON.stringify(data))
+            expect.assertFail()
+        }).catch((error) => {
+            console.log('testAblity1900 err:' + JSON.stringify(error));
             expect(errCode1).assertEqual(error.code)
-            done()
-        }) 
+        })
+        done()
     })
 
     /*
     * @tc.number: SUB_AA_JsApi_Ability_2000
     * @tc.name: testAblity2000.
-    * @tc.desc: startAbilityForResult-want-Set bundleName and abilityName+flag-flag to character strings.(by promise)
+    * @tc.desc: startAbilityForResult-wrong input parameter format want a layer outside.(by callback)
     */
     it("SUB_AA_JsApi_Ability_2000", 0, async function (done) {
+        let parameter = {
+            'StartAbilityParameter': {
+                'want': {
+                    'bundleName': bundleName,
+                    'abilityName': mainAbilityName,
+                    'parameters': {
+                        'key': resultCode,
+                        'terminate': true
+                    }
+                }
+            }
+        }
+        featureAbility.startAbilityForResult(parameter, (error, data) => {
+            console.log('testAblity2000' + JSON.stringify(error));
+            expect(errCode1).assertEqual(error.code)
+            done()
+        })
+    })
+
+    /*
+    * @tc.number: SUB_AA_JsApi_Ability_2100
+    * @tc.name: testAblity2100.
+    * @tc.desc: startAbilityForResult-want-Set bundleName and abilityName+flag-flag to character strings.(by promise)
+    */
+    it("SUB_AA_JsApi_Ability_2100", 0, async function (done) {
         let parameter = {
             'want': {
                 'bundleName': bundleName,
@@ -402,12 +430,36 @@ describe('ConnectAbilityTest', function () {
             }
         }
         await featureAbility.startAbilityForResult(parameter).then((data) => {
-            console.log('testAblity2000 data: ' + JSON.stringify(data))
+            console.log('testAblity2100 data: ' + JSON.stringify(data))
             expect.assertFail()
         }).catch((error) => {
-            console.log('testAblity2000' + JSON.stringify(error));
+            console.log('testAblity2100' + JSON.stringify(error));
             expect(undefined).assertEqual(error.code)
         })
         done()
     })
+
+    /*
+    * @tc.number: SUB_AA_JsApi_Ability_2200
+    * @tc.name: testAblity2200.
+    * @tc.desc: startAbilityForResult-want-Set bundleName and abilityName+flag-flag to character strings.(by callback)
+    */
+    it("SUB_AA_JsApi_Ability_2200", 0, async function (done) {
+        let parameter = {
+            'want': {
+                'bundleName': bundleName,
+                'abilityName': mainAbilityName,
+                'flages': 'abc',
+                'parameters': {
+                    'key': resultCode,
+                    'terminate': true
+                }
+            }
+        }
+        featureAbility.startAbilityForResult(parameter, (error, data) => {
+            console.log('testAblity2200' + JSON.stringify(error));
+            expect(undefined).assertEqual(error.code)
+            done()
+        })
+    })
 })

powermgr/powermgrbattery/src/main/js/default/test/battery_common_event.test.js

@@ -6753,49 +6753,6 @@ function createTimezoneChangedSubscriber() {
     });
 }
 
-function createTimezoneChangedSubscriber() {
-    var commonEventSubscribeInfo = {
-        events: [commonEvent.Support.COMMON_EVENT_TIMEZONE_CHANGED],
-    };
-    commonEvent.createSubscriber(commonEventSubscribeInfo)
-        .then(subscriber => {
-            console.info('createTimezoneChangedSubscriber success');
-            var mySubscriber = subscriber;
-            console.log(subscriber);
-
-            if (subscriber == "" || subscriber == undefined || subscriber == null) {
-                console.info("createSubscriber failed");
-            }
-            mySubscriber.getCode()
-                .then((data) => {
-                    console.info('Subscriber getCode success : ' + JSON.stringify(data));
-                }).catch((error) => {
-                console.error('Subscriber getCode error because: ' + JSON.stringify(error));
-            })
-            mySubscriber.getData()
-                .then((data) => {
-                    console.info('Subscriber getData success : ' + JSON.stringify(data));
-                }).catch((error) => {
-                console.error('Subscriber getData error because: ' + JSON.stringify(error));
-            })
-            console.info('subscribe Timezone_Changed begin ');
-
-            commonEvent.subscribe(mySubscriber, (error, commonEventData) => {
-                console.error('err code: ' + JSON.stringify(error));
-                console.info('subscribe callback: ' + JSON.stringify(commonEventData));
-                console.info("commonEventData event: " + commonEventData.event);
-                console.info("commonEventData bundleName: " + commonEventData.bundleName);
-                console.info("commonEventData data: " + commonEventData.data);
-                console.info("commonEventData parameter: " + commonEventData.parameters[0]);
-                var capacity = commonEventData.parameters['0'];
-                console.info("capacity is:" + capacity);
-                expect(capacity >= 0 && capacity <= 100).assertTrue();
-            });
-        }).catch((error) => {
-        console.error('Operation failed. Cause: ' + JSON.stringify(error));
-    });
-}
-
 function createDateChangedSubscriber() {
     var commonEventSubscribeInfo = {
         events: [commonEvent.Support.COMMON_EVENT_DATE_CHANGED],