!4666 元能力用例问题修改

Merge pull request !4666 from chengxingzhen/OpenHarmony-3.2-Beta2

ability/ability_runtime/BUILD.gn

@@ -23,8 +23,9 @@ group("ability_runtime") {
       "actsabilitylifecyclestatenew:ActsAbilityLifecycleStateNewTest",
       "actsabilitymanageretstest:ActsAbilityManagerEtsTest",
       "actscalltest:actscalltest",
-      "actsfwkdataaccessortest:dataability",
-      "actsserviceabilityclienttest:serviceability",
+
+      #"actsfwkdataaccessortest:dataability",
+      #"actsserviceabilityclienttest:serviceability",
       "actsstserviceabilityclientcase:ActsStServiceAbilityClientCaseTest",
       "actsusers:actsusers",
       "amscontextualinforquery:amscontextualinforquery",

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts

@@ -14,7 +14,6 @@
  */
 import rpc from "@ohos.rpc";
 import particleAbility from '@ohos.ability.particleAbility'
-import featureAbility from '@ohos.ability.featureAbility'
 import commonEvent from '@ohos.commonEvent'
 var serversecond_bundleName = "com.amsst.stserviceabilityserversecond";
 var serversecond_abilityName = "com.amsst.stserviceabilityserversecond.ServiceAbility";
@@ -59,7 +58,11 @@ export default {
     onStop() {
         console.debug('ACTS_SerivceAbilityServer ====<onStop');
         commonEvent.publish("ACTS_SerivceAbilityServer_onStop", (err) => { });
-        featureAbility.terminateSelf();
+        particleAbility.terminateSelf().then((data) => {
+            console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+          }).catch((error) => {
+            console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+          });
     },
     onCommand(want, restart, startId) {
         console.debug('ACTS_SerivceAbilityServer ====>onCommand='
@@ -76,7 +79,11 @@ export default {
                     },
                 }
             );
-            featureAbility.terminateSelf();
+            particleAbility.terminateSelf().then((data) => {
+                console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+              }).catch((error) => {
+                console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+              });
         } else if (want.action == 'ServiceStartService_1000') {
             particleAbility.startAbility(
                 {
@@ -89,7 +96,11 @@ export default {
                 }, (err, data) => {
                     console.debug('ACTS_SerivceAbilityServer start Ability 1000 callback====='
                         + err + ', data= ' + data + " , JSON." + JSON.stringify(data));
-                    featureAbility.terminateSelf();
+                        particleAbility.terminateSelf().then((data) => {
+                            console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+                          }).catch((error) => {
+                            console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+                          });
                 }
             );
         } else {
@@ -99,7 +110,11 @@ export default {
                         || want.action == 'PageStartService_0301' || want.action == 'PageStartService_0401') {
                         console.debug('ACTS_SerivceAbilityServer_onCommand 100 200 301 401.terminateSelf()=====>'
                             + want.action);
-                        featureAbility.terminateSelf();
+                            particleAbility.terminateSelf().then((data) => {
+                                console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+                              }).catch((error) => {
+                                console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+                              });
                     }
                 } else {
                     console.debug('ACTS_SerivceAbilityServer_onCommand publish err=====>' + err);
@@ -169,7 +184,11 @@ export default {
                             + ("json err=") + JSON.stringify(err) + " , " + want.action);
                     })
                 }
-                featureAbility.terminateSelf();
+                particleAbility.terminateSelf().then((data) => {
+                    console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+                  }).catch((error) => {
+                    console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+                  });
             }
         });
     },

ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts

@@ -14,7 +14,6 @@
  */
 import rpc from "@ohos.rpc";
 import particleAbility from '@ohos.ability.particleAbility'
-import featureAbility from '@ohos.ability.featureAbility'
 import commonEvent from '@ohos.commonEvent'
 var server_bundleName = "com.amsst.stserviceabilityserver";
 var server_abilityName = "com.amsst.stserviceabilityserver.ServiceAbility";
@@ -59,14 +58,22 @@ export default {
     onStop() {
         console.debug('ACTS_SerivceAbilityServerSecond ====<onStop');
         commonEvent.publish("ACTS_SerivceAbilityServerSecond_onStop", (err) => { });
-        featureAbility.terminateSelf();
+        particleAbility.terminateSelf().then((data) => {
+            console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+          }).catch((error) => {
+            console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+          });
     },
     onCommand(want, restart, startId) {
         console.debug('ACTS_SerivceAbilityServerSecond ====>onCommand='
             + "JSON(want)=" + JSON.stringify(want)
             + " ,restart=" + restart + " ,startId=" + startId);
         commonEvent.publish("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action, (err) => { });
-        featureAbility.terminateSelf();
+        particleAbility.terminateSelf().then((data) => {
+            console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+          }).catch((error) => {
+            console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+          });
     },
     onConnect(want) {
         console.info('ACTS_SerivceAbilityServerSecond ====< onConnect');
@@ -161,7 +168,11 @@ export default {
                             + ("json err=") + JSON.stringify(err) + " , " + want.action);
                     })
                 }
-                featureAbility.terminateSelf();
+                particleAbility.terminateSelf().then((data) => {
+                    console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
+                  }).catch((error) => {
+                    console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
+                  });
             }
         });
     },

ability/ability_runtime/formmanager/fa/BUILD.gn

@@ -56,7 +56,8 @@ group("formmanager") {
       "formsystemtest_ets/formgetformsinfotest/formswithoutpermtest:ActsFormsWithoutPermTest",
       "formsystemtest_ets/formgetformsinfotest/formszerotest:ActsFormsZeroTest",
       "formsystemtest_ets/formhostdeathrecipienttest:ActsFormHostDeathRecipientTest",
-      "formsystemtest_ets/formperformancetest:ActsFormPerformanceTest",
+
+      #"formsystemtest_ets/formperformancetest:ActsFormPerformanceTest",
       "formsystemtest_ets/formreleasetest:ActsFormReleaseTest",
       "formsystemtest_ets/formstatetest_disable:ActsFormStateDisableTest",
       "formsystemtest_ets/formstatetest_enable:ActsFormStateEnableTest",