From 409506fcbd77b84205f993762feacf7193548499 Mon Sep 17 00:00:00 2001
From: HuangXW <huangxinwei4@huawei.com>
Date: Thu, 29 Sep 2022 11:35:48 +0800
Subject: [PATCH] =?UTF-8?q?XTS=20ServiceAbilityTest=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I690725a7ba5e5a0be27a0f996330ee6cf1d653c5
Signed-off-by: HuangXW <huangxinwei4@huawei.com>
---
 .../src/main/ets/ServiceAbility/service.ts    | 29 ++-----------------
 .../src/main/ets/ServiceAbility/service.ts    | 17 +----------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts
index 1ce8cbf69..767c05109 100644
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts
+++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts
@@ -67,11 +67,6 @@ export default {
     onStop() {
         console.debug('ACTS_SerivceAbilityServer ====<onStop');
         commonEvent.publish("ACTS_SerivceAbilityServer_onStop", (err) => { });
-        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='
@@ -88,12 +83,7 @@ export default {
                     },
                 }
             );
-	    sleep(600)
-            particleAbility.terminateSelf().then((data) => {
-                console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
-            }).catch((error) => {
-                console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
-            });
+	        sleep(600)
         } else if (want.action == 'ServiceStartService_1000') {
             particleAbility.startAbility(
                 {
@@ -106,11 +96,6 @@ export default {
                 }, (err, data) => {
                     console.debug('ACTS_SerivceAbilityServer start Ability 1000 callback====='
                         + err + ', data= ' + data + " , JSON." + JSON.stringify(data));
-                    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 {
@@ -118,13 +103,8 @@ export default {
                 if (!err.code) {
                     if (want.action == 'PageStartService_0100' || want.action == 'PageStartService_0200'
                         || want.action == 'PageStartService_0301' || want.action == 'PageStartService_0401') {
-                        console.debug('ACTS_SerivceAbilityServer_onCommand 100 200 301 401.terminateSelf()=====>'
+                        console.debug('ACTS_SerivceAbilityServer_onCommand 100 200 301 401.=====>'
                             + want.action);
-                        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);
@@ -190,11 +170,6 @@ export default {
                     + ("json err=") + JSON.stringify(err) + " , " + want.action);
             })
         }
-        particleAbility.terminateSelf().then((data) => {
-            console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
-        }).catch((error) => {
-            console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
-        });
     },
     onReady() {
         console.debug('ACTS_SerivceAbilityServer ====<onReady');
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts
index e20a6e861..3971a2563 100644
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts
+++ b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts
@@ -61,11 +61,6 @@ export default {
     onStop() {
         console.debug('ACTS_SerivceAbilityServerSecond ====<onStop');
         commonEvent.publish("ACTS_SerivceAbilityServerSecond_onStop", (err) => { });
-        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='
@@ -76,11 +71,6 @@ export default {
             "err: " + JSON.stringify(err))
          });
         sleep(500)
-        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');
@@ -165,7 +155,7 @@ export default {
             if (err.code) {
                 console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect publish err=====>' + err);
             } else {
-                console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect featureAbility.terminateSelf()=====<'
+                console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect =====<'
                     + want.action);
                 if (want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1501'
                     || want.action == 'ServiceConnectService_1600' || want.action == 'ServiceConnectService_1601'
@@ -175,11 +165,6 @@ export default {
                             + ("json err=") + JSON.stringify(err) + " , " + want.action);
                     })
                 }
-                particleAbility.terminateSelf().then((data) => {
-                    console.log('ACTS_SerivceAbilityServer terminateSelf data:' + JSON.stringify(data));
-                }).catch((error) => {
-                    console.log('ACTS_SerivceAbilityServer terminateSelf error:' + JSON.stringify(error));
-                });
             }
         });
     },
-- 
GitLab