fixed 13f2f628 from https://gitee.com/H-xinwei/xts_acts/pulls/6028

FaApiTest serviceAbility关联启动适配

Change-Id: I80bcf74dd5c9a2631a2bc46cd7c178200c16fc5a
Signed-off-by: NHuangXW <huangxinwei4@huawei.com>

ability/ability_runtime/faapicover/faapicoverhaptest/BUILD.gn

@@ -18,7 +18,6 @@ ohos_js_hap_suite("ActsFaApiCoverTest") {
   deps = [
     ":faapicoverhaptest_ets_assets",
     ":faapicoverhaptest_ets_resources",
-    ":faapicoverhaptest_ets_test_assets",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
@@ -27,10 +26,9 @@ ohos_js_hap_suite("ActsFaApiCoverTest") {
   part_name = "ability_runtime"
 }
 ohos_js_assets("faapicoverhaptest_ets_assets") {
-  source_dir = "./entry/src/main/ets/MainAbility"
-}
-ohos_js_assets("faapicoverhaptest_ets_test_assets") {
-  source_dir = "./entry/src/main/ets/TestAbility"
+  source_dir = "entry/src/main/ets"
+  hap_profile = "entry/src/main/config.json"
+  ets2abc = true
 }
 ohos_resources("faapicoverhaptest_ets_resources") {
   sources = [ "./entry/src/main/resources" ]

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/config.json

@@ -54,6 +54,24 @@
           "type": "page",
           "visible": true,
           "launchType": "singleton"
+      },
+      {
+        "srcPath": "ServiceAbility",
+        "name": ".ServiceAbility",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:ServiceAbility_desc",
+        "type": "service",
+        "visible": true
+      },
+      {
+        "srcPath": "ServiceAbility2",
+        "name": ".ServiceAbility2",
+        "srcLanguage": "ets",
+        "icon": "$media:icon",
+        "description": "$string:ServiceAbility2_desc",
+        "type": "service",
+        "visible": true
       }
     ],
     "distro": {

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/ServiceAbility/service.ts

+/*
+ * 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 commonEvent from '@ohos.commonEvent';
+import ability_particleAbility from '@ohos.ability.particleAbility';
+
+class StubTest1 extends rpc.RemoteObject {
+    constructor(des) {
+        if (typeof des === 'string') {
+            super(des);
+        }
+        else {
+            return null;
+        }
+    }
+    queryLocalInterface(descriptor) {
+        return null;
+    }
+    getInterfaceDescriptor() {
+        return "";
+    }
+    sendRequest(code, data, reply, options) {
+        return null;
+    }
+    getCallingPid() {
+        return 0;
+    }
+    getCallingUid() {
+        return 0;
+    }
+    attachLocalInterface(localInterface, descriptor) { }
+    onRemoteRequest(code, data, reply, options) {
+        console.info(printLogS1 + "onRemoteRequest");
+        if (code == 1) {
+            console.info(printLogS1 + "onRemoteRequest code 1");
+            let op1 = data.readInt();
+            let op2 = data.readInt();
+            console.info(printLogS1 + "onRemoteRequest op1 = " + op1 + ", op2 = " + op2);
+            reply.writeInt(op1 + op2);
+        }
+        else {
+            console.info(printLogS1 + "onRemoteRequest code = " + code);
+        }
+        return true;
+    }
+}
+
+var printLogS1 = "Fa:Auxiliary:ServiceAbility:";
+var listPushS1 = "Fa_Auxiliary_ServiceAbility_";
+export default {
+    onStart() {
+        console.info(printLogS1 + 'onStart');
+
+        commonEvent.publish(listPushS1 + "onStart", (err) => {
+            console.info(printLogS1 + listPushS1 + "onStart");
+        });
+    },
+    onStop() {
+        console.info(printLogS1 + 'onStop');
+
+        commonEvent.publish(listPushS1 + "onStop", (err) => {
+            console.info(printLogS1 + listPushS1 + "onStop");
+        });
+    },
+    onCommand(want, startId) {
+        console.info(printLogS1 + 'onCommand');
+
+        commonEvent.publish(listPushS1 + "onCommand", (err) => {
+            console.info(printLogS1 + listPushS1 + "onCommand");
+        });
+
+        setTimeout(()=>{
+            ability_particleAbility.terminateSelf().then((data) => {
+                console.info(printLogS1 + "terminateSelf data = " + JSON.stringify(data));
+            }).catch((err) => {
+                console.info(printLogS1 + "terminateSelf err = " + JSON.stringify(err));
+            });
+        }, 3000)
+    },
+    onConnect(want) {
+        console.info(printLogS1 + 'onConnect');
+
+        return new StubTest1("Test1");
+    },
+    onDisconnect(want) {
+        console.info(printLogS1 + 'onDisconnect');
+    },
+    onReconnect(want) {
+        console.info(printLogS1 + 'onReconnect');
+    }
+};
\ No newline at end of file

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/ServiceAbility2/service.ts

+/*
+ * 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 commonEvent from '@ohos.commonEvent';
+
+class StubTest2 extends rpc.RemoteObject {
+    constructor(des) {
+        if (typeof des === 'string') {
+            super(des);
+        }
+        else {
+            return null;
+        }
+    }
+    queryLocalInterface(descriptor) {
+        return null;
+    }
+    getInterfaceDescriptor() {
+        return "";
+    }
+    sendRequest(code, data, reply, options) {
+        return null;
+    }
+    getCallingPid() {
+        return 0;
+    }
+    getCallingUid() {
+        return 0;
+    }
+    attachLocalInterface(localInterface, descriptor) { }
+    onRemoteRequest(code, data, reply, options) {
+        console.info(printLogS1 + "onRemoteRequest");
+        if (code == 1) {
+            console.info(printLogS1 + "onRemoteRequest code 1");
+            let op1 = data.readInt();
+            let op2 = data.readInt();
+            console.info(printLogS1 + "onRemoteRequest op1 = " + op1 + ", op2 = " + op2);
+            reply.writeInt(op1 + op2);
+        }
+        else {
+            console.info(printLogS1 + "onRemoteRequest code = " + code);
+        }
+        return true;
+    }
+}
+
+var printLogS1 = "Fa:Auxiliary:ServiceAbility2:";
+var listPushS1 = "Fa_Auxiliary_ServiceAbility2_";
+export default {
+    onStart() {
+        console.info(printLogS1 + 'onStart');
+    },
+    onStop() {
+        console.info(printLogS1 + 'onStop');
+    },
+    onCommand(want, startId) {
+        console.info(printLogS1 + 'onCommand');
+    },
+    onConnect(want) {
+        console.info(printLogS1 + 'onConnect');
+
+        commonEvent.publish(listPushS1 + "onConnect", (err) => {
+            console.info(printLogS1 + listPushS1 + "onCreate");
+        });
+
+        return new StubTest2("Test1");
+    },
+    onDisconnect(want) {
+        console.info(printLogS1 + 'onDisconnect');
+
+        commonEvent.publish(listPushS1 + "onDisconnect", (err) => {
+            console.info(printLogS1 + listPushS1 + "onDisconnect");
+        });
+    },
+    onReconnect(want) {
+        console.info(printLogS1 + 'onReconnect');
+    }
+};
\ No newline at end of file

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/ets/test/VerificationTest.ets

@@ -307,8 +307,8 @@ export default function verificationTest(){
 
         let wantNum = {
           want: {
-            bundleName: 'ohos.acts.aafwk.test.faauxiliary',
-            abilityName: 'ohos.acts.aafwk.test.faauxiliary.ServiceAbility'
+            bundleName: 'com.example.faapicoverhaptest',
+            abilityName: 'com.example.faapicoverhaptest.ServiceAbility'
           }
         }
         await ability_featureAbility.startAbility(wantNum).then((data) => {
@@ -406,8 +406,8 @@ export default function verificationTest(){
           }
         };
         let wantNum = {
-          bundleName: 'ohos.acts.aafwk.test.faauxiliary',
-          abilityName: 'ohos.acts.aafwk.test.faauxiliary.ServiceAbility2'
+          bundleName: 'com.example.faapicoverhaptest',
+          abilityName: 'com.example.faapicoverhaptest.ServiceAbility2'
         }
         let num = ability_featureAbility.connectAbility(wantNum, options)
       } catch (err) {

ability/ability_runtime/faapicover/faapicoverhaptest/entry/src/main/resources/base/element/string.json

@@ -19,6 +19,14 @@
     {
         "name": "TestAbility_label",
         "value": "label"
+    },
+    {
+      "name": "ServiceAbility_desc",
+      "value": "hap sample empty service"
+    },
+    {
+      "name": "ServiceAbility2_desc",
+      "value": "hap sample empty service"
     }
   ]
 }
\ No newline at end of file