From 0ad8633b5fb77f1495744d4b4819b1e6d951e4fe Mon Sep 17 00:00:00 2001 From: zwx1021249 Date: Tue, 23 Apr 2024 11:32:07 +0800 Subject: [PATCH] fix testcases Signed-off-by: zwx1021249 --- communication/softbus_standard/common/socket_common.c | 2 +- communication/softbus_standard/common/socket_common.h | 2 +- .../softbus_standard/socket_trans/client/func/BUILD.gn | 2 +- .../socket_trans/client/func/socket_trans_func_test.cpp | 6 +++--- .../softbus_standard/socket_trans/server/BUILD.gn | 2 +- .../socket_trans/server/SocketTestServer.cpp | 9 +++++---- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/communication/softbus_standard/common/socket_common.c b/communication/softbus_standard/common/socket_common.c index 1dd7724..aa45c5e 100644 --- a/communication/softbus_standard/common/socket_common.c +++ b/communication/softbus_standard/common/socket_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2024 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 diff --git a/communication/softbus_standard/common/socket_common.h b/communication/softbus_standard/common/socket_common.h index 28e928d..1c34a14 100644 --- a/communication/softbus_standard/common/socket_common.h +++ b/communication/softbus_standard/common/socket_common.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2024 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 diff --git a/communication/softbus_standard/socket_trans/client/func/BUILD.gn b/communication/softbus_standard/socket_trans/client/func/BUILD.gn index 33b768e..eadf9ec 100644 --- a/communication/softbus_standard/socket_trans/client/func/BUILD.gn +++ b/communication/softbus_standard/socket_trans/client/func/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2024 Huawei Device Co., Ltd. +# Copyright (C) 2024 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 diff --git a/communication/softbus_standard/socket_trans/client/func/socket_trans_func_test.cpp b/communication/softbus_standard/socket_trans/client/func/socket_trans_func_test.cpp index 921d6b1..fd31a18 100644 --- a/communication/softbus_standard/socket_trans/client/func/socket_trans_func_test.cpp +++ b/communication/softbus_standard/socket_trans/client/func/socket_trans_func_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2024 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 @@ -119,13 +119,13 @@ SocketInfo socketStreamInfo = { }; QosTV info_wifi[] = { - {.qos = QOS_TYPE_MIN_BW, .value = 10 * 1024 * 4024, }, + {.qos = QOS_TYPE_MIN_BW, .value = 10 * 1024 * 1024, }, {.qos = QOS_TYPE_MIN_LATENCY, .value = 800, }, {.qos = QOS_TYPE_MAX_LATENCY, .value = 800, }, }; QosTV info_p2p[] = { - {.qos = QOS_TYPE_MIN_BW, .value = 160 * 1024 * 4024, }, + {.qos = QOS_TYPE_MIN_BW, .value = 160 * 1024 * 1024, }, {.qos = QOS_TYPE_MIN_LATENCY, .value = 1600, }, {.qos = QOS_TYPE_MAX_LATENCY, .value = 1600, }, }; diff --git a/communication/softbus_standard/socket_trans/server/BUILD.gn b/communication/softbus_standard/socket_trans/server/BUILD.gn index 2608f7a..a61a406 100644 --- a/communication/softbus_standard/socket_trans/server/BUILD.gn +++ b/communication/softbus_standard/socket_trans/server/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021-2024 Huawei Device Co., Ltd. +# Copyright (C) 2024 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 diff --git a/communication/softbus_standard/socket_trans/server/SocketTestServer.cpp b/communication/softbus_standard/socket_trans/server/SocketTestServer.cpp index 4b31b24..965894d 100644 --- a/communication/softbus_standard/socket_trans/server/SocketTestServer.cpp +++ b/communication/softbus_standard/socket_trans/server/SocketTestServer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2024 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 @@ -44,9 +44,10 @@ void SocketTestServer ::TearDown() {} void SocketTestServer ::SetUpTestCase() { LOG("SetUpTestCase"); - uint64_t tokenId = OHOS::Security::AccessToken::AccessTokenKit::GetNativeTokenId("dhardware"); - SetSelfTokenID(tokenId); - sleep(1); + AddPermission(); + sleep(ONE_SECOND); + system("pidof accesstoken_service | xargs kill -9"); + sleep(ONE_SECOND); TestSetUp(); SetupCallback(); int ret = RegNodeDeviceStateCb(DEF_PKG_NAME, g_nodeStateCallback);