From d5c5a6437c5390df18778dee8976faacc0af8c16 Mon Sep 17 00:00:00 2001
From: HuangXW <huangxinwei4@huawei.com>
Date: Fri, 31 Mar 2023 08:22:32 +0000
Subject: [PATCH] =?UTF-8?q?fixed=203dcb16c=20from=20https://gitee.com/H-xi?=
 =?UTF-8?q?nwei/xts=5Facts/pulls/7981=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=B5=8B=E8=AF=95hap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: HuangXW <huangxinwei4@huawei.com>
Change-Id: I3f25ab9fe5490d10c45e6d7b3a70f1cffb81171b
---
 .../actsserviceabilityserverrelyhap/BUILD.gn  |  40 ----
 .../entry/src/main/config.json                |  87 --------
 .../entry/src/main/ets/AbilityStage.ts        |  21 --
 .../src/main/ets/MainAbility/MainAbility.ts   |  44 ----
 .../entry/src/main/ets/MainAbility/app.ets    |  22 --
 .../src/main/ets/MainAbility/pages/index.ets  |  38 ----
 .../src/main/ets/MainAbility/pages/second.ets |  43 ----
 .../src/main/ets/ServiceAbility/service.ts    | 190 ------------------
 .../main/resources/base/element/string.json   |  36 ----
 .../src/main/resources/base/media/icon.png    | Bin 6790 -> 0 bytes
 .../signature/openharmony_sx.p7b              | Bin 3647 -> 0 bytes
 .../BUILD.gn                                  |  40 ----
 .../entry/src/main/config.json                |  87 --------
 .../entry/src/main/ets/AbilityStage.ts        |  21 --
 .../src/main/ets/MainAbility/MainAbility.ts   |  30 ---
 .../entry/src/main/ets/MainAbility/app.ets    |  22 --
 .../src/main/ets/MainAbility/pages/index.ets  |  38 ----
 .../src/main/ets/MainAbility/pages/second.ets |  43 ----
 .../src/main/ets/ServiceAbility/service.ts    | 186 -----------------
 .../main/resources/base/element/string.json   |  36 ----
 .../src/main/resources/base/media/icon.png    | Bin 6790 -> 0 bytes
 .../signature/openharmony_sx.p7b              | Bin 3652 -> 0 bytes
 22 files changed, 1024 deletions(-)
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/app.ets
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/index.ets
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/second.ets
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/element/string.json
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/media/icon.png
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/signature/openharmony_sx.p7b
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/app.ets
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/index.ets
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/second.ets
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/element/string.json
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/media/icon.png
 delete mode 100644 ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/signature/openharmony_sx.p7b

diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn
deleted file mode 100644
index 1fcfc3838..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/BUILD.gn
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_hap_assist_suite("ActsServiceAbilityServerRelyHap") {
-  hap_name = "ActsServiceAbilityServerRelyHap"
-  js_build_mode = "debug"
-  hap_profile = "entry/src/main/config.json"
-
-  testonly = true
-  deps = [
-    ":serviceability_resources",
-    ":serviceability_ts_assets",
-  ]
-  certificate_profile = "signature/openharmony_sx.p7b"
-  subsystem_name = "ability"
-  part_name = "ability_runtime"
-}
-
-ohos_js_assets("serviceability_ts_assets") {
-  source_dir = "entry/src/main/ets"
-  hap_profile = "entry/src/main/config.json"
-  ets2abc = true
-}
-
-ohos_resources("serviceability_resources") {
-  sources = [ "entry/src/main/resources" ]
-  hap_profile = "entry/src/main/config.json"
-}
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json
deleted file mode 100644
index f2165dcfe..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/config.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "app": {
-    "bundleName": "com.amsst.stserviceabilityserver",
-    "vendor": "test",
-    "version": {
-      "code": 1000110,
-      "name": "1.1.1"
-    },
-    "apiVersion": {
-      "compatible": 8,
-      "target": 9
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.amsst.stserviceabilityserver",
-    "name": ".MyApplication",
-    "mainAbility": ".MainAbility",
-    "srcPath": "",
-    "deviceType": [
-        "default",
-        "tablet"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "orientation": "unspecified",
-        "visible": true,
-        "srcPath": "MainAbility",
-        "name": ".MainAbility",
-        "srcLanguage": "ets",
-        "icon": "$media:icon",
-        "description": "$string:description_mainability",
-        "formsEnabled": false,
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      },
-      {
-        "srcPath": "ServiceAbility",
-        "name": ".ServiceAbility",
-        "icon": "$media:icon",
-        "srcLanguage": "ets",
-        "description": "$string:description_serviceability",
-        "visible": true,
-        "type": "service"
-      }
-    ],
-    "js": [
-      {
-        "mode": {
-          "syntax": "ets",
-          "type": "pageAbility"
-        },
-        "pages": [
-          "pages/index",
-          "pages/second"
-        ],
-        "name": ".MainAbility",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ],
-    "defPermissions": [
-      {
-        "name": "com.ohos.screenlock.DataAbilityShellProvider.PROVIDER"
-      }
-    ]
-  }
-}
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts
deleted file mode 100644
index 397f53c99..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/AbilityStage.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import AbilityStage from "@ohos.app.ability.AbilityStage"
-
-export default class MyAbilityStage extends AbilityStage {
-    onCreate() {
-        console.log("MyAbilityStage onCreate");
-    }
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts
deleted file mode 100644
index 0aa7fed2f..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import Ability from '@ohos.app.ability.UIAbility'
-export default class MainAbility extends Ability {
-    onCreate(want, launchParam) {
-        console.log("jws onCreate");
-    }
-
-    onDestroy() {
-        console.log("jws onDestroy");
-    }
-
-    onWindowStageCreate(windowStage) {
-        console.log("jws onWindowStageCreate");
-    }
-
-    onWindowStageDestroy() {
-        console.log("jws onWindowStageDestroy");
-    }
-
-    onForeground() {
-        console.log("jws onForeground");
-    }
-
-    onBackground() {
-        console.log("jws onBackground");
-    }
-
-    call(){
-
-    }
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/app.ets
deleted file mode 100644
index d0d2a5cd4..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/app.ets
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export default {
-  onCreate() {
-    console.info('Application onCreate')
-  },
-  onDestroy() {
-    console.info('Application onDestroy')
-  },
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/index.ets
deleted file mode 100644
index 442a0fea6..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/index.ets
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import {Core} from '@ohos/hypium'
-
-@Entry
-@Component
-struct Index {
-  aboutToAppear() {
-    console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    core.execute()
-  }
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text('Hello World')
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/second.ets b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/second.ets
deleted file mode 100644
index 359eb5ab9..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/MainAbility/pages/second.ets
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import router from '@system.router';
-
-@Entry
-@Component
-struct Second {
-  private content: string = "Second Page"
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text(`${this.content}`)
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-      Button() {
-        Text('back to index')
-          .fontSize(20)
-          .fontWeight(FontWeight.Bold)
-      }.type(ButtonType.Capsule)
-      .margin({
-        top: 20
-      })
-      .backgroundColor('#0D9FFB')
-      .onClick(() => {
-        router.back()
-      })
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file
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
deleted file mode 100644
index 28ea7474e..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/ets/ServiceAbility/service.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import rpc from "@ohos.rpc";
-import particleAbility from '@ohos.ability.particleAbility'
-import commonEvent from '@ohos.commonEvent'
-var serversecond_bundleName = "com.amsst.stserviceabilityserversecond";
-var serversecond_abilityName = "com.amsst.stserviceabilityserversecond.ServiceAbility";
-var mConnIdJs;
-class StubTest extends rpc.RemoteObject {
-    constructor(des) {
-        console.info('ACTS_SerivceAbilityServer ====< des = ' + des);
-        if (typeof des === 'string') {
-            console.info('ACTS_ super');
-            super(des);
-        } else {
-            return null;
-        }
-    }
-
-    onRemoteRequest(code, data, reply, option) {
-        if (code === 1) {
-            console.info("ACTS_SerivceAbilityServer ====< onRemoteRequest code = 1");
-            let token = data.readInterfaceToken();
-            console.log('ACTS_SerivceAbilityServer ====< onRemoteRequest token:' + token);
-            let num = data.readInt();
-            console.log('ACTS_SerivceAbilityServer ====< onRemoteRequest num:' + num);
-            this.method();
-            num = num + 777;
-            reply.writeInt(num);
-        } else {
-            console.info("ACTS_SerivceAbilityServer ====< onRemoteRequest code not 1");
-        }
-        return true;
-    }
-    method() {
-        console.log('ACTS_SerivceAbilityServer ====< method called.')
-    }
-}
-
-function sleep(delay) {
-    let start = new Date().getTime();
-    while (true) {
-        if (new Date().getTime() - start > delay) {
-            break;
-        }
-    }
-}
-
-export default {
-    onStart(want) {
-        console.debug('ACTS_SerivceAbilityServer 0425 ====>onStart .ts 0851 ='
-        + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServer_onStart", (err) => { });
-    },
-    onStop() {
-        console.debug('ACTS_SerivceAbilityServer ====<onStop');
-        commonEvent.publish("ACTS_SerivceAbilityServer_onStop", (err) => { });
-    },
-    onCommand(want, restart, startId) {
-        console.debug('ACTS_SerivceAbilityServer ====>onCommand='
-        + "JSON(want)=" + JSON.stringify(want)
-        + " ,restart=" + restart + " ,startId=" + startId);
-        if (want.action == 'ServiceStartService_0900') {
-            particleAbility.startAbility(
-                {
-                    want:
-                    {
-                        bundleName: serversecond_bundleName,
-                        abilityName: serversecond_abilityName,
-                        action: "ServiceStartService_0900",
-                    },
-                }
-            );
-            sleep(600)
-        } else if (want.action == 'ServiceStartService_1000') {
-            particleAbility.startAbility(
-                {
-                    want:
-                    {
-                        bundleName: serversecond_bundleName,
-                        abilityName: serversecond_abilityName,
-                        action: "ServiceStartService_1000",
-                    },
-                }, (err, data) => {
-                console.debug('ACTS_SerivceAbilityServer start Ability 1000 callback====='
-                + err + ', data= ' + data + " , JSON." + JSON.stringify(data));
-            }
-            );
-        } else {
-            commonEvent.publish("ACTS_SerivceAbilityServer_onCommand" + "_" + want.action, (err) => {
-                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.=====>'
-                        + want.action);
-                    }
-                } else {
-                    console.debug('ACTS_SerivceAbilityServer_onCommand publish err=====>' + err);
-                }
-            });
-        }
-    },
-    onConnect(want) {
-        console.info('ACTS_SerivceAbilityServer ====< onConnect');
-        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);
-                console.debug('ACTS_SerivceAbilityServer_onConnectCallback ====> element='
-                + JSON.stringify(element) + " , " + element);
-                console.debug('ACTS_SerivceAbilityServer_onConnectCallback ====> remote='
-                + JSON.stringify(remote) + " , " + remote);
-            }
-            function onDisconnectCallback(element) {
-                console.debug('ACTS_SerivceAbilityServer_onDisconnectCallback ====> element='
-                + JSON.stringify(element) + " , " + element);
-            }
-            function onFailedCallback(code) {
-                console.debug('ACTS_SerivceAbilityServer_onFailedCallback ====> code='
-                + JSON.stringify(code) + " , " + code)
-            }
-            if (want.action == 'ServiceConnectService_1300' || want.action == 'ServiceConnectService_1400'
-            || want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1600') {
-                mConnIdJs = particleAbility.connectAbility(
-                    {
-                        bundleName: serversecond_bundleName,
-                        abilityName: serversecond_abilityName,
-                        action: want.action,
-                    },
-                    {
-                        onConnect: onConnectCallback,
-                        onDisconnect: onDisconnectCallback,
-                        onFailed: onFailedCallback,
-                    },
-                )
-            }
-        } catch (err) {
-            console.log("ACTS_SerivceAbilityServer ====< error:" + err)
-        }
-        console.info('ACTS_SerivceAbilityServer ====< onConnect end');
-        return new StubTest("connect-test");
-    },
-    onDisconnect(want) {
-        console.debug('ACTS_SerivceAbilityServer ====>onDisConnect='
-        + want + " , JSON." + JSON.stringify(want));
-        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'
-        ) {
-            particleAbility.disconnectAbility(mConnIdJs, (err) => {
-                console.debug("=ACTS_SerivceAbilityServer_onDisConnect 13 14 15 16 err====>"
-                + ("json err=") + JSON.stringify(err) + " , " + want.action);
-            })
-        }
-    },
-    onReady() {
-        console.debug('ACTS_SerivceAbilityServer ====<onReady');
-    },
-    onReconnect(want) {
-        console.debug('ACTS_SerivceAbilityServer ====>onReconnect='
-        + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServer_onReconnect" + "_" + want.action, (err) => { });
-    },
-    OnAbilityConnectDone(element, remoteObject, resultCode) {
-        console.debug('ACTS_SerivceAbilityServer ====>OnAbilityConnectDone='
-        + element + " , JSON." + JSON.stringify(element)
-        + remoteObject + " , JSON." + JSON.stringify(remoteObject)
-        + resultCode + " , JSON." + JSON.stringify(resultCode)
-        );
-        commonEvent.publish("ACTS_SerivceAbilityServer_OnAbilityConnectDone", (err) => { });
-    },
-};
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/element/string.json
deleted file mode 100644
index 745bfaffc..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/element/string.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "ServiceExtAbility"
-    },
-    {
-      "name": "description_mainability",
-      "value": "eTS_Empty Ability"
-    },
-    {
-      "name": "description_serviceability",
-      "value": "hap sample empty service"
-    },
-    {
-      "name": "description_dataability",
-      "value": "hap sample empty provider"
-    },
-    {
-      "name": "description_mainability2",
-      "value": "eTS_Empty Ability"
-    },
-    {
-      "name": "entry_MainAbility2",
-      "value": "entry_MainAbility2"
-    },
-    {
-      "name": "description_testdataability",
-      "value": "hap sample empty provider"
-    },
-    {
-      "name": "permreason_dataability",
-      "value": "request dataability premission"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/entry/src/main/resources/base/media/icon.png
deleted file mode 100644
index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6790
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

diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/signature/openharmony_sx.p7b b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserverrelyhap/signature/openharmony_sx.p7b
deleted file mode 100644
index dfb6e4dcb65df300c2c54535cad7bf9c90d52274..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3647
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

diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn
deleted file mode 100644
index dbe9959e2..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/BUILD.gn
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2022 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//test/xts/tools/build/suite.gni")
-
-ohos_hap_assist_suite("ActsServiceAbilityServerSecondRelyHap") {
-  hap_name = "ActsServiceAbilityServerSecondRelyHap"
-  js_build_mode = "debug"
-  hap_profile = "entry/src/main/config.json"
-
-  testonly = true
-  deps = [
-    ":serviceability_resources",
-    ":serviceability_ts_assets",
-  ]
-  certificate_profile = "signature/openharmony_sx.p7b"
-  subsystem_name = "ability"
-  part_name = "ability_runtime"
-}
-
-ohos_js_assets("serviceability_ts_assets") {
-  source_dir = "entry/src/main/ets"
-  hap_profile = "entry/src/main/config.json"
-  ets2abc = true
-}
-
-ohos_resources("serviceability_resources") {
-  sources = [ "entry/src/main/resources" ]
-  hap_profile = "entry/src/main/config.json"
-}
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json
deleted file mode 100644
index 40040bf90..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/config.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "app": {
-    "bundleName": "com.amsst.stserviceabilityserversecond",
-    "vendor": "test",
-    "version": {
-      "code": 1000110,
-      "name": "1.1.1"
-    },
-    "apiVersion": {
-      "compatible": 8,
-      "target": 9
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.amsst.stserviceabilityserversecond",
-    "name": ".MyApplication",
-    "mainAbility": ".MainAbility",
-    "srcPath": "",
-    "deviceType": [
-        "default",
-        "tablet"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "orientation": "unspecified",
-        "visible": true,
-        "srcPath": "MainAbility",
-        "name": ".MainAbility",
-        "srcLanguage": "ets",
-        "icon": "$media:icon",
-        "description": "$string:description_mainability",
-        "formsEnabled": false,
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      },
-      {
-        "srcPath": "ServiceAbility",
-        "name": ".ServiceAbility",
-        "icon": "$media:icon",
-        "srcLanguage": "ets",
-        "description": "$string:description_serviceability",
-        "visible": true,
-        "type": "service"
-      }
-    ],
-    "js": [
-      {
-        "mode": {
-          "syntax": "ets",
-          "type": "pageAbility"
-        },
-        "pages": [
-          "pages/index",
-          "pages/second"
-        ],
-        "name": ".MainAbility",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ],
-    "defPermissions": [
-      {
-        "name": "com.ohos.screenlock.DataAbilityShellProvider.PROVIDER"
-      }
-    ]
-  }
-}
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts
deleted file mode 100644
index 397f53c99..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/AbilityStage.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import AbilityStage from "@ohos.app.ability.AbilityStage"
-
-export default class MyAbilityStage extends AbilityStage {
-    onCreate() {
-        console.log("MyAbilityStage onCreate");
-    }
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts
deleted file mode 100644
index 0457c24cd..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/MainAbility.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import Ability from '@ohos.app.ability.UIAbility'
-export default class MainAbility extends Ability {
-    onCreate(want, launchParam) {
-        console.log("jws onCreate");
-    }
-
-    onDestroy() {
-        console.log("jws onDestroy");
-    }
-
-    onWindowStageCreate(windowStage) {
-        console.log("jws onWindowStageCreate");
-    }
-
-    onWindowStageDestroy() {
-        console.log("jws onWindowStageDestroy");
-    }
-
-    onForeground() {
-        console.log("jws onForeground");
-    }
-
-    onBackground() {
-        console.log("jws onBackground");
-    }
-
-    call(){
-
-    }
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/app.ets b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/app.ets
deleted file mode 100644
index d0d2a5cd4..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/app.ets
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-export default {
-  onCreate() {
-    console.info('Application onCreate')
-  },
-  onDestroy() {
-    console.info('Application onDestroy')
-  },
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/index.ets b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/index.ets
deleted file mode 100644
index 442a0fea6..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/index.ets
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import {Core} from '@ohos/hypium'
-
-@Entry
-@Component
-struct Index {
-  aboutToAppear() {
-    console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    core.execute()
-  }
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text('Hello World')
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/second.ets b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/second.ets
deleted file mode 100644
index 359eb5ab9..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/MainAbility/pages/second.ets
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import router from '@system.router';
-
-@Entry
-@Component
-struct Second {
-  private content: string = "Second Page"
-
-  build() {
-    Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
-      Text(`${this.content}`)
-        .fontSize(50)
-        .fontWeight(FontWeight.Bold)
-      Button() {
-        Text('back to index')
-          .fontSize(20)
-          .fontWeight(FontWeight.Bold)
-      }.type(ButtonType.Capsule)
-      .margin({
-        top: 20
-      })
-      .backgroundColor('#0D9FFB')
-      .onClick(() => {
-        router.back()
-      })
-    }
-    .width('100%')
-    .height('100%')
-  }
-}
\ No newline at end of file
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
deleted file mode 100644
index 519bd96b3..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/ets/ServiceAbility/service.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import rpc from "@ohos.rpc";
-import particleAbility from '@ohos.ability.particleAbility'
-import commonEvent from '@ohos.commonEvent'
-var server_bundleName = "com.amsst.stserviceabilityserver";
-var server_abilityName = "com.amsst.stserviceabilityserver.ServiceAbility";
-var mConnIdJs;
-class StubTest extends rpc.RemoteObject {
-    constructor(des) {
-        console.info('ACTS_SerivceAbilityServerSecond ====< des = ' + des);
-        if (typeof des === 'string') {
-            console.info('ACTS_ super');
-            super(des);
-        } else {
-            return null;
-        }
-    }
-
-    onRemoteRequest(code, data, reply, option) {
-        if (code === 1) {
-            console.info("ACTS_SerivceAbilityServerSecond ====< onRemoteRequest code = 1");
-            let token = data.readInterfaceToken();
-            console.log('ACTS_SerivceAbilityServerSecond ====< onRemoteRequest token:' + token);
-            let num = data.readInt();
-            console.log('ACTS_SerivceAbilityServerSecond ====< onRemoteRequest num:' + num);
-            this.method();
-            num = num + 777;
-            reply.writeInt(num);
-        } else {
-            console.info("ACTS_SerivceAbilityServerSecond ====< onRemoteRequest code not 1");
-        }
-        return true;
-    }
-    method() {
-        console.log('ACTS_SerivceAbilityServerSecond ====< method called.')
-    }
-}
-
-function sleep(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-export default {
-    onStart(want) {
-        console.debug('ACTS_SerivceAbilityServerSecond ====>onStart='
-        + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onStart", (err) => { });
-    },
-    onStop() {
-        console.debug('ACTS_SerivceAbilityServerSecond ====<onStop');
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onStop", (err) => { });
-    },
-    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) => {
-            console.debug("ACTS_SerivceAbilityServerSecond_onCommand" + "_" + want.action +
-            "err: " + JSON.stringify(err))
-        });
-        sleep(500)
-    },
-    onConnect(want) {
-        console.info('ACTS_SerivceAbilityServerSecond ====< onConnect');
-        try {
-            console.debug('ACTS_SerivceAbilityServerSecond ====>onConnect='
-            + want + " , JSON." + JSON.stringify(want));
-            function onConnectCallback(element, remote) {
-                console.debug('ACTS_SerivceAbilityServerSecond_onConnectCallback ====> want.action='
-                + JSON.stringify(want.action) + " , " + want.action);
-                console.debug('ACTS_SerivceAbilityServerSecond_onConnectCallback ====> element='
-                + JSON.stringify(element) + " , " + element);
-                console.debug('ACTS_SerivceAbilityServerSecond_onConnectCallback ====> remote='
-                + JSON.stringify(remote) + " , " + remote);
-                if (want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1600') {
-                    commonEvent.publish("ACTS_SerivceAbilityServerSecond_onConnect" + "_" + want.action, (err) => {
-                        console.debug("publish = ACTS_SerivceAbilityServerSecond_onConnect" + "_" + want.action);
-                    });
-                }
-            }
-
-            function onDisconnectCallback(element) {
-                console.debug('ACTS_SerivceAbilityServerSecond_onDisconnectCallback ====> element='
-                + JSON.stringify(element) + " , " + element);
-            }
-
-            function onFailedCallback(code) {
-                console.debug('ACTS_SerivceAbilityServerSecond_onFailedCallback ====> code='
-                + JSON.stringify(code) + " , " + code)
-            }
-            if (want.action == 'ServiceConnectService_1500') {
-                mConnIdJs = particleAbility.connectAbility(
-                    {
-                        bundleName: server_bundleName,
-                        abilityName: server_abilityName,
-                        action: "ServiceConnectService_1501",
-                    },
-                    {
-                        onConnect: onConnectCallback,
-                        onDisconnect: onDisconnectCallback,
-                        onFailed: onFailedCallback,
-                    },
-                )
-            } else if (want.action == 'ServiceConnectService_1600') {
-                mConnIdJs = particleAbility.connectAbility(
-                    {
-                        bundleName: server_bundleName,
-                        abilityName: server_abilityName,
-                        action: "ServiceConnectService_1601",
-                    },
-                    {
-                        onConnect: onConnectCallback,
-                        onDisconnect: onDisconnectCallback,
-                        onFailed: onFailedCallback,
-                    },
-                )
-            } else if (want.action == 'ServiceConnectService_1590') {
-                mConnIdJs = particleAbility.connectAbility(
-                    {
-                        bundleName: server_bundleName,
-                        abilityName: server_abilityName,
-                        action: "ServiceConnectService_1591",
-                    },
-                    {
-                        onConnect: onConnectCallback,
-                        onDisconnect: onDisconnectCallback,
-                        onFailed: onFailedCallback,
-                    },
-                )
-            } else {
-                commonEvent.publish("ACTS_SerivceAbilityServerSecond_onConnect" + "_" + want.action, (err) => { });
-            }
-        } catch (err) {
-            console.log("ACTS_SerivceAbilityServerSecond ====< error:" + err)
-        }
-        console.info('ACTS_SerivceAbilityServerSecond ====< onConnect end');
-        return new StubTest("connect-test");
-    },
-    onDisconnect(want) {
-        console.debug('ACTS_SerivceAbilityServerSecond ====>onDisConnect='
-        + want + " , JSON." + JSON.stringify(want));
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_onDisConnect_" + want.action, (err) => {
-            if (err.code) {
-                console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect publish err=====>' + err);
-            } else {
-                console.debug('ACTS_SerivceAbilityServerSecond_onDisConnect =====<'
-                + want.action);
-                if (want.action == 'ServiceConnectService_1500' || want.action == 'ServiceConnectService_1501'
-                || want.action == 'ServiceConnectService_1600' || want.action == 'ServiceConnectService_1601'
-                || want.action == 'ServiceConnectService_1590') {
-                    particleAbility.disconnectAbility(mConnIdJs, (err) => {
-                        console.debug("=ACTS_SerivceAbilityServerSecond_onDisConnect err====>"
-                        + ("json err=") + JSON.stringify(err) + " , " + want.action);
-                    })
-                }
-            }
-        });
-    },
-    onReady() {
-        console.debug('ACTS_SerivceAbilityServerSecond ====<onReady');
-    },
-    onReconnect(want) {
-        console.debug('ACTS_SerivceAbilityServerSecond ====>onReconnect='
-        + want + " , JSON." + JSON.stringify(want));
-    },
-    OnAbilityConnectDone(element, remoteObject, resultCode) {
-        console.debug('ACTS_SerivceAbilityServerSecond ====>OnAbilityConnectDone='
-        + element + " , JSON." + JSON.stringify(element)
-        + remoteObject + " , JSON." + JSON.stringify(remoteObject)
-        + resultCode + " , JSON." + JSON.stringify(resultCode)
-        );
-        commonEvent.publish("ACTS_SerivceAbilityServerSecond_OnAbilityConnectDone", (err) => { });
-    },
-};
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/element/string.json b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/element/string.json
deleted file mode 100644
index 745bfaffc..000000000
--- a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/element/string.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "ServiceExtAbility"
-    },
-    {
-      "name": "description_mainability",
-      "value": "eTS_Empty Ability"
-    },
-    {
-      "name": "description_serviceability",
-      "value": "hap sample empty service"
-    },
-    {
-      "name": "description_dataability",
-      "value": "hap sample empty provider"
-    },
-    {
-      "name": "description_mainability2",
-      "value": "eTS_Empty Ability"
-    },
-    {
-      "name": "entry_MainAbility2",
-      "value": "entry_MainAbility2"
-    },
-    {
-      "name": "description_testdataability",
-      "value": "hap sample empty provider"
-    },
-    {
-      "name": "permreason_dataability",
-      "value": "request dataability premission"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/media/icon.png b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/entry/src/main/resources/base/media/icon.png
deleted file mode 100644
index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6790
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

diff --git a/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/signature/openharmony_sx.p7b b/ability/ability_runtime/actsserviceabilityclienttest/actsserviceabilityserversecondrelyhap/signature/openharmony_sx.p7b
deleted file mode 100644
index d5045699f9afd0744b5242377794d4d091e63201..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3652
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

-- 
GitLab