!2727 修改软总线xts test.json

Merge pull request !2727 from zhangpan2021/master

communication/dsoftbus/rpc/Test.json

@@ -10,10 +10,15 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsRpcHapTest.hap"
+                "ActsRpcHapTest.hap",
+                "./resource/dsoftbus/ipcserver/entry-release-standard-signed.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
         }
     ]
+
+
+
+
 }

communication/dsoftbus/rpc/src/main/js/default/pages/index/index.css

+/*
+ * 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.
+ */
+
 .container {
     flex-direction: column;
     justify-content: center;

communication/dsoftbus/rpc/src/main/js/default/pages/index/index.hml

+/*
+ * 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.
+ */
+
 <div class="container">
     <text class="title">
         {{ $t('strings.hello') }} {{ title }}

communication/dsoftbus/rpc/src/main/js/default/pages/index/index.js

 /*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * 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
@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-import app from '@system.app'
-
 import {Core} from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global

communication/dsoftbus/rpc/src/main/js/default/test/RpcClientJsunit.test.js

@@ -51,6 +51,8 @@ describe('ActsRpcClientJsTest', function(){
     const CODE_TRANSACTION = 27;
     const CODE_IPCSKELETON = 28;
     const CODE_FILESDIR = 29;
+    const CODE_WRITE_REMOTEOBJECTARRAY_1 = 30;
+    const CODE_WRITE_REMOTEOBJECTARRAY_2 = 31;
 
     function connectAbility() {
         let want = {
@@ -125,8 +127,65 @@ describe('ActsRpcClientJsTest', function(){
         constructor(descriptor) {
             super(descriptor)
         }
+
+        onRemoteRequest(code, data, reply, option) {
+            console.info("TestAbilityStub: onRemoteRequest called, code: " + code)
+            let descriptor = data.readInterfaceToken()
+            if (descriptor !== "TestAbilityStub") {
+                console.error("received unknown descriptor: " + descriptor)
+                return false
+            }
+            switch (code) {
+                case 1:
+                {
+                    let tmp1 = data.readByte()
+                    let tmp2 = data.readByte()
+                    let tmp3 = data.readShort()
+                    let tmp4 = data.readShort()
+                    let tmp5 = data.readInt()
+                    let tmp6 = data.readInt()
+                    let tmp7 = data.readLong()
+                    let tmp8 = data.readLong()
+                    let tmp9 = data.readFloat()
+                    let tmp10 = data.readFloat()
+                    let tmp11 = data.readDouble()
+                    let tmp12 = data.readDouble()
+                    let tmp13 = data.readBoolean()
+                    let tmp14 = data.readBoolean()
+                    let tmp15 = data.readChar()
+                    let tmp16 = data.readString()
+                    let s = new MySequenceable(null, null)
+                    data.readSequenceable(s)
+                    reply.writeNoException()
+                    reply.writeByte(tmp1)
+                    reply.writeByte(tmp2)
+                    reply.writeShort(tmp3)
+                    reply.writeShort(tmp4)
+                    reply.writeInt(tmp5)
+                    reply.writeInt(tmp6)
+                    reply.writeLong(tmp7)
+                    reply.writeLong(tmp8)
+                    reply.writeFloat(tmp9)
+                    reply.writeFloat(tmp10)
+                    reply.writeDouble(tmp11)
+                    reply.writeDouble(tmp12)
+                    reply.writeBoolean(tmp13)
+                    reply.writeBoolean(tmp14)
+                    reply.writeChar(tmp15)
+                    reply.writeString(tmp16)
+                    reply.writeSequenceable(s)
+                    return true
+                }
+                default:
+                {
+                    console.error("default case, code: " + code)
+                    return false
+                }
+            }
+        }
     }
 
+
     class TestListener extends rpc.RemoteObject {
         constructor(descriptor, checkResult) {
             super(descriptor);
@@ -1234,7 +1293,7 @@ describe('ActsRpcClientJsTest', function(){
             console.log("SUB_Softbus_IPC_MessageParcel_6000:run writeChar success, result is " + result);
             expect(result == true).assertTrue()
             var readresult = data.readChar();
-            expect(result == 'a').assertTrue()
+            expect(readresult == 'a').assertTrue()
 
         } catch (error) {
             console.log("SUB_Softbus_IPC_MessageParcel_6000:error = " + error);
@@ -1707,20 +1766,6 @@ describe('ActsRpcClientJsTest', function(){
             var result = data.writeRawData(token, token.length);
             console.log("SUB_Softbus_IPC_MessageParcel_7300:run writeRawData success, result is " + result);
             expect(result == false).assertTrue();
-            if (gIRemoteObject == undefined)
-            {
-                console.log("SUB_Softbus_IPC_MessageParcel_7300: gIRemoteObject is undefined");
-            }
-            await gIRemoteObject.sendRequest(CODE_WRITE_RAWDATA, data, reply, option).then((result) => {
-                console.log("SUB_Softbus_IPC_MessageParcel_7300: sendRequest success, result is " +  result.errCode);
-                var newReadResult = result.reply.readRawData(token.length);
-                expect(newReadResult[0] == token[0]).assertTrue();
-                expect(newReadResult[1] == token[1]).assertTrue();
-                expect(newReadResult[2] == token[2]).assertTrue();
-                expect(newReadResult[3] == token[3]).assertTrue();
-                expect(newReadResult[4] == token[4]).assertTrue();
-            });
-
             data.reclaim();
             reply.reclaim();
             done();
@@ -2579,7 +2624,9 @@ describe('ActsRpcClientJsTest', function(){
                 reply.reclaim()
                 console.log("test done")
             })
-    })
+            console.log("---------------------end SUB_Softbus_IPC_MessageParcel_9300---------------------------");
+        })
+    
 
     /*
      * @tc.number  SUB_Softbus_IPC_MessageParcel_9400
@@ -2589,12 +2636,19 @@ describe('ActsRpcClientJsTest', function(){
      */
     it('SUB_Softbus_IPC_MessageParcel_9400', 0, async function(done) {
         console.log("---------------------start SUB_Softbus_IPC_MessageParcel_9400---------------------------");
-        try{
-            function checkResult(num, str) {
-                expect(num).assertEqual(123)
-                expect(str).assertEqual("rpcListenerTest")
+        
+        let count = 0;
+        function checkResult(num, str) {
+            expect(num).assertEqual(123)
+            expect(str).assertEqual("rpcListenerTest")
+            count++
+            console.info("check result done, count: " + count)
+            if (count == 3) {
                 done()
             }
+        }
+
+        try{
             let option = new rpc.MessageOption()
             let data = rpc.MessageParcel.create()
             let reply = rpc.MessageParcel.create()
@@ -2607,20 +2661,20 @@ describe('ActsRpcClientJsTest', function(){
             console.info("SUB_Softbus_IPC_MessageParcel_9400 result is:" + result)
             expect(data.writeInt(123)).assertTrue()
             expect(data.writeString("rpcListenerTest")).assertTrue()
-            await gIRemoteObject.sendRequest(CODE_WRITE_REMOTEOBJECTARRAY, data, reply, option)
-                .then(function(result) {
-                    console.info("SUB_Softbus_IPC_MessageParcel_9400: sendRequest done, error code: " + result.errCode)
-                    expect(result.errCode).assertEqual(0)
-                })
-                .catch(function(e) {
-                    console.error("SUB_Softbus_IPC_MessageParcel_9400: send request got exception: " + e)
-                    expect(0).assertEqual(1)
-                })
-                .finally(() => {
-                    data.reclaim()
-                    reply.reclaim()
-                    console.log("test done")
-                })
+            await gIRemoteObject.sendRequest(CODE_WRITE_REMOTEOBJECTARRAY_1, data, reply, option)
+            .then( ( result) => {
+                console.info("SUB_Softbus_IPC_MessageParcel_9500:sendRequest done, error code: " + result.errCode)
+                expect(result.errCode).assertEqual(0)
+            })
+            .catch(function(e) {
+                console.error("SUB_Softbus_IPC_MessageParcel_9400: send request got exception: " + e)
+                expect(0).assertEqual(1)
+            })
+            .finally(() => {
+                data.reclaim()
+                reply.reclaim()
+                console.log("test done")
+            })
             done();
             data.reclaim();
             reply.reclaim();
@@ -2639,12 +2693,18 @@ describe('ActsRpcClientJsTest', function(){
      */
     it('SUB_Softbus_IPC_MessageParcel_9500', 0, async function(done) {
         console.log("---------------------start SUB_Softbus_IPC_MessageParcel_9500---------------------------");
-        try{
-            function checkResult(num, str) {
-                expect(num).assertEqual(123)
-                expect(str).assertEqual("rpcListenerTest")
+        let count = 0;
+        function checkResult(num, str) {
+            expect(num).assertEqual(123)
+            expect(str).assertEqual("rpcListenerTest")
+            count++
+            console.info("check result done, count: " + count)
+            if (count == 3) {
                 done()
             }
+        }
+
+        try{
             let option = new rpc.MessageOption()
             let data = rpc.MessageParcel.create()
             let reply = rpc.MessageParcel.create()
@@ -2659,7 +2719,8 @@ describe('ActsRpcClientJsTest', function(){
             console.info("SUB_Softbus_IPC_MessageParcel_9500 result is:" + result)
             expect(data.writeInt(123)).assertTrue()
             expect(data.writeString("rpcListenerTest")).assertTrue()
-            gIRemoteObject.sendRequest(CODE_WRITE_REMOTEOBJECTARRAY, data, reply, option,(err, result) => {
+            await gIRemoteObject.sendRequest(CODE_WRITE_REMOTEOBJECTARRAY_2, data, reply, option)
+            .then( ( result) => {
                     console.info("SUB_Softbus_IPC_MessageParcel_9500:sendRequest done, error code: " + result.errCode)
                     expect(result.errCode).assertEqual(0)
                 })
@@ -2756,7 +2817,7 @@ describe('ActsRpcClientJsTest', function(){
         try{
            expect(rpc.MessageOption.TF_SYNC).assertEqual(0);
 
-           expect(rpc.MessageOption.TF_AYNC).assertEqual(1);
+           expect(rpc.MessageOption.TF_ASYNC).assertEqual(1);
 
            expect(rpc.MessageOption.TF_WAIT_TIME).assertEqual(4);
 
@@ -3197,7 +3258,7 @@ describe('ActsRpcClientJsTest', function(){
             let size = bytes.length + 10;
             let result = ashmem.writeToAshmem(bytes, 3, 0);
             console.log("SUB_Softbus_IPC_Ashmem_1600: run writeToAshmem success, result is " + result);
-            expect(result == true).assertTrue()
+            expect(result == true).assertTrue();
 
             ashmem.closeAshmem()
 
@@ -3873,7 +3934,7 @@ describe('ActsRpcClientJsTest', function(){
      * @tc.desc    Function test
      * @tc.level   0
      */
-    it("SUB_Softbus_IPC_RemoteProxy_0500", 0, async function(done){
+    it("SUB_Softbus_IPC_RemoteProxy_0500", 0, async function(){
         console.log("SUB_Softbus_IPC_RemoteProxy_0500 is starting-------------")
         try {
             

communication_lite/dsoftbus_hal/BUILD.gn

-# Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+# 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

communication_lite/lwip_hal/src/lwip_func_test.c

@@ -135,7 +135,7 @@ static void CommTcpClientTask(void)
         "client:!!@@##$$%%^^&&**(()),FD:[%d]", "client:(((112233445566778899))),FD:[%d]", "bye"};
     for (int i = 0; i < count; i++) {
         sleep(ONE_SECOND);
-        memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+        (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
         rst = sprintf_s(dataBuf, sizeof(dataBuf), sendMsgList[i], clnFd);
         if (rst < 0) {
             printf("[comm client]sprintf_s error!\n");
@@ -146,7 +146,7 @@ static void CommTcpClientTask(void)
         if (rst <= 0) {
             printf("[comm client][%d]send fail\n", clnFd);
         }
-        memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+        (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
         rst = recv(clnFd, dataBuf, sizeof(dataBuf), 0);
         if (rst > 0) {
             printf("[comm client][%d]recv msg[%s]\n", clnFd, dataBuf);
@@ -185,14 +185,14 @@ static void SampleTcpServerTask(void)
     TEST_ASSERT_NOT_EQUAL(LWIP_TEST_FAIL, clientFd);
 
     int srvMsgLen = strlen(SRV_MSG);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, SRV_MSG);
     TEST_ASSERT_EQUAL_INT(LWIP_TEST_SUCCESS, ret);
     ret = send(clientFd, buf, srvMsgLen, 0);
     printf("[tcp server]send, ret=%d\n", ret);
     TEST_ASSERT_EQUAL_INT(srvMsgLen, ret);
 
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = recv(clientFd, buf, sizeof(buf), 0);
     printf("[tcp server]recv, ret=%d\n", ret);
     TEST_ASSERT_EQUAL_INT(strlen(CLI_MSG), ret);
@@ -202,7 +202,7 @@ static void SampleTcpServerTask(void)
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, SRV_MSG);
     TEST_ASSERT_EQUAL_INT(LWIP_TEST_SUCCESS, ret);
     msg.msg_name = &clnAddr;
@@ -218,7 +218,7 @@ static void SampleTcpServerTask(void)
     TEST_ASSERT_EQUAL_INT(len * srvMsgLen, ret);
 
     WaitServer();
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     int recvSum = 0;
     int recvTimes = 50;
     while (recvTimes > 0) {
@@ -282,14 +282,14 @@ static void SampleTcpClientTask(void)
     TEST_ASSERT_EQUAL_INT(inet_addr(STACK_IP), ((struct sockaddr_in*)&addr)->sin_addr.s_addr);
 
     int cliMsgLen = strlen(CLI_MSG);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, CLI_MSG);
     TEST_ASSERT_EQUAL_INT(LWIP_TEST_SUCCESS, ret);
     ret = send(clientFd, buf, cliMsgLen, 0);
     printf("[tcp client]send, ret=%d\n", ret);
     TEST_ASSERT_EQUAL_INT(cliMsgLen, ret);
 
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = recv(clientFd, buf, sizeof(buf), 0);
     printf("[tcp client]recv,ret=%d\n", ret);
     TEST_ASSERT_EQUAL_INT(strlen(SRV_MSG), ret);
@@ -299,7 +299,7 @@ static void SampleTcpClientTask(void)
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, CLI_MSG);
     TEST_ASSERT_EQUAL_INT(LWIP_TEST_SUCCESS, ret);
     msg.msg_name = &clnAddr;
@@ -315,7 +315,7 @@ static void SampleTcpClientTask(void)
     TEST_ASSERT_EQUAL_INT(len * cliMsgLen, ret);
 
     WaitClient();
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     int recvSum = 0;
     int recvTimes = 50;
     while (recvTimes > 0) {
@@ -405,7 +405,7 @@ static void SelectServerTask(void)
                 continue;
             }
             if (FD_ISSET(fds[i], &readSet)) {
-                memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+                (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
                 int len = recv(fds[i], dataBuf, sizeof(dataBuf), 0);
                 if (len > 0) {
                     printf("[select process][%d]recv msg[%s]\n", fds[i], dataBuf);
@@ -588,20 +588,20 @@ LITE_TEST_CASE(LwipFuncTestSuite, testUdp, Function | MediumTest | Level2)
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(g_buf, BUF_SIZE, UDP_MSG);
     TEST_ASSERT_EQUAL_INT(LWIP_TEST_SUCCESS, ret);
     ret = sendto(fd, g_buf, strlen(UDP_MSG), 0, (struct sockaddr*)&clnAddr, (socklen_t)sizeof(clnAddr));
     TEST_ASSERT_NOT_EQUAL(LWIP_TEST_FAIL, ret);
 
-    memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
     ret = recvfrom(fd, g_buf, sizeof(g_buf), 0, (struct sockaddr*)&clnAddr, &clnAddrLen);
     TEST_ASSERT_EQUAL_INT(strlen(UDP_MSG), ret);
 
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(PEER_IP);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(g_buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(g_buf, BUF_SIZE, UDP_MSG);
     TEST_ASSERT_EQUAL_INT(LWIP_TEST_SUCCESS, ret);
     msg.msg_name = &clnAddr;
@@ -720,7 +720,7 @@ LITE_TEST_CASE(LwipFuncTestSuite, testSocketOpt, Function | MediumTest | Level2)
     ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, len);
     TEST_ASSERT_EQUAL_INT(0, ret);
 
-    memset_s(&timeout, len, 0, len);
+    (viod) memset_s(&timeout, len, 0, len);
     ret = getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, &len);
     TEST_ASSERT_EQUAL_INT(0, ret);
     TEST_ASSERT_EQUAL_INT(1000, timeout.tv_sec);

communication_lite/lwip_posix/src/ActsLwipTest.cpp

@@ -120,7 +120,7 @@ static void* CommTcpClientTask(void* param)
         "client:!!@@##$$%%^^&&**(()),FD:[%d]", "client:(((112233445566778899))),FD:[%d]", "bye"};
     for (int i = 0; i < count; i++) {
         sleep(sleepSecond);
-        memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+        (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
         rst = sprintf_s(dataBuf, sizeof(dataBuf), sendMsgList[i], clnFd);
         if (rst < 0) {
             printf("[comm client]sprintf_s error!\n");
@@ -131,7 +131,7 @@ static void* CommTcpClientTask(void* param)
             *ret = -1;
             printf("[comm client][%d]send fail\n", clnFd);
         }
-        memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+        (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
         rst = recv(clnFd, dataBuf, sizeof(dataBuf), 0);
         if (rst > 0) {
             printf("[comm client][%d]recv msg[%s]\n", clnFd, dataBuf);
@@ -182,14 +182,14 @@ static void* SampleTcpServerTask(void* p)
 
     static char buf[BUF_SIZE + 1] = {0};
     unsigned int srvMsgLen = strlen(g_srvMsg);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, g_srvMsg);
     EXPECT_EQ(0, ret);
     ret = send(clnFd, buf, srvMsgLen, 0);
     printf("[tcp server]send, ret=%d\n", ret);
     EXPECT_EQ(srvMsgLen, (unsigned int)ret);
 
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = recv(clnFd, buf, sizeof(buf), 0);
     printf("[tcp server]recv, ret=%d, msg[%s]\n", ret, buf);
     EXPECT_EQ(strlen(g_cliMsg), (unsigned int)ret);
@@ -201,7 +201,7 @@ static void* SampleTcpServerTask(void* p)
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(g_localHost);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, g_srvMsg);
     EXPECT_EQ(0, ret);
     msg.msg_name = &clnAddr;
@@ -217,8 +217,8 @@ static void* SampleTcpServerTask(void* p)
     EXPECT_EQ(len * srvMsgLen, (unsigned int)ret);
 
     WAIT();
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
-    memset_s(&msg, sizeof(msg), 0, sizeof(msg));
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(&msg, sizeof(msg), 0, sizeof(msg));
     msg.msg_name = &clnAddr;
     msg.msg_namelen = sizeof(clnAddr);
     msg.msg_iov = iov;
@@ -270,14 +270,14 @@ static void* SampleTcpClientTask(void* p)
 
     static char buf[BUF_SIZE + 1] = {0};
     unsigned int cliMsgLen = strlen(g_cliMsg);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, g_cliMsg);
     EXPECT_EQ(0, ret);
     ret = send(clnFd, buf, cliMsgLen, 0);
     printf("[tcp client]send, ret=%d\n", ret);
     EXPECT_EQ(cliMsgLen, (unsigned int)ret);
 
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = recv(clnFd, buf, sizeof(buf), 0);
     printf("[tcp client]recv, ret=%d, msg[%s]\n", ret, buf);
     EXPECT_EQ(strlen(g_srvMsg), (unsigned int)ret);
@@ -290,7 +290,7 @@ static void* SampleTcpClientTask(void* p)
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(g_localHost);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, g_cliMsg);
     EXPECT_EQ(0, ret);
     msg.msg_name = &clnAddr;
@@ -306,8 +306,8 @@ static void* SampleTcpClientTask(void* p)
     EXPECT_EQ(len * cliMsgLen, (unsigned int)ret);
 
     WAIT();
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
-    memset_s(&msg, sizeof(msg), 0, sizeof(msg));
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(&msg, sizeof(msg), 0, sizeof(msg));
     msg.msg_name = &clnAddr;
     msg.msg_namelen = sizeof(clnAddr);
     msg.msg_iov = iov;
@@ -344,7 +344,7 @@ static int TcpServerForFork()
         goto FINALLY;
     }
     while (timeout > 0) {
-        memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+        (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
         ret = recv(cliFd, dataBuf, sizeof(dataBuf), 0);
         if (ret > 0) {
             printf("[server process]recv msg[%s]\n", dataBuf);
@@ -355,7 +355,7 @@ static int TcpServerForFork()
         } else {
             printf("[server process]recv no data\n");
         }
-        memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+        (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
         sprintf_s(dataBuf, sizeof(dataBuf), "server timeout:%d", timeout);
         ret = send(cliFd, dataBuf, strlen(dataBuf), 0);
         if (ret > 0) {
@@ -466,7 +466,7 @@ static int SelectServerForFork(unsigned int timeoutSec)
                 continue;
             }
             if (FD_ISSET(fds[i], &readSet)) {
-                memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
+                (viod) memset_s(dataBuf, sizeof(dataBuf), 0, sizeof(dataBuf));
                 int len = recv(fds[i], dataBuf, sizeof(dataBuf), 0);
                 if (len > 0) {
                     printf("[select process][%d]recv msg[%s]\n", fds[i], dataBuf);
@@ -550,20 +550,20 @@ HWTEST_F(ActsLwipTest, testUdpSample, Function | MediumTest | Level2)
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(g_localHost);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, g_udpMsg);
     EXPECT_EQ(0, ret);
     ret = sendto(sfd, buf, strlen(g_udpMsg), 0, (struct sockaddr*)&clnAddr, (socklen_t)sizeof(clnAddr));
     EXPECT_NE(-1, ret);
 
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = recvfrom(sfd, buf, sizeof(buf), 0, (struct sockaddr*)&clnAddr, &clnAddrLen);
     EXPECT_EQ(strlen(g_udpMsg), (unsigned int)ret);
 
     clnAddr.sin_family = AF_INET;
     clnAddr.sin_addr.s_addr = inet_addr(g_localHost);
     clnAddr.sin_port = htons(PEER_PORT);
-    memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
+    (viod) memset_s(buf, BUF_SIZE, 0, BUF_SIZE);
     ret = strcpy_s(buf, BUF_SIZE, g_udpMsg);
     EXPECT_EQ(0, ret);
     msg.msg_name = &clnAddr;
@@ -761,7 +761,7 @@ HWTEST_F(ActsLwipTest, testSocketOpt, Function | MediumTest | Level2)
     ret = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, len);
     EXPECT_EQ(0, ret);
 
-    memset_s(&timeout, len, 0, len);
+    (viod) memset_s(&timeout, len, 0, len);
     ret = getsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeout, &len);
     EXPECT_EQ(0, ret);
     EXPECT_EQ(1000, timeout.tv_sec);

communication_lite/wifiservice_hal/src/wifiservice_func_test.c

@@ -595,10 +595,10 @@ LITE_TEST_CASE(WifiServiceFuncTestSuite, testAdvanceScanType, Function | MediumT
     int freq = 2460;
     WifiScanParams scanParams = {0};
     char bssid[WIFI_MAC_LEN] = {0xac, 0x75, 0x1d, 0xd8, 0x55, 0xc1};
-    strcpy_s(scanParams.ssid, sizeof(scanParams.ssid), "wifi_service_xts");
+    (viod) strcpy_s(scanParams.ssid, sizeof(scanParams.ssid), "wifi_service_xts");
     scanParams.ssidLen = strlen(scanParams.ssid);
     scanParams.freqs = freq;
-    memcpy_s(scanParams.bssid, sizeof(scanParams.bssid), bssid, sizeof(bssid));
+    (viod) memcpy_s(scanParams.bssid, sizeof(scanParams.bssid), bssid, sizeof(bssid));
 
     scanParams.scanType = WIFI_SSID_SCAN;
     g_staScanSuccess = 0;
@@ -676,7 +676,7 @@ LITE_TEST_CASE(WifiServiceFuncTestSuite, testAdvanceScanInvalidParam02, Function
 
     WifiScanParams* scanParams = malloc(sizeof(WifiScanParams));
     TEST_ASSERT_NOT_NULL(scanParams);
-    memset_s(scanParams, sizeof(WifiScanParams), 0, sizeof(WifiScanParams));
+    (viod) memset_s(scanParams, sizeof(WifiScanParams), 0, sizeof(WifiScanParams));
 
     error = AdvanceScan(scanParams);
     TEST_ASSERT_EQUAL_INT(ERROR_WIFI_UNKNOWN, error);
@@ -689,8 +689,8 @@ LITE_TEST_CASE(WifiServiceFuncTestSuite, testAdvanceScanInvalidParam02, Function
     error = AdvanceScan(scanParams);
     TEST_ASSERT_EQUAL_INT(ERROR_WIFI_UNKNOWN, error);
 
-    memset_s(scanParams, sizeof(WifiScanParams), 0, sizeof(WifiScanParams));
-    strcpy_s(scanParams->ssid, sizeof(scanParams->ssid), "wifi_service_xts");
+    (viod) memset_s(scanParams, sizeof(WifiScanParams), 0, sizeof(WifiScanParams));
+    (viod) strcpy_s(scanParams->ssid, sizeof(scanParams->ssid), "wifi_service_xts");
     scanParams->scanType = WIFI_SSID_SCAN;
     error = AdvanceScan(scanParams);
     TEST_ASSERT_EQUAL_INT(ERROR_WIFI_UNKNOWN, error);
@@ -721,7 +721,7 @@ LITE_TEST_CASE(WifiServiceFuncTestSuite, testAdvanceScanInvalidParam03, Function
 
     WifiScanParams* scanParams = malloc(sizeof(WifiScanParams));
     TEST_ASSERT_NOT_NULL(scanParams);
-    memset_s(scanParams, sizeof(WifiScanParams), 0, sizeof(WifiScanParams));
+    (viod) memset_s(scanParams, sizeof(WifiScanParams), 0, sizeof(WifiScanParams));
 
     scanParams->scanType = WIFI_BAND_SCAN;
     g_staScanSuccess = 0;
@@ -739,7 +739,7 @@ LITE_TEST_CASE(WifiServiceFuncTestSuite, testAdvanceScanInvalidParam03, Function
     TEST_ASSERT_EQUAL_INT(1, g_staScanSuccess);
 
     char bssid[WIFI_MAC_LEN] = {0xac, 0x75, 0x1d, 0xd8, 0x55, 0xc1};
-    memcpy_s(scanParams->bssid, sizeof(scanParams->bssid), bssid, sizeof(bssid));
+    (viod) memcpy_s(scanParams->bssid, sizeof(scanParams->bssid), bssid, sizeof(bssid));
     scanParams->scanType = WIFI_BSSID_SCAN;
     g_staScanSuccess = 0;
     error = AdvanceScan(scanParams);

dsoftbus/BUILD.gn

-# 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("//build/ohos_var.gni")
-
-group("dsoftbus") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [ "ipcrpc_standard:ActsRpcJsTest" ]
-  }
-}

dsoftbus/ipcrpc_standard/BUILD.gn

-# 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("ActsRpcJsTest") {
-  hap_profile = "./entry/src/main/config.json"
-  deps = [
-    ":rpc_js_assets",
-    ":rpc_js_resources",
-  ]
-
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsRpcHapTest"
-}
-ohos_js_assets("rpc_js_assets") {
-  source_dir = "./entry/src/main/js/default"
-}
-ohos_resources("rpc_js_resources") {
-  sources = [ "./entry/src/main/resources" ]
-  hap_profile = "./entry/src/main/config.json"
-}

dsoftbus/ipcrpc_standard/Test.json

-{
-    "description": "Configuration for rpc Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.ohos.rpctest",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsRpcHapTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}

dsoftbus/ipcrpc_standard/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.ohos.rpctest",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.ohos.rpctest",
-    "name": "com.ohos.rpc.MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.ohos.rpc.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "visible":true,
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file

dsoftbus/ipcrpc_standard/entry/src/main/js/default/app.js

-/*
- * 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.
- */
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};

dsoftbus/ipcrpc_standard/entry/src/main/js/default/i18n/en-US.json

-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World"
-  }
-}
\ No newline at end of file

dsoftbus/ipcrpc_standard/entry/src/main/js/default/i18n/zh-CN.json

-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界"
-  }
-}
\ No newline at end of file

dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.css

-.container {
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-.title {
-    font-size: 100px;
-}

dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.hml

-<div class="container">
-    <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-</div>

dsoftbus/ipcrpc_standard/entry/src/main/js/default/pages/index/index.js

-/*
- * 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} from 'deccjsunit/index'
-
-const injectRef = Object.getPrototypeOf(global) || global
-injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
-
-export default {
-   data: {
-       title: ''
-  },
-  onInit() {
-    this.title = this.$t('strings.world');
-  },
-  onShow() {
-    console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    require('../../test/List.test')
-    core.execute()
-  },
-  onReady() {
-  },
-}

dsoftbus/ipcrpc_standard/entry/src/main/js/default/test/List.test.js

-/*
- * 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('./RpcJsunit.test.js')
\ No newline at end of file

dsoftbus/ipcrpc_standard/entry/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "rpctest"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Rpc"
-    }
-  ]
-}
\ No newline at end of file