diff --git a/communication/BUILD.gn b/communication/BUILD.gn index ffa59fc7f510c4e0c10aaec9db3a2dc7bb036048..7676dd882d511ccb6eaa48aa8bf99354620e6891 100755 --- a/communication/BUILD.gn +++ b/communication/BUILD.gn @@ -15,11 +15,7 @@ import("//build/ohos_var.gni") group("communication") { testonly = true if (is_standard_system) { - deps = [ - #"ipcrpc_standard/ipcrpcservice:ipcrpcService", - #"ipcrpc_standard/ipcrpctest:ipcrpcTest", - "wifi_standard:wifi_standard_test", - ] + deps = [ "wifi_standard:wifi_standard_test" ] } else { deps = [ "wifi_standard:wifi_standard_test" ] } diff --git a/communication/ipcrpc_standard/ipcrpcservice/BUILD.gn b/communication/ipcrpc_standard/ipcrpcservice/BUILD.gn deleted file mode 100644 index 3eaf978343f0a3cb32e9f7a305f6e3d6195c977c..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2021 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_js_hap_suite("ipcrpcService") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":ipcrpcService_assets", - ":ipcrpcService_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsIpcRpcServiceTest" -} -ohos_js_assets("ipcrpcService_assets") { - source_dir = "./entry/src/main/js/default" -} -ohos_resources("ipcrpcService_resources") { - sources = [ "./entry/src/main/resources" ] - hap_profile = "./entry/src/main/config.json" -} diff --git a/communication/ipcrpc_standard/ipcrpcservice/Test.json b/communication/ipcrpc_standard/ipcrpcservice/Test.json deleted file mode 100644 index 9ad332e8e0e59e50ca68954381de3248bff89273..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/Test.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "description": "Configuration for ipcrpc Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "120000", - "package": "ohos.acts.ipcrpctest", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsIpcRpcServiceTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/config.json b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/config.json deleted file mode 100644 index 89105c962fcfce4f7c6c4af2acbe5bc2591e266a..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/config.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "app": { - "bundleName": "ohos.acts.ipcrpcservice", - "vendor": "ipcrpc", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "ohos.acts.ipcrpcservice", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "ohos.acts.ipcrpcservice.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "MyApplication", - "type": "service", - "launchType": "standard", - "visible": true - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/app.js b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/app.js deleted file mode 100644 index 83cc355c87c42fd4f00b239657d2c081cf0e9aa0..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/app.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2021 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 device from '@system.device'; - -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/i18n/en-US.json b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/i18n/en-US.json deleted file mode 100644 index 5e396fab958acc7a8495120d7729f1bb07ea9d0f..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "RpcService" - } -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/i18n/zh-CN.json b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index 5e396fab958acc7a8495120d7729f1bb07ea9d0f..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "RpcService" - } -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.css b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.css deleted file mode 100644 index 3f824010b89c292c83f8da1b035e9271004c4158..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2021 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. - */ - -.container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - left: 0px; - top: 0px; - width: 100%; - height: 100%; -} - -.title { - font-size: 30px; - text-align: center; - width: 100%; - height: 40%; - margin: 10px; -} -.btn { - width: 50%; - height: 100px; - font-size: 20px; -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.hml b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.hml deleted file mode 100644 index 07f9a925b9919454296717d57d9cdb287e200d84..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,20 +0,0 @@ - - -
- - {{ $t('strings.hello') }} {{title}} - -
diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.js b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.js deleted file mode 100644 index e65665f1f282bb109f53b84a90da85d7276c30d1..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (C) 2021 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'; - -const CODE_BASIC = 1; -const CODE_TRANS_BASIC = 2; -const CODE_TRANS_ARRAY = 3; -const CODE_TRANS_STRING = 4; - -const CODE_GET_OBJECT = 10; -const CODE_GET_OBJECTS = 11; -const CODE_GET_OBJECTS_MIX = 12; -const CODE_GET_OBJECT_CALL = 13; -const CODE_GET_OBJECT_DESC = 14; - -const CODE_GET_CALL_PID = 20; -const CODE_GET_CALL_UID = 21; -const CODE_CHECK_LOCAL_CALL = 22; - -let gBasicStub; -let gExtendStub; -let gBasicStubDesc = "Basic_Stub_Desc"; -let gExtendStubDesc = "Extend_Stub_Desc"; - -const TAG = "[IpcRpcService]"; - -function logInfo(logContent) { - console.info(TAG + logContent); -} - -class BasicStub extends rpc.RemoteObject { - constructor(des) { - if (typeof des === 'string') { - super(des, des.length); - } - return null; - } - onRemoteRequest(code, data, reply, option) { - logInfo("start call code is:" + code) - if (code === CODE_BASIC) { - logInfo("entry basic(add)"); - let add1 = data.readInt(); - let add2 = data.readInt(); - let addResult = add1 + add2; - logInfo("read data int1:" + add1 + ",int2:" + add2 + ",add rst:" + addResult); - let isOk = reply.writeInt(addResult); - logInfo("writeInt ret:" + isOk); - return true; - } else if(code === CODE_TRANS_BASIC) { - logInfo("entry trans basic data type"); - this.transBasic(data, reply); - return true; - } else if (code === CODE_GET_OBJECT) { - logInfo("entry get remote object(basic)") - let strArray = data.readStringArray(); - logInfo("read string array:" + strArray); - let isOk = reply.writeRemoteObject(gBasicStub); - if (isOk) { - logInfo("writeRemoteObject success"); - } else { - logInfo("writeRemoteObject fail"); - } - return true; - } else if (code === CODE_GET_OBJECTS) { - logInfo("entry get three remote object(basic)"); - let strArray = data.readStringArray(); - logInfo("read string array:" + strArray); - let isOk = reply.writeRemoteObject(gBasicStub); - if (isOk) { - logInfo("writeRemoteObject1 success"); - } else { - logInfo("writeRemoteObject1 fail"); - } - isOk = reply.writeRemoteObject(gBasicStub); - if (isOk) { - logInfo("writeRemoteObject2 success"); - } else { - logInfo("writeRemoteObject2 fail"); - } - isOk = reply.writeRemoteObject(gBasicStub); - if (isOk) { - logInfo("writeRemoteObject3 success"); - } else { - logInfo("writeRemoteObject3 fail"); - } - return true; - } else if (code === CODE_GET_OBJECTS_MIX) { - logInfo("entry get two remote object(extend and basic)"); - let isOk = reply.writeRemoteObject(gExtendStub); - if (isOk) { - logInfo("writeRemoteObject[extend] success"); - } else { - logInfo("writeRemoteObject[extend] fail"); - } - isOk = reply.writeRemoteObject(gBasicStub); - if (isOk) { - logInfo("writeRemoteObject[basic] success"); - } else { - logInfo("writeRemoteObject[basic] fail"); - } - return true; - } else if (code === CODE_GET_OBJECT_CALL) { - logInfo("entry get remote object(extend) to call"); - let isOk = reply.writeRemoteObject(gExtendStub); - if (isOk) { - logInfo("writeRemoteObject[extend] success"); - } else { - logInfo("writeRemoteObject[extend] fail"); - } - return true; - } else if (code === CODE_GET_OBJECT_DESC) { - logInfo("entry get object desc(basic and extend)"); - let basicDesc = gBasicStub.getInterfaceDescriptor(); - let extendDesc = gExtendStub.getInterfaceDescriptor(); - let isOk = reply.writeString(basicDesc); - if (isOk) { - logInfo("writeString[basic] success"); - } else { - logInfo("writeString[basic] fail"); - } - isOk = reply.writeString(extendDesc); - if (isOk) { - logInfo("writeString[extend] success"); - } else { - logInfo("writeString[extend] fail"); - } - return true; - } else if (code === CODE_GET_CALL_UID) { - logInfo("entry get call uid"); - let callUid = rpc.IPCSkeleton.getCallingUid(); - logInfo("get call uid:" + callUid); - let isOk = reply.writeInt(callUid); - if (isOk) { - logInfo("writeInt[call uid] success"); - } else { - logInfo("writeInt[call uid] fail"); - } - return true; - } else if (code === CODE_GET_CALL_PID) { - logInfo("entry get call pid"); - let callPid = rpc.IPCSkeleton.getCallingPid(); - logInfo("get call pid:" + callPid); - let isOk = reply.writeInt(callPid); - if (isOk) { - logInfo("writeInt[call pid] success"); - } else { - logInfo("writeInt[call pid] fail"); - } - return true; - } else if (code === CODE_CHECK_LOCAL_CALL) { - logInfo("entry check local call"); - let isLocal = rpc.IPCSkeleton.isLocalCalling(); - logInfo("call isLocalCalling" + isLocal); - let isOk = reply.writeBoolean(isLocal); - if (isOk) { - logInfo("writeBoolean[isLocal] success"); - } else { - logInfo("writeBoolean[isLocal] fail"); - } - return true; - } else { - logInfo("not support this code"); - return false; - } - logInfo("end call code is:" + code) - } - - transBasic(data, reply) { - logInfo("transBasic begin"); - let rByte = data.readByte(); - let rChar = data.readChar(); - let rShort = data.readShort(); - let rInt = data.readInt(); - let rLong = data.readLong(); - let rBoolean = data.readBoolean(); - let rFloat = data.readFloat(); - let rDouble = data.readDouble(); - logInfo(rByte); - logInfo(rChar); - logInfo(rShort); - logInfo(rInt); - logInfo(rLong); - logInfo(rBoolean); - logInfo(rFloat); - logInfo(rDouble); - reply.writeDouble(rDouble); - reply.writeFloat(rFloat); - reply.writeBoolean(rBoolean); - reply.writeLong(rLong); - reply.writeInt(rInt); - reply.writeShort(rShort); - reply.writeChar(rChar); - reply.writeByte(rByte); - logInfo("transBasic end"); - } -} - -class ExtendStub extends rpc.RemoteObject { - constructor(des) { - if (typeof des === 'string') { - super(des, des.length); - } - return null; - } - onRemoteRequest(code, data, reply, option) { - logInfo("start call code is:" + code) - if (code === CODE_BASIC) { - let sub1 = data.readInt(); - let sub2 = data.readFloat(); - let subResult = sub1 - sub2; - logInfo("read data int1:" + sub1 + ",int2:" + sub2 + ",sub rst:" + subResult); - let isOk = reply.writeFloat(subResult); - logInfo("writeInt ret:" + isOk); - return true; - } else { - logInfo("not support this code"); - return false; - } - } -} - -export default { - data: { - title: "" - }, - onStart(want) { - logInfo("onStart start"); - gBasicStub = new BasicStub(gBasicStubDesc); - gExtendStub = new ExtendStub(gExtendStubDesc); - logInfo("onStart end") - }, - onStop() { - logInfo('onStop'); - }, - onConnect(want) { - logInfo('onConnect'); - return gBasicStub; - }, - onReconnect(want) { - logInfo('onReconnect'); - }, - onDisconnect() { - logInfo('onDisConnect'); - }, - onCommand(want, restart, startId) { - logInfo('onCommand'); - }, -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/resources/base/element/string.json b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/resources/base/element/string.json deleted file mode 100644 index b2b6e74105da8e2b8ab7726cf9c5db81e692bf08..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "RpcService" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/resources/base/media/icon.png b/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/communication/ipcrpc_standard/ipcrpcservice/entry/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/communication/ipcrpc_standard/ipcrpcservice/signature/openharmony_sx.p7b b/communication/ipcrpc_standard/ipcrpcservice/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 Binary files a/communication/ipcrpc_standard/ipcrpcservice/signature/openharmony_sx.p7b and /dev/null differ diff --git a/communication/ipcrpc_standard/ipcrpctest/BUILD.gn b/communication/ipcrpc_standard/ipcrpctest/BUILD.gn deleted file mode 100644 index 499ad67f0b6f970f144271e5ea3f2f285c0de781..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/BUILD.gn +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2021 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_js_hap_suite("ipcrpcTest") { - hap_profile = "./entry/src/main/config.json" - deps = [ - ":ipcrpcTest_assets", - ":ipcrpcTest_resources", - ] - certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsIpcRpcTest" -} -ohos_js_assets("ipcrpcTest_assets") { - source_dir = "./entry/src/main/js/default" -} -ohos_resources("ipcrpcTest_resources") { - sources = [ "./entry/src/main/resources" ] - hap_profile = "./entry/src/main/config.json" -} diff --git a/communication/ipcrpc_standard/ipcrpctest/Test.json b/communication/ipcrpc_standard/ipcrpctest/Test.json deleted file mode 100644 index e63a3046dc0343f6c214bb75f7b0bc18cc8f5b19..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/Test.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "description": "Configuration for ipcrpc Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "120000", - "package": "ohos.acts.ipcrpctest", - "shell-timeout": "60000" - }, - "kits": [ - { - "test-file-name": [ - "ActsIpcRpcTest.hap", - "IpcRpcService.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] -} diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/config.json b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/config.json deleted file mode 100644 index d37d82fab9bc48d5228bf01770135d26a785f82a..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/config.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "app": { - "bundleName": "ohos.acts.ipcrpctest", - "vendor": "ipcrpc", - "version": { - "code": 1, - "name": "1.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "ohos.acts.ipcrpctest", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" - }, - "abilities": [ - { - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "name": "ohos.acts.ipcrpctest.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "MyApplication", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } -} diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/app.js b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/app.js deleted file mode 100644 index 83cc355c87c42fd4f00b239657d2c081cf0e9aa0..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/app.js +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2021 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 device from '@system.device'; - -export default { - onCreate() { - console.info('AceApplication onCreate'); - }, - onDestroy() { - console.info('AceApplication onDestroy'); - } -}; diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/i18n/en-US.json b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/i18n/en-US.json deleted file mode 100644 index 0ea879d2c45fd187ac4d63bf8b7f679a5eb8a19c..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/i18n/en-US.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "RpcTestcase" - } -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/i18n/zh-CN.json b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/i18n/zh-CN.json deleted file mode 100644 index 0ea879d2c45fd187ac4d63bf8b7f679a5eb8a19c..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/i18n/zh-CN.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "strings": { - "hello": "Hello", - "world": "RpcTestcase" - } -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.css b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.css deleted file mode 100644 index 3f824010b89c292c83f8da1b035e9271004c4158..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.css +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) 2021 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. - */ - -.container { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - left: 0px; - top: 0px; - width: 100%; - height: 100%; -} - -.title { - font-size: 30px; - text-align: center; - width: 100%; - height: 40%; - margin: 10px; -} -.btn { - width: 50%; - height: 100px; - font-size: 20px; -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.hml b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.hml deleted file mode 100644 index 4fd3583c2b507acdb795d16a930731b365357361..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.hml +++ /dev/null @@ -1,20 +0,0 @@ - - -
- - {{ $t('strings.hello') }} {{title}} - -
\ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.js b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.js deleted file mode 100644 index b568cfc7c8be35515ad510c98a6a5d067dd69cb7..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (C) 2021 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 app from '@system.app' -import {Core, ExpectExtend} from 'deccjsunit/index' - -export default { - data: { - title: "" - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - - core.addService('expect', expectExtend) - core.init() - - const configService = core.getDefaultService('config') - configService.setConfig(this) - - require('../../test/List.test') - core.execute() - }, - onReady() { - }, -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/test/IpcRpcClient.test.js b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/test/IpcRpcClient.test.js deleted file mode 100644 index 76ab7f60822e5b56ed601b452a569e87d1e572cb..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/test/IpcRpcClient.test.js +++ /dev/null @@ -1,708 +0,0 @@ -/* - * Copyright (C) 2021 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 app from '@system.app' -import FA from '@ohos.ability.featureability' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -const TAG = "[IpcRpcTest]"; -const gBasicStubDesc = "Basic_Stub_Desc"; -const gExtendStubDesc = "Extend_Stub_Desc"; -const REMOTE_BUNDLE = "com.huawei.plrdtest.ipcrpcservice"; -const REMOTE_ABILITY = "com.huawei.plrdtest.ipcrpcservice.MainAbility"; -const REQUEST_SUCCESS_STR = "send request success"; -const REQUEST_FAIL_STR = "send request fail"; -const REQUEST_EXCEPTION_STR = "send request exception:"; - -const REQUEST_SUCCESS = 0; -const CODE_BASIC = 1; -const CODE_TRANS_BASIC = 2; -const CODE_TRANS_ARRAY = 3; -const CODE_TRANS_STRING = 4; - -const CODE_GET_OBJECT = 10; -const CODE_GET_OBJECTS = 11; -const CODE_GET_OBJECTS_MIX = 12; -const CODE_GET_OBJECT_CALL = 13; -const CODE_GET_OBJECT_DESC = 14; - -const CODE_GET_CALL_PID = 20; -const CODE_GET_CALL_UID = 21; -const CODE_CHECK_LOCAL_CALL = 22; - -let gBasicStubProxy = undefined; -let gConnectRst = undefined; - -function logInfo(logContent) { - console.info(TAG + logContent); -} - -describe('ACTS_IpcRpc', function () { - beforeAll(function () { - logInfo("beforeAll start") - gConnectRst = FA.connectAbility( - { - bundleName: REMOTE_BUNDLE, - abilityName: REMOTE_ABILITY, - }, - { - onConnect: onConnectCallback, - onDisconnect: onDisconnectCallback, - onFailed: onFailedCallback, - }, - ); - logInfo("beforeAll connectAbility:" + gConnectRst); - }) - beforeEach(function () { - logInfo("beforeEach") - }) - afterAll(function () { - logInfo("afterAll start") - var result = FA.disconnectAbility( - gConnectRst, - (error, data) => { - logInfo('afterAll disconnectAbility error:' + error.code + ",data: " + data) - }, - ); - }) - afterEach(function () { - logInfo("afterEach") - }) - - function onConnectCallback(element, remote){ - logInfo('onConnect element.deviceId:' + element.deviceId) - logInfo('onConnect element.bundleName:' + element.bundleName) - logInfo('onConnect element.abilityName:' + element.abilityName) - logInfo('onConnect element.uri:' + element.uri) - logInfo('onConnect element.shortName:' + element.shortName) - logInfo('onConnect remote:' + remote); - if (remote instanceof rpc.RemoteProxy) { - logInfo('onConnect check remote object success'); - gBasicStubProxy = remote; - } else { - logInfo('onConnect check remote object fail'); - } - } - - function onDisconnectCallback(element){ - logInfo('onDisconnect element.deviceId:' + element.deviceId) - logInfo('onDisconnect element.bundleName:' + element.bundleName) - logInfo('onDisconnect element.abilityName:' + element.abilityName) - logInfo('onDisconnect element.uri:' + element.uri) - logInfo('onDisconnect element.shortName:' + element.shortName) - } - - function onFailedCallback(code){ - logInfo('onFailed errCode:' + code) - } - - function requestBasic(option, add1, add2) { - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - let isOk = data.writeInt(add1); - expect(isOk).assertTrue(); - isOk = data.writeInt(add2); - expect(isOk).assertTrue(); - - logInfo("start call sendRequest..."); - let rstFlag = true; - gBasicStubProxy.sendRequest(CODE_BASIC, data, reply, option) - .then(function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - if (errorCode === REQUEST_SUCCESS) { - logInfo(REQUEST_SUCCESS_STR); - let addResult = reply.readInt(); - let expectResult = add1 + add2; - //expect(addResult).assertEqual(expectResult); - if (addResult !== expectResult) { - logInfo("reply result != expect, result:" + addResult + ",expect:" + expectResult); - if (option.flags === TF_ASYNC) { - logInfo("option is async, expect not match") - } else { - rstFlag = false; - } - } else { - logInfo("reply result = expect"); - if (option.flags === TF_ASYNC) { - logInfo("option is async, expect not match") - rstFlag = false; - } - } - } else { - logInfo(REQUEST_FAIL_STR); - rstFlag = false; - } - }) - .catch(function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - rstFlag = false; - }) - .finally(() => { - logInfo("finally..."); - data.reclaim(); - reply.reclaim(); - }) - return rstFlag; - } - - /** - * @tc.name basic,default option(sync) - * @tc.number ACTS_IpcRpc_Basic_0100 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_Basic_0100', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - let option = new rpc.MessageOption(); - const add1 = -999; - const add2 = 1000; - let rst = requestBasic(option, add1, add2); - expect(rst).assertTrue(); - }) - - /** - * @tc.name basic,sync option - * @tc.number ACTS_IpcRpc_SyncOpt_0101 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_SyncOpt_0101', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - let option = new rpc.MessageOption(TF_SYNC, TF_WAIT_TIME); - const add1 = 1000; - const add2 = -1000; - let rst = requestBasic(option, add1, add2); - expect(rst).assertTrue(); - }) - - /** - * @tc.name basic,async option - * @tc.number ACTS_IpcRpc_AsyncOpt_0102 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_AsyncOpt_0102', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - let option = new rpc.MessageOption(TF_ASYNC, TF_WAIT_TIME); - const add1 = 1000; - const add2 = 999; - let rst = requestBasic(option, add1, add2); - expect(rst).assertTrue(); - }) - - /** - * @tc.name trans basic data - * @tc.number ACTS_IpcRpc_TransDataBasic_0200 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_TransDataBasic_0200', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - const wByte = 'b'; - const wChar = '字'; - const wShort = 65535; - const wInt = 4294967296; - const wLong = 18446744073709551615; - const wBoolean = true; - const wFloat = 12.665577; - const wDouble = 12.66557788; - let isOk = data.writeByte(wByte); - expect(isOk).assertTrue(); - isOk = data.writeChar(wChar); - expect(isOk).assertTrue(); - isOk = data.writeShort(wShort); - expect(isOk).assertTrue(); - isOk = data.writeInt(wInt); - expect(isOk).assertTrue(); - isOk = data.writeLong(wLong); - expect(isOk).assertTrue(); - isOk = data.writeBoolean(wBoolean); - expect(isOk).assertTrue(); - isOk = data.writeFloat(wFloat); - expect(isOk).assertTrue(); - isOk = data.writeDouble(wDouble); - expect(isOk).assertTrue(); - - logInfo("start call sendRequest..."); - gBasicStubProxy.sendRequest(CODE_TRANS_BASIC, data, reply, option) - .then(function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - if (errorCode === REQUEST_SUCCESS) { - logInfo(REQUEST_SUCCESS_STR); - let rDouble = reply.readDouble(); - expect(rDouble).assertEqual(wDouble); - let rFloat = reply.readFloat(); - expect(rFloat).assertEqual(wFloat); - let rBoolean = reply.readBoolean(); - expect(rBoolean).assertEqual(wBoolean); - let rLong = reply.readLong(); - expect(rLong).assertEqual(wLong); - let rInt = reply.readInt(); - expect(rInt).assertEqual(wInt); - let rShort = reply.readShort(); - expect(rShort).assertEqual(wShort); - let rChar = reply.readChar(); - expect(rChar).assertEqual(wChar); - let rByte = reply.readByte(); - expect(rByte).assertEqual(wByte); - } else { - logInfo(REQUEST_FAIL_STR); - } - }) - .catch(function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally(() => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name trans array - * @tc.number ACTS_IpcRpc_TransDataArray_0201 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_TransDataArray_0201', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - const intArray = [1, 3, 5, 7, 9]; - const floatArray = [1.1, 2.2, 3.3, 4.4, 5.5]; - const byteArray = new Int8Array([2, 4, 6, 8, 10]); - let isOk = data.writeIntArray(intArray); - expect(isOk).assertTrue(); - isOk = data.writeFloatArray(floatArray); - expect(isOk).assertTrue(); - isOk = data.writeByteArray(byteArray); - expect(isOk).assertTrue(); - - gBasicStubProxy.sendRequest(CODE_TRANS_ARRAY, data, reply, option) - .then(function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - if (errorCode === REQUEST_SUCCESS) { - logInfo(REQUEST_SUCCESS_STR); - let readByteArray = reply.readByteArray(); - logInfo("readByteArray:" + readByteArray); - expect(readByteArray instanceof Array).assertTrue(); - expect(readByteArray.length === intArray.length).assertTrue(); - - let readFloatArray = reply.readFloatArray(); - logInfo("readFloatArray:" + readFloatArray); - expect(readFloatArray instanceof Array).assertTrue(); - expect(readFloatArray.length === floatArray.length).assertTrue(); - - let readIntArray = reply.readIntArray(); - logInfo("readIntArray:" + readIntArray); - expect(readIntArray instanceof Array).assertTrue(); - expect(readIntArray.length === intArray.length).assertTrue(); - } else { - logInfo(REQUEST_FAIL_STR); - } - }) - .catch(function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally(() => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name trans string - * @tc.number ACTS_IpcRpc_TransDataString_0202 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_TransDataString_0202', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - - const str1 = "1234567890abcdefgh"; - const str2 = "!@@$$%^^&&**((()__+"; - let isOk = data.writeString(str1); - expect(isOk).assertTrue(); - isOk = data.writeString(str2); - expect(isOk).assertTrue(); - - gBasicStubProxy.sendRequest(CODE_TRANS_STRING, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - let readStr1 = reply.readString(); - logInfo("readString 1:" + readStr1); - expect(typeof readStr1 === 'string').assertTrue(); - expect(readStr1).assertEqual(str2); - - let readStr2 = reply.readString(); - logInfo("readString 2:" + readStr2); - expect(typeof readStr2 === 'string').assertTrue(); - expect(readStr2).assertEqual(str1); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name get basic object - * @tc.number ACTS_IpcRpc_GetObject_0300 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetObject_0300', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - - const strArray = ['get', 'remote', 'object']; - let isOk = data.writeStringArray(strArray); - expect(isOk).assertTrue(); - - gBasicStubProxy.sendRequest(CODE_GET_OBJECT, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - let proxy = reply.readRemoteObject(); - logInfo("readRemoteObject:" + proxy); - expect(proxy instanceof rpc.RemoteProxy).assertTrue(); - - // check descriptor - let desc = proxy.getInterfaceDescriptor(); - logInfo("proxy.getInterfaceDescriptor:" + desc); - expect(desc).assertEqual(gBasicStubDesc); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name get three basic objects - * @tc.number ACTS_IpcRpc_GetObjects_0301 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetObjects_0301', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - - const strArray = ['get', 'remote', 'object', 'array']; - let isOk = data.writeStringArray(strArray); - expect(isOk).assertTrue(); - - gBasicStubProxy.sendRequest(CODE_GET_OBJECTS, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let proxy1 = reply.readRemoteObject(); - logInfo("readRemoteObject1:" + proxy1); - expect(proxy1 instanceof rpc.RemoteProxy).assertTrue(); - let proxy1Desc = proxy1.getInterfaceDescriptor(); - logInfo("proxy1.getInterfaceDescriptor:" + proxy1Desc); - expect(proxy1Desc).assertEqual(gBasicStubDesc); - - let proxy2 = reply.readRemoteObject(); - logInfo("readRemoteObject2:" + proxy2); - expect(proxy2 instanceof rpc.RemoteProxy).assertTrue(); - let proxy2Desc = proxy2.getInterfaceDescriptor(); - logInfo("proxy2.getInterfaceDescriptor:" + proxy2Desc); - expect(proxy2Desc).assertEqual(gBasicStubDesc); - - let proxy3 = reply.readRemoteObject(); - logInfo("readRemoteObject3:" + proxy3); - expect(proxy3 instanceof rpc.RemoteProxy).assertTrue(); - let proxy3Desc = proxy3.getInterfaceDescriptor(); - logInfo("proxy3.getInterfaceDescriptor:" + proxy3Desc); - expect(proxy3Desc).assertEqual(gBasicStubDesc); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name get one basic and one extend object - * @tc.number ACTS_IpcRpc_GetObjectsMix_0302 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetObjectsMix_0302', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.crete(); - let reply = new rpc.MessageParcel.crete(); - - gBasicStubProxy.sendRequest(CODE_GET_OBJECTS_MIX, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let extendProxy = reply.readRemoteObject(); - logInfo("readRemoteObject[extend]:" + extendProxy); - expect(extendProxy instanceof rpc.RemoteObject).assertTrue(); - let extendDesc = extendProxy.getInterfaceDescriptor(); - logInfo("getInterfaceDescriptor[extend]:" + extendDesc); - expect(extendDesc).assertEqual(gExtendStubDesc); - - let basicProxy = reply.readRemoteObject(); - logInfo("readRemoteObject[basic]:" + basicProxy); - expect(basicProxy instanceof rpc.RemoteObject).assertTrue(); - let basicDesc = basicProxy.getInterfaceDescriptor(); - logInfo("getInterfaceDescriptor[basic]:" + basicDesc); - expect(basicDesc).assertEqual(gBasicStubDesc); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name get extend proxy and call - * @tc.number ACTS_IpcRpc_GetObjectAndCall_0303 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetObjectAndCall_0303', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.create(); - let reply = new rpc.MessageParcel.create(); - let proxy = undefined; - gBasicStubProxy.sendRequest(CODE_GET_OBJECT_CALL, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - proxy = reply.readRemoteObject(); - logInfo("readRemoteObject:" + proxy); - expect(proxy instanceof rpc.RemoteProxy).assertTrue(); - let desc = proxy.getInterfaceDescriptor(); - logInfo("proxy.getInterfaceDescriptor:" + desc); - expect(desc).assertEqual(gBasicStubDesc); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - - //call by proxy - expect(proxy != undefined).assertTrue(); - let dataProxy = new rpc.MessageParcel.create(); - let replyProxy = new rpc.MessageParcel.create(); - let sub1 = 222; - let sub2 = 222.111; - dataProxy.writeInt(sub1); - dataProxy.writeFloat(sub2); - proxy.sendRequest(CODE_BASIC, dataProxy, replyProxy, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let addResult = reply.readFloat(); - let expectResult = sub1 - sub2; - logInfo("readFloat sub result:" + addResult); - expect(addResult).assertEqual(expectResult); - }) - .catch( function (e) { - logInfo("[read object]" + REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - dataProxy.reclaim(); - replyProxy.reclaim(); - }) - }) - - /** - * @tc.name get interface descriptor - * @tc.number ACTS_IpcRpc_GetDescFromRemote_0304 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetDescFromRemote_0304', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.crete(); - let reply = new rpc.MessageParcel.crete(); - - gBasicStubProxy.sendRequest(CODE_GET_OBJECT_DESC, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let basicDesc = reply.readString(); - logInfo("readString[basic]:" + basicDesc); - expect(basicDesc).assertEqual(gBasicStubDesc); - - let extendDesc = reply.readString(); - logInfo("readString[extend]:" + extendDesc); - expect(extendDesc).assertEqual(gExtendStubDesc); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name test attach and get local interface - * @tc.number ACTS_IpcRpc_AttachAndGet_0305 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_AttachAndGet_0305', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.crete(); - let reply = new rpc.MessageParcel.crete(); - - gBasicStubProxy.sendRequest(CODE_GET_OBJECT, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let proxy = reply.readRemoteObject(); - logInfo("readRemoteObject:" + proxy); - expect(proxy instanceof rpc.RemoteProxy).assertTrue(); - let desc = proxy.getInterfaceDescriptor(); - logInfo("proxy.getInterfaceDescriptor:" + desc); - expect(desc).assertEqual(gBasicStubDesc); - - // attach and query - let newDesc = "new interface desc"; - proxy.attachLocalInterface(proxy, newDesc); - let queryObject = proxy.queryLocalInterface(newDesc); - expect(queryObject instanceof rpc.RemoteProxy).assertTrue(); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name test get calling uid - * @tc.number ACTS_IpcRpc_GetCallingUid_0400 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetCallingUid_0400', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.crete(); - let reply = new rpc.MessageParcel.crete(); - - gBasicStubProxy.sendRequest(CODE_GET_CALL_UID, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let uid = reply.readInt(); - logInfo("get Uid readInt:" + uid); - expect(typeof uid === 'number').assertTrue(); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name test get calling pid - * @tc.number ACTS_IpcRpc_GetCallingPid_0401 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetCallingPid_0401', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.crete(); - let reply = new rpc.MessageParcel.crete(); - - gBasicStubProxy.sendRequest(CODE_GET_CALL_PID, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let uid = reply.readInt(); - logInfo("get Pid readInt:" + uid); - expect(typeof uid === 'number').assertTrue(); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) - - /** - * @tc.name test check is local calling - * @tc.number ACTS_IpcRpc_GetCallingPid_0402 - * @tc.desc ipc/rpc function test - */ - it('ACTS_IpcRpc_GetCallingPid_0402', 0, function () { - expect(gBasicStubProxy != undefined).assertTrue(); - - let option = new rpc.MessageOption(); - let data = new rpc.MessageParcel.crete(); - let reply = new rpc.MessageParcel.crete(); - - gBasicStubProxy.sendRequest(CODE_CHECK_LOCAL_CALL, data, reply, option) - .then( function (errorCode) { - expect(errorCode).assertEqual(REQUEST_SUCCESS); - - let isLocalCall = reply.readBoolean(); - logInfo("get is local calling:" + isLocalCall); - expect(isLocalCall).assertFalse(); - }) - .catch( function (e) { - logInfo(REQUEST_EXCEPTION_STR + e); - }) - .finally( () => { - data.reclaim(); - reply.reclaim(); - }) - }) -}) diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/test/List.test.js b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/test/List.test.js deleted file mode 100644 index 5bd5d446cd642b2939bfa77b5703d8a1aa7cb0cc..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/js/default/test/List.test.js +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2021 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. - */ - -require('./IpcRpcClient.test.js') diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/resources/base/element/string.json b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/resources/base/element/string.json deleted file mode 100644 index 77748eceaed5ccf0789b2e45af421c6a76b492cd..0000000000000000000000000000000000000000 --- a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/resources/base/element/string.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "string": [ - { - "name": "entry_MainAbility", - "value": "RpcTest" - }, - { - "name": "mainability_description", - "value": "JS_Empty Ability" - } - ] -} \ No newline at end of file diff --git a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/resources/base/media/icon.png b/communication/ipcrpc_standard/ipcrpctest/entry/src/main/resources/base/media/icon.png deleted file mode 100644 index ce307a8827bd75456441ceb57d530e4c8d45d36c..0000000000000000000000000000000000000000 Binary files a/communication/ipcrpc_standard/ipcrpctest/entry/src/main/resources/base/media/icon.png and /dev/null differ diff --git a/communication/ipcrpc_standard/ipcrpctest/signature/openharmony_sx.p7b b/communication/ipcrpc_standard/ipcrpctest/signature/openharmony_sx.p7b deleted file mode 100644 index 9be1e98fa4c0c28ca997ed660112fa16b194f0f5..0000000000000000000000000000000000000000 Binary files a/communication/ipcrpc_standard/ipcrpctest/signature/openharmony_sx.p7b and /dev/null differ