!5570 ActsServiceAbilityClientTest测试套用例优化

Merge pull request !5570 from chengxingzhen/cherry-pick-1663732072

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

@@ -48,7 +48,6 @@ class StubTest extends rpc.RemoteObject {
         console.log('ACTS_SerivceAbilityServer ====< method called.')
     }
 }
-
 export default {
     onStart(want) {
         console.debug('ACTS_SerivceAbilityServer 0425 ====>onStart .ts 0851 ='
@@ -127,6 +126,7 @@ export default {
         try {
             console.debug('ACTS_SerivceAbilityServer ====>onConnect='
                 + want + " , JSON." + JSON.stringify(want));
+            commonEvent.publish("ACTS_SerivceAbilityServer_onConnect" + "_" + want.action, (err) => { });
             function onConnectCallback(element, remote) {
                 console.debug('ACTS_SerivceAbilityServer_onConnectCallback ====> mConnIdJs='
                     + JSON.stringify(mConnIdJs) + " , " + mConnIdJs);
@@ -157,8 +157,6 @@ export default {
                         onFailed: onFailedCallback,
                     },
                 )
-            } else {
-                commonEvent.publish("ACTS_SerivceAbilityServer_onConnect" + "_" + want.action, (err) => { });
             }
         } catch (err) {
             console.log("ACTS_SerivceAbilityServer ====< error:" + err)
@@ -169,12 +167,9 @@ export default {
     onDisconnect(want) {
         console.debug('ACTS_SerivceAbilityServer ====>onDisConnect='
             + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServer_onDisConnect", (err) => {
-            if (err.code) {
-                console.debug('ACTS_SerivceAbilityServer_onDisConnect publish err=====>' + err);
-            } else {
-                console.debug('ACTS_SerivceAbilityServer_onDisConnect featureAbility.terminateSelf()=====<'
-                    + want.action);
+        commonEvent.publish("ACTS_SerivceAbilityServer_onDisConnect_" + want.action, (err) => {
+            console.debug('ACTS_SerivceAbilityServer_onDisConnect ===' + want.action);
+        });
         if (want.action == 'ServiceConnectService_1300' || want.action == 'ServiceConnectService_1400'
             || want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1501'
             || want.action == 'ServiceConnectService_1600' || want.action == 'ServiceConnectService_1601'
@@ -189,8 +184,6 @@ export default {
         }).catch((error) => {
             console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
         });
-            }
-        });
     },
     onReady() {
         console.debug('ACTS_SerivceAbilityServer ====<onReady');

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

@@ -49,6 +49,9 @@ class StubTest extends rpc.RemoteObject {
     }
 }
 
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
 export default {
     onStart(want) {
         console.debug('ACTS_SerivceAbilityServerSecond ====>onStart='
@@ -68,7 +71,11 @@ export default {
         console.debug('ACTS_SerivceAbilityServerSecond ====>onCommand='
             + "JSON(want)=" + JSON.stringify(want)
             + " ,restart=" + restart + " ,startId=" + startId);
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action, (err) => { });
+        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action, (err) => {
+            console.debug("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action +
+            "err: " + JSON.stringify(err))
+         });
+        sleep(500)
         particleAbility.terminateSelf().then((data) => {
             console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
         }).catch((error) => {
@@ -154,7 +161,7 @@ export default {
     onDisconnect(want) {
         console.debug('ACTS_SerivceAbilityServerSecond ====>onDisConnect='
             + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect", (err) => {
+        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect_" + want.action, (err) => {
             if (err.code) {
                 console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect publish err=====>' + err);
             } else {